diff --git a/tools/jenkins/createBuildOptionsFile.sh b/tools/jenkins/createBuildOptionsFile.sh index 69fc4b6a46..752d2ec7b0 100755 --- a/tools/jenkins/createBuildOptionsFile.sh +++ b/tools/jenkins/createBuildOptionsFile.sh @@ -22,13 +22,13 @@ BUILD_NAME="" # Where the final build artifacts (binaries) are stored BUILD_ARCHIVE_DIRECTORY="" -# Set to 1 to also build a online installer (only available for Windows and Linux). +# Set to 1 to also build a online installer for SNAPSHOT and RELEASE builds (only available for Windows and Linux). WITH_ONLINE_INSTALLER="" # The date at which the build started CURRENT_DATE="" -# If set to 1, deb and rpm packages will not be built. Otherwise they are only built for a release +# If set to 1, deb and rpm packages will never be built. Default is to build when NATRON_BUILD_CONFIG=STABLE. DISABLE_RPM_DEB_PKGS="" # If set to 1, a portable archive will not be built diff --git a/tools/jenkins/launchBuildMain.sh b/tools/jenkins/launchBuildMain.sh index 55ab6fa1bf..adf4d766cf 100755 --- a/tools/jenkins/launchBuildMain.sh +++ b/tools/jenkins/launchBuildMain.sh @@ -329,12 +329,13 @@ setBuildOption "GIT_TRIGGER_COMMIT" "$GIT_COMMIT" # Only use online installer for snapshots or releases -if [ "$TYPE" = "SNAPSHOT" ] || [ "$TYPE" = "RELEASE" ]; then - WITH_ONLINE_INSTALLER=1 -else +if [ "$TYPE" != "SNAPSHOT" ] && [ "$TYPE" != "RELEASE" ]; then WITH_ONLINE_INSTALLER=0 +else + WITH_ONLINE_INSTALLER="${WITH_ONLINE_INSTALLER:-0}" fi -setBuildOption "WITH_ONLINE_INSTALLER" "$WITH_ONLINE_INSTALLER" + +setBuildOption "WITH_ONLINE_INSTALLER" "${WITH_ONLINE_INSTALLER}" # If 1, source files will be compressed and uploaded with the binary