Upload binaries to Sourceforge & use VCS_NUM as a human readable refe…

…rence (rather than commit number or BUILD_NUMBER) It is no more possible to host binaries at Github. 2821 was the last manually numbered build. From now, we use VCS_NUM handled by autorevision.
barijaona · Dec 27, 2012 · 8282c85 · 8282c85
1 parent 9d5567a
commit 8282c85
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 34 deletions.
diff --git a/Resources/Vienna-Info.plist b/Resources/Vienna-Info.plist
@@ -52,7 +52,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Vienna</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Vienna version VCS_TAG :VCS_SHORT_HASH:, Copyright 2004-2012 Contributors. See Help/Acknowledgements for list of contributors.</string>
+	<string>Vienna version VCS_TAG (VCS_NUM) - commit VCS_SHORT_HASH, Copyright 2004-2012 Contributors. See Help/Acknowledgements for list of contributors.</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2004-2012 Contributors. See Help/Acknowledgements for list of contributors.</string>
 	<key>CFBundleHelpBookFolder</key>
@@ -70,7 +70,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>VCS_TAG :VCS_SHORT_HASH:</string>
+	<string>VCS_TAG (VCS_NUM) - commit VCS_SHORT_HASH</string>
 	<key>CFBundleSignature</key>
 	<string>Vnna</string>
 	<key>CFBundleURLTypes</key>

diff --git a/Vienna.xcodeproj/project.pbxproj b/Vienna.xcodeproj/project.pbxproj
@@ -45,7 +45,7 @@
 			isa = PBXAggregateTarget;
 			buildConfigurationList = EAAF335914BDE402002A8837 /* Build configuration list for PBXAggregateTarget "Archive and Prep for Upload" */;
 			buildPhases = (
-				EAAF336614BEF4DF002A8837 /* Release to Github */,
+				EAAF336614BEF4DF002A8837 /* Release to Sourceforge */,
 			);
 			dependencies = (
 				43501CFF165D82ED0018EDB7 /* PBXTargetDependency */,
@@ -1047,7 +1047,7 @@
 		439824191666B37000FFE219 /* autorevision.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = autorevision.sh; path = configs/scripts/autorevision.sh; sourceTree = SOURCE_ROOT; };
 		4398241A1666B37000FFE219 /* Changes-and-Notes.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = "Changes-and-Notes.sh"; path = "configs/scripts/Changes-and-Notes.sh"; sourceTree = SOURCE_ROOT; };
 		4398241B1666B37000FFE219 /* Make-ID-Template.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = "Make-ID-Template.sh"; path = "configs/scripts/Make-ID-Template.sh"; sourceTree = SOURCE_ROOT; };
-		4398241C1666B37000FFE219 /* Release-to-Github.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = "Release-to-Github.sh"; path = "configs/scripts/Release-to-Github.sh"; sourceTree = SOURCE_ROOT; };
+		4398241C1666B37000FFE219 /* Release-to-Sourceforge.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = "Release-to-Sourceforge.sh"; path = "configs/scripts/Release-to-Sourceforge.sh"; sourceTree = SOURCE_ROOT; };
 		4398241D1666B37000FFE219 /* Translations.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = Translations.sh; path = configs/scripts/Translations.sh; sourceTree = SOURCE_ROOT; };
 		4398241E1666B3DB00FFE219 /* Acknowledgements.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Acknowledgements.rtf; sourceTree = SOURCE_ROOT; };
 		439824201666B3DB00FFE219 /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGES; sourceTree = SOURCE_ROOT; };
@@ -2117,7 +2117,7 @@
 				439824191666B37000FFE219 /* autorevision.sh */,
 				4398241A1666B37000FFE219 /* Changes-and-Notes.sh */,
 				4398241B1666B37000FFE219 /* Make-ID-Template.sh */,
-				4398241C1666B37000FFE219 /* Release-to-Github.sh */,
+				4398241C1666B37000FFE219 /* Release-to-Sourceforge.sh */,
 				4398241D1666B37000FFE219 /* Translations.sh */,
 			);
 			name = Scripts;
@@ -4147,19 +4147,19 @@
 			shellPath = /bin/sh;
 			shellScript = ". configs/scripts/Acknowledgements.sh";
 		};
-		EAAF336614BEF4DF002A8837 /* Release to Github */ = {
+		EAAF336614BEF4DF002A8837 /* Release to Sourceforge */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Release to Github";
+			name = "Release to Sourceforge";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = ". configs/scripts/Release-to-Github.sh";
+			shellScript = ". configs/scripts/Release-to-Sourceforge.sh";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/changelog.xml b/changelog.xml
diff --git a/configs/scripts/Changes-and-Notes.sh b/configs/scripts/Changes-and-Notes.sh
@@ -2,6 +2,8 @@
 
 . "${OBJROOT}/autorevision.tmp"
 N_VCS_TAG="$(echo "${VCS_TAG}" | sed -e 's:^v/::')"
+BUILD_NUMBER="2821"
+N_VCS_NUM="$(echo "${BUILD_NUMBER} + ${VCS_NUM}" | bc)"
 VIENNA_UPLOADS_DIR="${BUILT_PRODUCTS_DIR}/Uploads"
 VIENNA_NOTES="${SRCROOT}/notes.html"
 
@@ -22,7 +24,7 @@ fi
 cd "${VIENNA_UPLOADS_DIR}"
 
 if [ -f "${VIENNA_NOTES}" ] ; then
-	cp -a "${VIENNA_NOTES}" "noteson${N_VCS_TAG}.${VCS_SHORT_HASH}.html"
+	cp -a "${VIENNA_NOTES}" "noteson${N_VCS_TAG}.${N_VCS_NUM}.html"
 fi
 
 exit 0
diff --git a/configs/scripts/Release-to-Github.sh → configs/scripts/Release-to-Sourceforge.sh b/configs/scripts/Release-to-Github.sh → configs/scripts/Release-to-Sourceforge.sh
@@ -5,13 +5,16 @@ BUILD_NUMBER="2821"
 N_VCS_NUM="$(echo "${BUILD_NUMBER} + ${VCS_NUM}" | bc)"
 N_VCS_TAG="$(echo "${VCS_TAG}" | sed -e 's:^v/::')"
 VIENNA_UPLOADS_DIR="${BUILT_PRODUCTS_DIR}/Uploads"
-DOWNLOAD_BASE_URL="https://github.com/downloads/ViennaRSS/vienna-rss"
-TGZ_FILENAME="Vienna${N_VCS_TAG}.${VCS_SHORT_HASH}.tgz"
-dSYM_FILENAME="Vienna${N_VCS_TAG}.${VCS_SHORT_HASH}-dSYM"
+DOWNLOAD_BASE_URL="http://sourceforge.net/projects/vienna-rss/files"
+MAIN_BASE_URL="http://vienna-rss.sourceforge.net"
+TGZ_FILENAME="Vienna${N_VCS_TAG}.${N_VCS_NUM}.tgz"
+dSYM_FILENAME="Vienna${N_VCS_TAG}.${N_VCS_NUM}-dSYM"
 if [[ "${VCS_TAG}" == *_beta* ]]; then
 	VIENNA_CHANGELOG="changelog_beta.xml"
+	DOWNLOAD_BASE_URL="${DOWNLOAD_BASE_URL}/TestVersions"
 else
 	VIENNA_CHANGELOG="changelog.xml"
+	DOWNLOAD_BASE_URL="${DOWNLOAD_BASE_URL}/ReleasedVersions"
 fi
 
 # codesign setup
@@ -52,6 +55,7 @@ mkdir -p "${VIENNA_UPLOADS_DIR}/${dSYM_FILENAME}"
 cp -a *.dSYM "${VIENNA_UPLOADS_DIR}/${dSYM_FILENAME}"
 cd "${VIENNA_UPLOADS_DIR}"
 tar -czf "${dSYM_FILENAME}.tgz" --exclude '.DS_Store' "${dSYM_FILENAME}"
+rm -rf "${VIENNA_UPLOADS_DIR}/${dSYM_FILENAME}"
 
 
 # Zip up the app
@@ -75,12 +79,12 @@ cat > "${VIENNA_CHANGELOG}" << EOF
 		<language>en-us</language>
 		<copyright>Copyright 2010-2012, Steve Palmer and contributors</copyright>
 		<item>
-			<title>Vienna ${N_VCS_TAG} :${VCS_SHORT_HASH}:</title>
+			<title>Vienna ${N_VCS_TAG}.${N_VCS_NUM}</title>
 			<pubDate>${pubDate}</pubDate>
-			<link>${DOWNLOAD_BASE_URL}/Vienna${N_VCS_TAG}.${VCS_SHORT_HASH}.tgz</link>
+			<link>${DOWNLOAD_BASE_URL}/${N_VCS_TAG}/Vienna${N_VCS_TAG}.${N_VCS_NUM}.tgz/download</link>
 			<sparkle:minimumSystemVersion>${MACOSX_DEPLOYMENT_TARGET}.0</sparkle:minimumSystemVersion>
-			<enclosure url="${DOWNLOAD_BASE_URL}/Vienna${N_VCS_TAG}.${VCS_SHORT_HASH}.tgz" sparkle:version="${N_VCS_NUM}" sparkle:shortVersionString="${N_VCS_TAG} :${VCS_SHORT_HASH}:" length="${TGZSIZE}" type="application/octet-stream"/>
-			<sparkle:releaseNotesLink>${DOWNLOAD_BASE_URL}/noteson${N_VCS_TAG}.${VCS_SHORT_HASH}.html</sparkle:releaseNotesLink>
+			<enclosure url="${DOWNLOAD_BASE_URL}/${N_VCS_TAG}/Vienna${N_VCS_TAG}.${N_VCS_NUM}.tgz/download" sparkle:version="${N_VCS_NUM}" sparkle:shortVersionString="${N_VCS_TAG}.${N_VCS_NUM}" length="${TGZSIZE}" type="application/octet-stream"/>
+			<sparkle:releaseNotesLink>${MAIN_BASE_URL}/noteson${N_VCS_TAG}.${N_VCS_NUM}.html</sparkle:releaseNotesLink>
 		</item>
 	</channel>
 </rss>