build: fix usage of PKGOS_BITS

ref: 80d8843#commitcomment-49045791
NatronGitHub · Apr 3, 2021 · b9b2cda · b9b2cda
1 parent 699faa2
commit b9b2cda
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/tools/jenkins/build-Linux-installer.sh b/tools/jenkins/build-Linux-installer.sh
@@ -54,7 +54,8 @@ else
 fi
 export LD_LIBRARY_PATH
 
-
+# Pretty architecture/platform identifier (used for breakpad symbol files)
+PKGOS_BITS="${PKGOS}-x86_${BITS}bit"
 
 if [ -d "${BUILD_ARCHIVE_DIRECTORY}" ]; then
     rm -rf "${BUILD_ARCHIVE_DIRECTORY}"

diff --git a/tools/jenkins/build-Windows-installer.sh b/tools/jenkins/build-Windows-installer.sh
@@ -47,6 +47,9 @@ source dllVersions.sh
 
 updateBuildOptions
 
+# Pretty architecture/platform identifier (used for breakpad symbol files)
+PKGOS_BITS="${PKGOS}-x86_${BITS}bit"
+
 if [ -z "${NATRON_BUILD_CONFIG:-}" ]; then
     echo "NATRON_BUILD_CONFIG empty"
     exit 1

diff --git a/tools/jenkins/createBuildOptionsFile.sh b/tools/jenkins/createBuildOptionsFile.sh
@@ -110,10 +110,6 @@ PKGOS=""
 # 32, 64 or universal
 BITS=""
 
-# Pretty architecture/platform identifier
-PKGOS_BITS="$PKGOS-x86_${BITS}bit"
-
-
 # Temporary directory where the binaries are built
 TMP_PATH=""
 

diff --git a/tools/jenkins/launchBuildMain.sh b/tools/jenkins/launchBuildMain.sh
@@ -509,7 +509,7 @@ if [ "$NATRON_BUILD_CONFIG" = "SNAPSHOT" ]; then
     INSTALLER_BASENAME="${INSTALLER_BASENAME}-${NATRON_GIT_BRANCH}-${CURRENT_DATE}"
 fi
 
-INSTALLER_BASENAME="${INSTALLER_BASENAME}-${NATRON_VERSION_STRING}-${PKGOS}-${PKGOS_BITS}"
+INSTALLER_BASENAME="${INSTALLER_BASENAME}-${NATRON_VERSION_STRING}-${PKGOS}-${BITS}"
 
 if [ "$COMPILE_TYPE" = "debug" ]; then
     INSTALLER_BASENAME="${INSTALLER_BASENAME}-debug"