Update bundle dist tools

- The MacOs script was not exporting the SVN revision properly.
- Rename the DMG to match the other's conventions.
- Clean up windows installer files ( Fixes #5955 )

Differential Revision: https://code.wildfiregames.com/D3370
This was SVN commit r24763.

build/jenkins/pipelines/macos-all-bundles.Jenkinsfile

@@ -25,13 +25,14 @@ pipeline {
 
 	parameters {
 		string(name: 'BUNDLE_VERSION', defaultValue: '0.0.24dev', description: 'Bundle Version')
+		string(name: 'SVN_REV', defaultValue: 'HEAD', description: 'For instance 21000')
 		booleanParam(name: 'ONLY_MOD', defaultValue: true, description: 'Only archive the mod mod.')
 	}
 
 	stages {
 		stage("Checkout") {
 			steps {
-				svn "https://svn.wildfiregames.com/public/ps/trunk"
+				svn "https://svn.wildfiregames.com/public/ps/trunk@${params.SVN_REV}"
 				sh "svn cleanup"
 				sh "svn revert . -R"
 				sh "svn st --no-ignore | cut -c 9- | xargs rm -rfv"

source/tools/dist/0ad.nsi

@@ -125,7 +125,7 @@ Section "!Game and data files" GameSection
 
   ; Binaries: exclude debug DLLs and related files
   SetOutPath "$INSTDIR\binaries\data"
-  File /r /x "public" /x "mod" /x "dev.cfg" "${CHECKOUTPATH}\binaries\data\"
+  File /r /x "public" /x "mod" /x "fontbuilder" /x "tests" /x "_test.*" /x "dev.cfg" "${CHECKOUTPATH}\binaries\data\"
 
   ; Warning: libraries that end in 'd' need to be added explicitly.
   ; There are currently none.
@@ -136,12 +136,9 @@ Section "!Game and data files" GameSection
   File /r "${CHECKOUTPATH}\binaries\system\*.bat"
   File /r "${CHECKOUTPATH}\binaries\system\*.txt"
 
-  ; Create shortcuts in the root installation folder.
-  ; Keep synched with the start menu shortcuts.
-  SetOutPath "$INSTDIR"
-  CreateShortCut "$INSTDIR\0 A.D..lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" ""
-  CreateShortCut "$INSTDIR\Map editor.lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "-editor" "$INSTDIR\binaries\data\tools\atlas\icons\ScenarioEditor.ico"
-  WriteINIStr "$INSTDIR\Web site.url" "InternetShortcut" "URL" "http://play0ad.com/"
+  ; Copy logs for writable root
+  SetOutPath "$INSTDIR\binaries\logs"
+  File /r "${CHECKOUTPATH}\binaries\logs"
 
   !ifdef ARCHIVE_PATH
     SetOutPath "$INSTDIR\binaries\data\mods\"
@@ -154,6 +151,13 @@ Section "!Game and data files" GameSection
     File "${CHECKOUTPATH}\binaries\data\mods\mod\mod.zip"
   !endif
 
+  ; Create shortcuts in the root installation folder.
+  ; Keep synched with the start menu shortcuts.
+  SetOutPath "$INSTDIR"
+  CreateShortCut "$INSTDIR\0 A.D..lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" ""
+  CreateShortCut "$INSTDIR\Map editor.lnk" "$INSTDIR\binaries\system\pyrogenesis.exe" "-editor" "$INSTDIR\binaries\data\tools\atlas\icons\ScenarioEditor.ico"
+  WriteINIStr "$INSTDIR\Web site.url" "InternetShortcut" "URL" "http://play0ad.com/"
+
   ;Store installation folder
   WriteRegStr SHCTX "Software\0 A.D." "" $INSTDIR
 

source/tools/dist/build-archives.sh

@@ -22,9 +22,6 @@ REGEX=".*/\("${REGEX:2}"\)\.[-A-Za-z0-9_.]\+\.po"
 
 find binaries/ -name "*.po" | grep -v "$REGEX" | xargs rm -v || die "Error filtering languages."
 
-SVN_REV=$(svnversion -n ../..)
-echo "${SVN_REV}-release" > build/svn_revision/svn_revision.txt
-
 # Build archive(s) - don't archive the _test.* mods
 pushd binaries/data/mods > /dev/null
 archives=""

source/tools/dist/build-osx-bundle.py

@@ -28,7 +28,11 @@ parser.add_argument('--dev', help='Turn on dev mode, which isn\'t fit for releas
     action="store_true")
 args = parser.parse_args()
 
-BUNDLE_DMG_NAME = "0 A.D."
+BUNDLE_IDENTIFIER = args.bundle_identifier
+BUNDLE_VERSION = args.bundle_version
+BUNDLE_MIN_OSX_VERSION = args.min_osx
+
+BUNDLE_DMG_NAME = f"0ad-{BUNDLE_VERSION}-alpha-osx64"
 BUNDLE_OUTPUT = "0 A.D..app"
 BUNDLE_CONTENTS = BUNDLE_OUTPUT + "/Contents"
 BUNDLE_BIN = BUNDLE_CONTENTS + "/MacOS"
@@ -37,10 +41,6 @@ BUNDLE_FRAMEWORKS = BUNDLE_CONTENTS + "/Frameworks"
 BUNDLE_PLUGINS = BUNDLE_CONTENTS + "/PlugIns"
 BUNDLE_SHAREDSUPPORT = BUNDLE_CONTENTS + "/SharedSupport"
 
-BUNDLE_IDENTIFIER = args.bundle_identifier
-BUNDLE_VERSION = args.bundle_version
-BUNDLE_MIN_OSX_VERSION = args.min_osx
-
 print("Creating bundle directories")
 
 shutil.rmtree(BUNDLE_OUTPUT, ignore_errors=True)

source/tools/dist/build-osx-executable.sh

@@ -29,6 +29,9 @@ if [ ! -d "$SYSROOT" ]; then
 fi
 
 # Assume this is called from trunk/
+SVN_REV=$(svnversion -n .)
+echo "L\"${SVN_REV}-release\"" > build/svn_revision/svn_revision.txt
+
 cd "build/workspaces/"
 
 JOBS=${JOBS:="-j5"}

source/tools/dist/build-unix-win32.sh

@@ -8,7 +8,7 @@ BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.xxx"}
 PREFIX="0ad-${BUNDLE_VERSION}-alpha"
 
 SVN_REV=${SVN_REV:=$(svnversion -n .)}
-echo "${SVN_REV}-release" > build/svn_revision/svn_revision.txt
+echo "L\"${SVN_REV}-release\"" > build/svn_revision/svn_revision.txt
 
 # Collect the relevant files
 tar cf $PREFIX-unix-build.tar \