/[pcsx2_0.9.7]/auto_build_latest_upstream.sh
ViewVC logotype

Diff of /auto_build_latest_upstream.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- auto_build_latest_upstream.sh	2010/09/09 20:01:13	104
+++ auto_build_latest_upstream.sh	2010/09/09 21:12:48	109
@@ -1,15 +1,20 @@
 #!/bin/bash
-. ./auto_defs.sh
+#. ./auto_defs.sh
+
+
 
 if [ "$1" != "" ] ; then
         export OVERRIDE_TMP_BUILD_PATH="$1"
         . ./auto_build_defs.sh
 fi
 
+#UPDATE PCSX2 VERSION
+PCSX2_VERSION=`cat "$$PCSX2_BUILD_TMP/bin/pcsx2-version.txt"`
+
 export DISABLE_AUTO_TAG="0"
 
-if [ "$2" == "--no-auto-tag" ] ; then
-        DISABLE_AUTO_TAG="1"
+if [ "$2" == "--no-auto-branch" ] ; then
+        DISABLE_AUTO_BRANCH="1"
 fi
 if [ "$3" == "--no-prebuild" ] ; then
         DISABLE_PREBUILD="1"
@@ -25,7 +30,8 @@
 echo -e "\\tMSBUILD PATH: $MSBUILD"
 echo -e "\\tPCSX2 VCS BUILD PATH: $PCSX2_BUILD_TMP"
 echo -e "\\tPCSX2 VCS PROJECT FILE: $VSC_PROJECT_FILE"
-echo -e "\\tPCSX2 VERSION: $VSC_BUILD_VERSION_UPSTREAM"
+echo -e "\\tPCSX2 UPSTREAM VERSION: $VSC_BUILD_VERSION_UPSTREAM"
+echo -e "\\tPCSX2 LOCAL TRUNK VERSION: $PCSX2_VERSION"
 echo -e "\\tPCSX2 LOCAL VERSION: $VSC_BUILD_VERSION_LOCAL"
 echo
 echo "---------------------------------------------------------------------------------------"
@@ -83,11 +89,11 @@
 	echo
 	echo "AUTOBUILD COMPLETE..."
 	# perform auto tagging
-	if [ "$DISABLE_AUTO_TAG" == "0" ] ; then
-		"$downstream_export_location/auto_branch_latest_upstream.sh"
-		"$downstream_export_location/auto_tag_latest_upstream.sh"
+	if [ "$DISABLE_AUTO_BRANCH" == "0" ] ; then
+		# Always force auto branch update after building
+		"$downstream_export_location/auto_branch_latest_upstream.sh" --force-update
 	else
-		echo "AUTO BUILD TAGGING HAS BEEN DISABLED ... not calling auto_tag_latest_upstream.sh --> to enable do not use --no-auto-tag"
+		echo "AUTO BUILD BRANCH HAS BEEN DISABLED ... not calling auto_branch_latest_upstream.sh --> to enable do not use --no-auto-branch"
 	fi
 else
 

 

  ViewVC Help
Powered by ViewVC 1.1.22