Fixes 22903

bootstrap/scripts/3-prepare.sh

@@ -9,5 +9,7 @@ SCRIPTS="$(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P)"
 
 . ${SCRIPTS}/envvars.sh
 
+set_version_variables
+
 ./pharo Pharo.image ${IMAGE_FLAGS} ${BOOTSTRAP_REPOSITORY}/bootstrap/scripts/prepare_image.st --save --quit
 ./pharo Pharo.image ${IMAGE_FLAGS} ${BOOTSTRAP_REPOSITORY}/bootstrap/scripts/bootstrap.st --ARCH=${BOOTSTRAP_ARCH} --BUILD_NUMBER=${BUILD_NUMBER} --VERSION_INFO=`GIT_DIR=${BOOTSTRAP_REPOSITORY}/.git git describe --long --tags --abbrev=40` --quit

bootstrap/scripts/4-build.sh

@@ -227,5 +227,5 @@ echo "70" > pharo.version
 # clean bak sources files
 rm -f *.bak
 
-PHARO_SOURCES_PREFIX=$(echo "${PHARO_NAME_PREFIX}" | cut -d'-' -f 1)
+PHARO_SOURCES_PREFIX=$(echo "${PHARO_NAME_PREFIX}" | cut -d'-' -f 1 | cut -d'.' -f 1-2)
 zip "${PHARO_IMAGE_NAME}.zip" ${PHARO_IMAGE_NAME}.* ${PHARO_SOURCES_PREFIX}*.sources pharo.version

bootstrap/scripts/envversion.sh

@@ -9,7 +9,8 @@
 function is_release_build() {
 	set -f
 	local versionTag=$(git tag --list --points-at HEAD | grep -E "^v[0-9]+\.[0-9]+.[0-9]+(\-[a-zA-Z0-9_]+)?$")
-    if [ "${versionTag}" == "" ]; then
+    set +f
+	if [ "${versionTag}" == "" ]; then
         echo 0
     else
         echo 1
@@ -26,6 +27,7 @@ function ensure_branch_name() {
 	if [ "${BRANCH_NAME}" == "" ]; then
 		set -f
 		BRANCH_NAME="$(git branch | grep \* | cut -d' ' -f 2)"
+	    set +f
 	fi
 }
 
@@ -91,6 +93,8 @@ function set_version_variables() {
 		set_version_pull_request_variables
 	fi
 
-	# this is just to make things clear (and because they could change in the future, who knows :P)
-	PHARO_VM_VERSION="${PHARO_SHORT_VERSION}"
-} 
+	# I will use 70 vm for now (we still do not have 80 vm)
+	#PHARO_VM_VERSION="${PHARO_SHORT_VERSION}"
+	PHARO_VM_VERSION="70"
+	PHARO_COMMIT_HASH="$(git rev-parse --verify HEAD)"
+} 

bootstrap/scripts/prepare_for_upload.sh

@@ -5,6 +5,8 @@ set -o pipefail
 set -o nounset
 set -o xtrace
 
+. ${SCRIPTS}/envversion.sh
+
 #Get the hash of the built image
 
 PHARO_NAME_PREFIX=$(find . -name "Pharo*.zip" | head -n 1 | cut -d'/' -f 2 | cut -d'-' -f 1-2)
@@ -23,6 +25,12 @@ cp "${MINIMAL_IMAGE_NAME32}" latest-minimal.zip
 cp "${MINIMAL_IMAGE_NAME32}" latest-minimal-32.zip
 cp "${MINIMAL_IMAGE_NAME64}" latest-minimal-64.zip
 
+if [ $(is_release_build) == 1 ]; then
+	cp "${FULL_IMAGE_NAME32}" stable-32.zip
+	cp "${FULL_IMAGE_NAME64}" stable-64.zip
+fi
+
+
 for f in ${PHARO_NAME_PREFIX}*-32bit-*.zip; do
 	#If it is not base image
 	BITNESS=32bit

bootstrap/scripts/runKernelTests.sh

@@ -18,19 +18,20 @@ find ${CACHE}
 # WARNING: I'm assuming CACHE=bootstrap-cache
 # WARNING: If you change this, you will need to change "runTests.sh" too
 #
-PHARO_NAME_PREFIX=$(find ${CACHE} -name "Pharo*.zip" | head -n 1 | cut -d'/' -f 2 | cut -d'-' -f 1-2)
-PHARO_VM_VERSION=$(echo "${PHARO_NAME_PREFIX}" | cut -d'-' -f 1| cut -c 6- | cut -d'.' -f 1-2 | sed 's/\.//')
+TEST_NAME_PREFIX=$(find ${CACHE} -name "Pharo*.zip" | head -n 1 | cut -d'/' -f 2 | cut -d'-' -f 1-2)
+#TEST_VM_VERSION=$(echo "${TEST_NAME_PREFIX}" | cut -d'-' -f 1| cut -c 6- | cut -d'.' -f 1-2 | sed 's/\.//')
+TEST_VM_VERSION="70"
 
-${BOOTSTRAP_REPOSITORY:-.}/bootstrap/scripts/getPharoVM.sh ${PHARO_VM_VERSION} vm ${1}
+${BOOTSTRAP_REPOSITORY:-.}/bootstrap/scripts/getPharoVM.sh ${TEST_VM_VERSION} vm ${1}
 
-IMAGE_ARCHIVE=$(find ${CACHE} -name ${PHARO_NAME_PREFIX}-bootstrap-${1}bit-*.zip)
+IMAGE_ARCHIVE=$(find ${CACHE} -name ${TEST_NAME_PREFIX}-bootstrap-${1}bit-*.zip)
 unzip $IMAGE_ARCHIVE
-IMAGE_FILE=$(find . -name ${PHARO_NAME_PREFIX}-bootstrap-${1}bit-*.image)
+IMAGE_FILE=$(find . -name ${TEST_NAME_PREFIX}-bootstrap-${1}bit-*.image)
 
-HERMES_ARCHIVE=$(find ${CACHE} -name ${PHARO_NAME_PREFIX}-hermesPackages-${1}bit-*.zip)
+HERMES_ARCHIVE=$(find ${CACHE} -name ${TEST_NAME_PREFIX}-hermesPackages-${1}bit-*.zip)
 unzip $HERMES_ARCHIVE
 
-RPACKAGE_ARCHIVE=$(find ${CACHE} -name ${PHARO_NAME_PREFIX}-rpackage-${1}bit-*.zip)
+RPACKAGE_ARCHIVE=$(find ${CACHE} -name ${TEST_NAME_PREFIX}-rpackage-${1}bit-*.zip)
 unzip $RPACKAGE_ARCHIVE
 
 mv $IMAGE_FILE bootstrap.image

bootstrap/scripts/runTests.sh

@@ -18,12 +18,13 @@ find ${CACHE}
 # WARNING: I'm assuming CACHE=bootstrap-cache
 # WARNING: If you change this, you will need to change "runKernelTests.sh" too
 #
-PHARO_NAME_PREFIX=$(find ${CACHE} -name "Pharo*.zip" | head -n 1 | cut -d'/' -f 2 | cut -d'-' -f 1-2)
-PHARO_VM_VERSION=$(echo "${PHARO_NAME_PREFIX}" | cut -d'-' -f 1| cut -c 6- | cut -d'.' -f 1-2 | sed 's/\.//')
+TEST_NAME_PREFIX=$(find ${CACHE} -name "Pharo*.zip" | head -n 1 | cut -d'/' -f 2 | cut -d'-' -f 1-2)
+#TEST_VM_VERSION=$(echo "${TEST_NAME_PREFIX}" | cut -d'-' -f 1| cut -c 6- | cut -d'.' -f 1-2 | sed 's/\.//')
+TEST_VM_VERSION="70"
 
-${BOOTSTRAP_REPOSITORY:-.}/bootstrap/scripts/getPharoVM.sh ${PHARO_VM_VERSION} vm ${1}
+${BOOTSTRAP_REPOSITORY:-.}/bootstrap/scripts/getPharoVM.sh ${TEST_VM_VERSION} vm ${1}
 
-IMAGE_ARCHIVE=$(find ${CACHE} -name ${PHARO_NAME_PREFIX}-${1}bit-*.zip)
+IMAGE_ARCHIVE=$(find ${CACHE} -name ${TEST_NAME_PREFIX}-${1}bit-*.zip)
 unzip $IMAGE_ARCHIVE
 IMAGE_FILE=$(find . -name Pharo*-${1}bit-*.image)
 CHANGES_FILE=$(find . -name Pharo*-${1}bit-*.changes)

bootstrap/scripts/transform_32_into_64.sh

@@ -59,8 +59,8 @@ for f in  ${PHARO_NAME_PREFIX}-32bit-*.zip; do
 	printf "\231\002\320\003" > displaySize.bin
 	dd if="displaySize.bin" of="${PHARO_NAME_PREFIX}-64bit-$HASH.image" bs=1 seek=40 count=4 conv=notrunc
 
-	echo "70" > pharo.version
-	PHARO_SOURCES_PREFIX=$(echo "${PHARO_NAME_PREFIX}" | cut -d'-' -f 1)	
+	echo "${PHARO_SHORT_VERSION}" > pharo.version
+	PHARO_SOURCES_PREFIX=$(echo "${PHARO_NAME_PREFIX}" | cut -d'-' -f 1 | cut -d'.' -f 1-2)
 	zip ${PHARO_NAME_PREFIX}-64bit-$HASH.zip ${PHARO_NAME_PREFIX}-64bit-$HASH.* ${PHARO_SOURCES_PREFIX}*.sources pharo.version
 	rm -f *.image *.changes *.sources
 done

bootstrap/scripts/upload_to_files.pharo.org.sh

@@ -12,6 +12,7 @@ echo "Uploading Images to pharo.files.org/$destDir"
 
 scp -o StrictHostKeyChecking=no -v \
   latest*.zip \
+  stable*.zip \
   ${PHARO_NAME_PREFIX}.build.*.zip \
   ${PHARO_NAME_PREFIX}-metacello.build.*.zip \
     pharoorgde@ssh.cluster023.hosting.ovh.net:files/image/${PHARO_SHORT_VERSION}/

bootstrap/src/Pharo30Bootstrap.package/PBImageBuilder50.class/instance/initializeImage.st

@@ -30,7 +30,7 @@ initializeImage
 			'major' -> versionInfo major.
 			'minor' -> versionInfo minor.
 			'patch' -> versionInfo patch.
-			'suffix' -> versionInfo suffix.
+			'suffix' -> (versionInfo suffix ifNil: [ '' ]).
 			'build' -> versionInfo buildNumber.
 			'hash' -> versionInfo commitHash.
 	} asDictionary).