Use `hg parent` for identifying builds. Fixes #11943.
authorZachary West <zacw@adium.im>
Wed, 06 May 2009 22:36:16 -0400
changeset 2107 6dcbf494dbd6
parent 2106 93eace207ab3
child 2108 e5bf51783c88
Use `hg parent` for identifying builds. Fixes #11943.
Adium.xcodeproj/project.pbxproj
Release/Makefile
--- a/Adium.xcodeproj/project.pbxproj	Wed May 06 17:50:21 2009 -0700
+++ b/Adium.xcodeproj/project.pbxproj	Wed May 06 22:36:16 2009 -0400
@@ -9928,7 +9928,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "PATH=$PATH:/usr/local/bin:/usr/bin:/sw/bin:/opt/local/bin\nbuildid=\"`hg identify --id`\"\n\necho \"#define BUILDID $buildid\" > $SCRIPT_OUTPUT_FILE_0\necho \"#define BUILDDATE `date +%s`\" >> $SCRIPT_OUTPUT_FILE_0\necho \"#define WHOAMI `whoami`\" >> $SCRIPT_OUTPUT_FILE_0\n\n# Delete the intermediate Info.plist so that Xcode re-preprocesses the Info.plist with our updated macros.\n# Use -f because after a clean build, this file doesn't exist yet, so a plain rm would fail and stop the build.\nrm -f \"${CONFIGURATION_TEMP_DIR}/Adium.build/Preprocessed-Info.plist\"\n";
+			shellScript = "PATH=$PATH:/usr/local/bin:/usr/bin:/sw/bin:/opt/local/bin\nbuildid=\"`hg parent --template {node\\|short}`\"\n\necho \"#define BUILDID $buildid\" > $SCRIPT_OUTPUT_FILE_0\necho \"#define BUILDDATE `date +%s`\" >> $SCRIPT_OUTPUT_FILE_0\necho \"#define WHOAMI `whoami`\" >> $SCRIPT_OUTPUT_FILE_0\n\n# Delete the intermediate Info.plist so that Xcode re-preprocesses the Info.plist with our updated macros.\n# Use -f because after a clean build, this file doesn't exist yet, so a plain rm would fail and stop the build.\nrm -f \"${CONFIGURATION_TEMP_DIR}/Adium.build/Preprocessed-Info.plist\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
--- a/Release/Makefile	Wed May 06 17:50:21 2009 -0700
+++ b/Release/Makefile	Wed May 06 22:36:16 2009 -0400
@@ -54,7 +54,7 @@
 RELEASE_NAME_ESCAPED=Adium_$(VERSION_ESCAPED)
 TARBALL_DIR=adium-$(VERSION)
 
-REVISION = $(subst +,,r$(shell hg id -n))
+REVISION = r$(shell hg parent --template {rev})
 
 ifeq ($(NIGHTLY),TRUE)
 	ADIUM_DIR:=$(ADIUM_DIR)\ $(REVISION)