Merge pull request #1994 from estebanlm/22659-generated-artifacts-sho…

…uld-have-the-version-tag

22659-generated-artifacts-should-have-the-version-tag (postscriptum to the notes to the commentaries to the addendum)

bootstrap/scripts/4-build.sh

@@ -6,7 +6,6 @@ set -x
 set -e
 
 SCRIPTS="$(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P)"
-
 . ${SCRIPTS}/envvars.sh
 
 # A POSIX variable
@@ -226,4 +225,5 @@ echo "70" > pharo.version
 # clean bak sources files
 rm -f *.bak
 
-zip "${PHARO_IMAGE_NAME}.zip" ${PHARO_IMAGE_NAME}.* pharo.version
+PHARO_SOURCES_PREFIX=$(echo "${PHARO_NAME_PREFIX}" | cut -d'.' -f 1-2)
+zip "${PHARO_IMAGE_NAME}.zip" ${PHARO_IMAGE_NAME}.* ${PHARO_SOURCES_PREFIX}*.sources pharo.version

bootstrap/scripts/transform_32_into_64.sh

@@ -58,7 +58,8 @@ for f in  ${PHARO_NAME_PREFIX}-32bit-*.zip; do
 	dd if="displaySize.bin" of="${PHARO_NAME_PREFIX}-64bit-$HASH.image" bs=1 seek=40 count=4 conv=notrunc
 
 	echo "70" > pharo.version
-	zip ${PHARO_NAME_PREFIX}-64bit-$HASH.zip ${PHARO_NAME_PREFIX}-64bit-$HASH.* ${IMAGENAME}.sources pharo.version
+	PHARO_SOURCES_PREFIX=$(echo "${PHARO_NAME_PREFIX}" | 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