adium-1.4 3573:efc9b61fd2e1: Multi-Nightly Support

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/efc9b61fd2e1
revision:	3573:efc9b61fd2e1
branch:		(none)
author:		Adrian Godoroja <robotive at me.com>
date:		Wed Jul 27 11:51:57 2011 +0300

Multi-Nightly Support

diffs (117 lines):

diff -r 18dd2db94025 -r efc9b61fd2e1 Release/Makefile
--- a/Release/Makefile	Mon Jul 18 13:50:37 2011 +0300
+++ b/Release/Makefile	Wed Jul 27 11:51:57 2011 +0300
@@ -24,12 +24,14 @@
 
 # Always builds in debug mode.
 NIGHTLY?=FALSE
+NIGHTLY_REPO?=adium-1.4 #change to adium-1.4 on the 1.4 branch
+NIGHTLY_BRANCH?=default
 
 ###########
 # To release!
 # Releasing requires cachefly access and adiumx.com access.
 #
-# First upload to cachefly. If you don't have access and need to do a release, get with Evan or Eric.
+# First upload to cachefly. If you don't have access and need to do a release, get with Evan or Chris (tick).
 # Triggering the version checker once the release is up:
 # 1) Build Adium
 # 2) Get the number out of the 'buildnum' file in Adium.app/Contents/Resources
@@ -117,9 +119,13 @@
 
 version:
 	@# update the plists
-	defaults write $(ADIUM_PLIST) CFBundleGetInfoString "$(VERSION), Copyright 2001-2011 The Adium Team"
+	defaults write $(ADIUM_PLIST) CFBundleGetInfoString "$(VERSION), Copyright 2001-$(shell date +"%Y") The Adium Team"
 	defaults write $(ADIUM_PLIST) CFBundleVersion "$(VERSION)"
 	defaults write $(ADIUM_PLIST) CFBundleShortVersionString "$(VERSION)"
+ifeq ($(NIGHTLY),TRUE)
+    defaults write $(ADIUM_PLIST) AINightlyRepo "$(NIGHTLY_REPO)"
+    defaults write $(ADIUM_PLIST) AINightlyBranch "$(NIGHTLY_BRANCH)"
+end
 	plutil -convert xml1 $(ADIUM_PLIST).plist
 
 compile:
@@ -144,10 +150,10 @@
 ifeq ($(BUILD_IN_DEBUG_MODE),FALSE)
 	find $(BUILD_DIR) \( -name classes.nib -or -name info.nib -or -name designable.nib \) -type f -delete
 endif
-	
+
 	@# delete backup files
 	find $(BUILD_DIR) \( -name "*~" -or -name .DS_Store \) -type f -delete
-	
+
 	@# delete header files
 	find $(BUILD_DIR) \( -name "*.h" \) -type f -delete
 
@@ -165,14 +171,14 @@
 	mkdir $(BUILD_DIR)
 
 	mkdir $(ADIUM_DIR)
-	
+
 	@# copy the app
 	cp -R "$(ADIUM_BUILD_DIR)/Adium.app" $(ADIUM_DIR)
 
 	@# copy the text files
-	cp $(SRC_DIR)/ChangeLogs/Changes.txt $(ADIUM_DIR)	
+	cp $(SRC_DIR)/ChangeLogs/Changes.txt $(ADIUM_DIR)
 	cp $(SRC_DIR)/License.txt $(ADIUM_DIR)
-	
+
 	@# symlink /Applications
 	./mkalias -r /Applications $(ADIUM_DIR)/Applications
 
@@ -184,7 +190,7 @@
 
 	./ensureCustomIconsExtracted $(ART_DIR)
 	./make-diskimage.sh $(BUILD_DIR)/$(RELEASE_NAME).dmg $(ADIUM_DIR) "Adium $(VERSION)" dmg_adium.scpt $(ART_DIR)
-	
+
 ifeq ($(OFFICIAL_BUILD),TRUE)
 	@echo DSA for Sparkle: `ruby sign_update.rb $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED).dmg ~/adium-dsa-sign/dsa_priv.pem`
 endif
@@ -208,4 +214,4 @@
 	cd $(BUILD_DIR) && tar zcf $(RELEASE_NAME).tgz Adium*/ && cd ..
 
 tarball:
-	hg archive -t tgz ($TARBALL_DIR).tgz
+	hg archive -t tgz ($TARBALL_DIR).tgz
\ No newline at end of file
diff -r 18dd2db94025 -r efc9b61fd2e1 Release/upload-nightly.sh
--- a/Release/upload-nightly.sh	Mon Jul 18 13:50:37 2011 +0300
+++ b/Release/upload-nightly.sh	Wed Jul 27 11:51:57 2011 +0300
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# You need to set NIGHTLY_HOST and NIGHTLY_USER in environment, and have your 
+# You need to set NIGHTLY_HOST, NIGHTLY_USER, NIGHTLY_REPO, and NIGHTLY_BRANCH in environment, and have your 
 # public key in the authorized_keys file on the nightly server.
 
 # Set our working directory to be the parent of this script, in case we're run
@@ -9,6 +9,5 @@
 cd ${PARENT:-.}
 
 ADIUM_RELEASE_NAME=`head -n 1 build/latest.info | tail -n 1`
-scp build/latest.info build/${ADIUM_RELEASE_NAME}.dmg.md5 build/${ADIUM_RELEASE_NAME}.dmg ${NIGHTLY_USER}@${NIGHTLY_HOST}:
-ssh ${NIGHTLY_USER}@${NIGHTLY_HOST} chmod go+r ${ADIUM_RELEASE_NAME}.dmg latest.info ${ADIUM_RELEASE_NAME}.dmg.md5
-
+scp build/latest.info build/${ADIUM_RELEASE_NAME}.dmg.md5 build/${ADIUM_RELEASE_NAME}.dmg ${NIGHTLY_USER}@${NIGHTLY_HOST}:${NIGHTLY_REPO}-${NIGHTLY_BRANCH}
+ssh ${NIGHTLY_USER}@${NIGHTLY_HOST} chmod go+r ${ADIUM_RELEASE_NAME}.dmg latest.info ${ADIUM_RELEASE_NAME}.dmg.md5
\ No newline at end of file
diff -r 18dd2db94025 -r efc9b61fd2e1 Source/AIAdium.m
--- a/Source/AIAdium.m	Mon Jul 18 13:50:37 2011 +0300
+++ b/Source/AIAdium.m	Wed Jul 27 11:51:57 2011 +0300
@@ -1059,7 +1059,11 @@
 	[profileInfo addObject:UPDATE_TYPE_DICT];
 #ifdef NIGHTLY_RELEASE
 	NSString *buildId = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"AIBuildIdentifier"];
+	NSString *nightlyRepo = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"AINightlyRepo"];
+	NSString *nightlyBranch = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"AINightlyBranch"];
 	[profileInfo addObject:[NSDictionary dictionaryWithObjectsAndKeys:@"revision", @"key", @"Revision", @"visibleKey", buildId, @"value", buildId, @"visibleValue", nil]];
+	[profileInfo addObject:[NSDictionary dictionaryWithObjectsAndKeys:@"repo", @"key", nightlyRepo, @"value", nil]];
+	[profileInfo addObject:[NSDictionary dictionaryWithObjectsAndKeys:@"branch", @"key", nightlyBranch, @"value", nil]];
 #endif
 
 	if (sendProfileInfo) {