From 8374214a1d7c59c0484ec325a9ecd4c2b0561573 Mon Sep 17 00:00:00 2001 From: Alexander Pavlov Date: Fri, 8 Mar 2024 12:47:26 +0300 Subject: [PATCH] Add salsa-ci.yml, gbp.conf. Update 0002-CMakeLists.txt.patch --- debian/gbp.conf | 3 ++ debian/patches/0002-CMakeLists.txt.patch | 42 ++++++++++++++++++++++++ debian/salsa-ci.yml | 16 +++++++++ 3 files changed, 61 insertions(+) create mode 100644 debian/gbp.conf create mode 100644 debian/salsa-ci.yml diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..5474c60 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +pristine-tar = True +sign-tags = True diff --git a/debian/patches/0002-CMakeLists.txt.patch b/debian/patches/0002-CMakeLists.txt.patch index de3e1d0..79e232a 100644 --- a/debian/patches/0002-CMakeLists.txt.patch +++ b/debian/patches/0002-CMakeLists.txt.patch @@ -58,6 +58,18 @@ Forwarded: not-needed message(STATUS "Installed libraries dir: ${CMAKE_INSTALL_LIBDIR}") ## ** RAKE! start compiler specific flags section ** +@@ -355,6 +355,11 @@ + ## ** RAKE! clean up for SeriousEngine use. Also ** + ## ** RAKE! need to make this pandora safe. ** + # compiler specific flags ++if((CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i586|i686") AND (CMAKE_SIZEOF_VOID_P EQUAL 4)) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmmx") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmmx") ++endif() ++ + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") + # This section and the like are for flags/defines that can be shared between + # c and c++ compile options @@ -393,9 +366,9 @@ add_compile_options(-mpowerpc64) else() @@ -70,6 +82,15 @@ Forwarded: not-needed endif() endif() endif() +@@ -624,7 +629,7 @@ + if(NOT ECC) + add_parser_and_scanner("Ecc/Parser" "Ecc/Scanner") + add_executable(ecc Ecc/Main.cpp Ecc/Parser.cpp Ecc/Parser.h Ecc/Scanner.cpp) +- set(ECC "ecc") ++ set(ECC "${CMAKE_CURRENT_BINARY_DIR}/ecc") + endif() + + macro(entity _NAME) @@ -1472,56 +1445,8 @@ ) endif() @@ -338,6 +359,18 @@ Forwarded: not-needed message(STATUS "Installed libraries dir: ${CMAKE_INSTALL_LIBDIR}") ## ** RAKE! start compiler specific flags section ** +@@ -355,6 +355,11 @@ + ## ** RAKE! clean up for SeriousEngine use. Also ** + ## ** RAKE! need to make this pandora safe. ** + # compiler specific flags ++if((CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i586|i686") AND (CMAKE_SIZEOF_VOID_P EQUAL 4)) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmmx") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmmx") ++endif() ++ + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") + # This section and the like are for flags/defines that can be shared between + # c and c++ compile options @@ -393,9 +366,9 @@ add_compile_options(-mpowerpc64) else() @@ -350,6 +383,15 @@ Forwarded: not-needed endif() endif() endif() +@@ -624,7 +629,7 @@ + if(NOT ECC) + add_parser_and_scanner("Ecc/Parser" "Ecc/Scanner") + add_executable(ecc-se Ecc/Main.cpp Ecc/Parser.cpp Ecc/Parser.h Ecc/Scanner.cpp) +- set(ECC-SE "ecc-se") ++ set(ECC-SE "${CMAKE_CURRENT_BINARY_DIR}/ecc-se") + endif() + + macro(entity _NAME) @@ -1472,56 +1445,8 @@ ) endif() diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..36f1315 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,16 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +# Disable tests that currently make no sense for this repo +variables: +# SALSA_CI_DISABLE_APTLY: 1 +# SALSA_CI_DISABLE_AUTOPKGTEST: 1 +# SALSA_CI_DISABLE_BLHC: 1 +# SALSA_CI_DISABLE_LINTIAN: 1 +# SALSA_CI_DISABLE_PIUPARTS: 1 + SALSA_CI_DISABLE_REPROTEST: 1 +# SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 1 +# SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 1 +