Evaluate the revision number, don't pass around a piped message. Replace + in the hg revision number with nothing, since the buildbot will always have a changed local repository.
authorZachary West <zacw@adiumx.com>
Sat, 18 Apr 2009 02:32:07 -0400
changeset 1848 548b22f58674
parent 1847 e8967cf43658
child 1849 164854e9f08d
Evaluate the revision number, don't pass around a piped message. Replace + in the hg revision number with nothing, since the buildbot will always have a changed local repository.
Adium.xcodeproj/project.pbxproj
Release/Makefile
--- a/Adium.xcodeproj/project.pbxproj	Fri Apr 17 23:18:35 2009 -0700
+++ b/Adium.xcodeproj/project.pbxproj	Sat Apr 18 02:32:07 2009 -0400
@@ -8623,7 +8623,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "PATH=$PATH:/usr/local/bin:/usr/bin:/sw/bin:/opt/local/bin\nbuildid=\"revision id: `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=\"r`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";
 		};
 /* End PBXShellScriptBuildPhase section */
 
--- a/Release/Makefile	Fri Apr 17 23:18:35 2009 -0700
+++ b/Release/Makefile	Sat Apr 18 02:32:07 2009 -0400
@@ -54,7 +54,7 @@
 RELEASE_NAME_ESCAPED=Adium_$(VERSION_ESCAPED)
 TARBALL_DIR=adium-$(VERSION)
 
-REVISION=r`(hg identify --num)`
+REVISION = $(subst +,,$(shell hg id -n))
 
 ifeq ($(NIGHTLY),TRUE)
 	ADIUM_DIR:=$(ADIUM_DIR)\ $(REVISION)
@@ -203,7 +203,7 @@
 endif
 
 tarballapp:
-	rm $(BUILD_DIR)/Adium_temp.tgz || true
+	rm $(BUILD_DIR)/$(RELEASE_NAME).tgz || true
 	cd $(BUILD_DIR) && tar zcf $(RELEASE_NAME).tgz Adium*/ && cd ..
 
 tarball: