diff --git a/jenkins_builder.sh b/jenkins_builder.sh index 86d9d23..be823ce 100755 --- a/jenkins_builder.sh +++ b/jenkins_builder.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -# Build an LTS RPM for one project flavor (ahtc / guez). -# Driven by rpmbuild/make_rpm.py — see also jenkins/Jenkinsfile. +# Build an LTS DEB package for one project flavor (ahtc / guez). +# Driven by rpmbuild/make_rpm_ubuntu26.py — see also jenkins/Jenkinsfile. # # Required environment (set by the Jenkinsfile or `docker run -e ...`): # PROJECT LTS flavor: qatar | ahtc | guez (cmake -D_pname) @@ -9,8 +9,8 @@ # LTS_VERSION Major.minor LTS version, e.g. 1.0 # GUEZ_MODE ON | OFF — cmake -DGUEZ_MODE # WORKSPACE Jenkins workspace path (set automatically by Jenkins) -# PROJECT_BASE_DIR Path used by make_rpm.py as the source tree (basename must be 'legatus') -# BUILD_VERSION Spec suffix selector for make_rpm.py (lts${BUILD_VERSION}.spec) +# PROJECT_BASE_DIR Path used by make_rpm_ubuntu26.py as the source tree (basename must be 'legatus') +# BUILD_VERSION Spec suffix selector for make_rpm_ubuntu26.py (lts${BUILD_VERSION}.spec) # BUILD_NUMBER Jenkins build number (used as @RELEASE@ in the spec) # BUILD_TAG Jenkins build tag (used as @JENKINS_BUILD_TAG@ in the spec) # @@ -24,31 +24,19 @@ set -eo pipefail : "${WORKSPACE:?WORKSPACE must be set}" : "${PROJECT_BASE_DIR:?PROJECT_BASE_DIR must be set}" -echo "Building LTS ${LTS_VERSION}-${BUILD_NUMBER:-?} RPM for project '${PROJECT}' (OS ${OS_VERSION})." +echo "Building LTS ${LTS_VERSION}-${BUILD_NUMBER:-?} DEB package for project '${PROJECT}' (OS ${OS_VERSION})." echo "Spec selector : lts${BUILD_VERSION:-}.spec" echo "PROJECT_BASE_DIR=${PROJECT_BASE_DIR}" -mkdir -p /shd/CTC/TOOLS/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} - -# openSUSE's rpmbuild defaults %_topdir to /usr/src/packages and ignores HOME -echo "%_topdir /shd/CTC/TOOLS/rpmbuild" > "${HOME}/.rpmmacros" - -# Stage workspace as a clean copy under PROJECT_BASE_DIR -rm -rf "${PROJECT_BASE_DIR}" -mkdir -p "${PROJECT_BASE_DIR}" -tar --exclude='./rpms' --exclude='./.git' --exclude='./build' \ - -cf - -C "${WORKSPACE}" . | tar -xf - -C "${PROJECT_BASE_DIR}" - -export VERSION_DATE -VERSION_DATE=$(date +%Y-%m-%d) +mkdir -p /shd/CTC/TOOLS/debbuild/{BUILD,BUILDROOT,DEBS,SOURCES,SPECS} # Output is isolated per OS version so parallel OS builds of the same project cd "${WORKSPACE}/rpmbuild" -python make_rpm.py -c LTS \ +python make_rpm_ubuntu26.py -c LTS \ --project_name "${PROJECT}" \ --version "${LTS_VERSION}" \ --output_dir "${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/" \ - --cmake_build_flags "-DUSE_IPO=ON -DUSE_UNITY_BUILD=ON -DGUEZ_MODE=${GUEZ_MODE} -DBUILD_WLS=ON -DPostgreSQL_TYPE_INCLUDE_DIR=/usr/include/pgsql/" + --cmake_build_flags "-DUSE_IPO=ON -DUSE_UNITY_BUILD=ON -DGUEZ_MODE=${GUEZ_MODE} -DBUILD_WLS=ON -DBUILD_SV=ON -DBUILD_WS=ON -DBUILD_AAR=ON -DBUILD_HLA=ON -DPostgreSQL_TYPE_INCLUDE_DIR=/usr/include/pgsql/" -echo "RPMs produced for '${PROJECT}' (OS ${OS_VERSION}):" +echo "DEB packages produced for '${PROJECT}' (OS ${OS_VERSION}):" ls -lhR "${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/"