From b9b2cdacd444c75e9e4e093fba82d539bded1675 Mon Sep 17 00:00:00 2001
From: Frederic Devernay <frederic.devernay@m4x.org>
Date: Fri, 2 Apr 2021 18:42:24 -0700
Subject: [PATCH] build: fix usage of PKGOS_BITS

ref: https://github.com/NatronGitHub/Natron/commit/80d884374246064e4c2f7b0ac031e3a3234e43df#commitcomment-49045791
---
 tools/jenkins/build-Linux-installer.sh   | 3 ++-
 tools/jenkins/build-Windows-installer.sh | 3 +++
 tools/jenkins/createBuildOptionsFile.sh  | 4 ----
 tools/jenkins/launchBuildMain.sh         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/jenkins/build-Linux-installer.sh b/tools/jenkins/build-Linux-installer.sh
index ca46b3076f..7380b12cd5 100755
--- 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
index a736badd61..55624a811d 100755
--- 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
index 608823b802..ca769d5643 100755
--- 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
index 1cf76d8b97..7096ea09ac 100755
--- 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"