Hook the mac versioning system up to the new git stuff.

Warzone2100 · Oct 27, 2010 · f13be24 · f13be24
1 parent 0ee3a21
commit f13be24
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/macosx/BuildBot/03_upload.sh b/macosx/BuildBot/03_upload.sh
@@ -11,7 +11,7 @@ uurl="buildbot@buildbot.pc-dummy.net"
 opth="${rtag}/mac/"
 rpth="public_html/"
 lpth="macosx/build/dmgout/out/"
-revt="-r`svnversion -n`"
+revt="-$(git rev-parse -q --short --verify HEAD)"
 dmg_bn="warzone2100"
 dmg_nv="-novideo.dmg"
 tar_dS="-dSYM.tar.gz"

diff --git a/macosx/Resources/Warzone-Info.plist b/macosx/Resources/Warzone-Info.plist
@@ -31,11 +31,11 @@
 	<key>CFBundleVersion</key>
 	<string>SVN_REV</string>
 	<key>CFBundleShortVersionString</key>
-	<string>SVN_URI</string>
+	<string>SVN_TAG [SVN_SHORT_HASH_WITHOUT_QUOTES]</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 The Warzone 2100 Project</string>
 	<key>CFBundleGetInfoString</key>
-	<string>SVN_URI, Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 The Warzone 2100 Project</string>
+	<string>SVN_TAG [SVN_SHORT_HASH_WITHOUT_QUOTES], Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 The Warzone 2100 Project</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.4.0</string>
 	<key>LSRequiresNativeExecution</key>

diff --git a/macosx/Warzone.xcodeproj/project.pbxproj b/macosx/Warzone.xcodeproj/project.pbxproj
@@ -3701,7 +3701,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd ..\nexport PATH=$PATH:/sw/bin:/opt/local/bin\n\n# Wait a bit if Autorevision does not exist\ntick=0\nwhile [ ! -s \"./macosx/build/${CONFIGURATION}/Autorevision\" ]; do\n    let tick=${tick}+1\n    if [ ${tick} == 11 ]; then\n        break\n    fi\n    sleep 1\ndone\n\n\nif ! ./macosx/build/${CONFIGURATION}/Autorevision +cstr . src/autorevision.h; then\n    echo \"error: Could not run Autorevision\"\n    exit 1\nfi\n\nsed -n 's:#define:&:p' src/autorevision.h | sed 's:\"::g' | sed -e 's:tags/::' -e 's:branches/\\(.*\\)$:\\1 (SVN_REV):' -e 's:trunk:Trunk (SVN_REV):' | sed -e 's:_beta: Beta :' -e 's:_rc: RC :' >macosx/build/autorevision.h";
+			shellScript = "cd ..\nexport PATH=$PATH:/sw/bin:/opt/local/bin\n\n# Wait a bit if Autorevision does not exist\ntick=0\nwhile [ ! -s \"./macosx/build/${CONFIGURATION}/Autorevision\" ]; do\n    let tick=${tick}+1\n    if [ ${tick} == 11 ]; then\n        break\n    fi\n    sleep 1\ndone\n\n\nif ! ./macosx/build/${CONFIGURATION}/Autorevision +cstr . src/autorevision.h; then\n    echo \"error: Could not run Autorevision\"\n    exit 1\nfi\n\nsed -n 's:#define:&:p' src/autorevision.h | sed 's:\"::g' | sed -e 's:refs/heads/:branch/:' -e 's:master:Master:' | sed -e 's:_beta: Beta :' -e 's:_rc: RC :' >macosx/build/autorevision.h\n";
 		};
 		4345290E1130F84E002AD731 /* msgfmt */ = {
 			isa = PBXShellScriptBuildPhase;