/[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 16:57:05	94
+++ auto_build_latest_upstream.sh	2010/09/09 18:08:52	101
@@ -1,6 +1,20 @@
 #!/bin/bash
 . ./auto_defs.sh
 
+if [ "$1" != "" ] ; then
+        export OVERRIDE_TMP_BUILD_PATH="$1"
+        . ./auto_build_defs.sh
+fi
+
+export DISABLE_AUTO_TAG="0"
+
+if [ "$2" == "--no-auto-tag" ] ; then
+        DISABLE_AUTO_TAG="1"
+fi
+if [ "$3" == "--no-prebuild" ] ; then
+        DISABLE_PREBUILD="1"
+fi
+
 # output variables
 echo "---------------------------------------------------------------------------------------"
 echo "AUTO BUILD CONFIG:"
@@ -8,36 +22,28 @@
 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: "
-echo -e "\\tPCSX2 LOCAL VERSION: "
+echo -e "\\tPCSX2 VERSION: $VSC_BUILD_VERSION_UPSTREAM"
+echo -e "\\tPCSX2 LOCAL VERSION: $VSC_BUILD_VERSION_LOCAL"
 echo
 echo "---------------------------------------------------------------------------------------"
 
 echo
 echo "PERFORMING AUTOBUILD:"
 
+        
 
-#clean up BUILD_TMP_DIR
-cd "$BUILD_TMP_DIR"
-rm -Rf *
-
-# Make Build TMP Path
-mkdir -p "$PCSX2_BUILD_TMP"
-
-cd "$PCSX2_BUILD_TMP"
-
-echo
-echo "PERFORMING PREBUILD:"
-# export latest branch to tmp dir
-echo -ne "\\tCOPYING: "$BRANCH_LOCATION/$BRANCH_NAME" to $PCSX2_BUILD_TMP ... "
-#svn export --force "$BRANCH_LOCATION/$BRANCH_NAME" "$PCSX2_BUILD_TMP" 2>/dev/null
-cp -Rf "$BRANCH_LOCATION/$BRANCH_NAME"/* "$PCSX2_BUILD_TMP" 2>/dev/null && echo "done." || echo "failed."
-
-
-# remove all .pch files
-find -name *.pch -exec rm -f {} \;
-echo "PREBUILD COMPLETED..."
-echo
+# call auto prebuild
+if [ "$DISABLE_PREBUILD" == "0" ] ; then
+if [ "$AUTO_PREBUILD_DONE" == "" ] ; then
+	"$downstream_export_location/auto_prebuild_latest_upstream.sh"
+	if [ "$AUTO_PREBUILD_DONE" != "true" ] ; then
+		echo "PREBUILD FAILED..."
+		exit 1
+	fi	
+else
+echo "PREBUILD HAS BEEN DISABLED..."	
+echo	
+fi
 
 # START VISUAL STUDIO BUILD SUPPORT
 export BUILD_SUCCESS=0
@@ -67,7 +73,11 @@
 	echo
 	echo "AUTOBUILD COMPLETE..."
 	# perform auto tagging
-	"$downstream_export_location/auto_tag_latest_upstream.sh"
+	if [ "$DISABLE_AUTO_TAG" == "0" ] ; then
+		"$downstream_export_location/auto_tag_latest_upstream.sh"
+	else
+		echo "AUTO BUILD TAGGING HAS BEEN DISABLED ... not calling auto_tag_latest_upstream.sh --> to enable do not use --no-auto-tag"
+	fi
 else
 
 	# CLEANUP

 

  ViewVC Help
Powered by ViewVC 1.1.22