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

Diff of /auto_branch_latest_upstream.sh

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

--- auto_branch_latest_upstream.sh	2010/09/09 16:36:45	93
+++ auto_branch_latest_upstream.sh	2010/09/09 16:57:05	94
@@ -1,37 +1,7 @@
 #!/bin/bash
-export SVNTMP="svntmp"
-export SVNROOT_URL="https://svn.netsolutions.dnsalias.com/websvn/ps2/pcsx2/pcsx2_0.9.7/"
-export downstream_export_location="`pwd`"
-export upstream_trunk="$downstream_export_location/upstream"
-export upstream_repsoitory_url=""
-
-export upstream_current_version_branch="0.9.7"
-export downstream_build_configuration="debug"
-
-#export upstream_revision="HEAD"
-#export upstream_revision="3113"
-
-export upstream_revision=`cat "$downstream_export_location/trunk/upstream_repository_revision.txt"`
-export PCSX2_VERSION=`cat "$downstream_export_location/trunk/bin/pcsx2-version.txt"`;
-
-## dummy values -- comment these out after testing
-#export SVNROOT_URL="https://svn.netsolutions.dnsalias.com/websvn/ps2/pcsx2/pcsx2_0.9.7"
-#export downstream_export_location="`pwd`"
-#export upstream_revision="3738"
-#export SVNTMP="svntmp"
-## end dummy
+. ./auto_defs.sh
 
 
-
-export BRANCH_DIR="branch"
-export BRANCH_CONFIGURATION="debug"
-export BRANCH_LINE="0.X"
-export BRANCH_NAME="latest"
-
-export BRANCH_URL="$SVNROOT_URL/$BRANCH_DIR/$BRANCH_CONFIGURATION/$BRANCH_LINE/$BRANCH_NAME"
-export BRANCH_LOCATION="$downstream_export_location/$BRANCH_DIR/$BRANCH_CONFIGURATION/$BRANCH_LINE"
-export BRANCH_COMMIT_MESSAGE="Creating $BRANCH_NAME branch for r$upstream_revision"
-
 export OVERRIDE_UPDATE_NEEDED_CHECK="0"
 if [ "$1" == "--force-update" ] ; then
         OVERRIDE_UPDATE_NEEDED_CHECK="1"
@@ -93,5 +63,5 @@
 
 
 # call auto_build_latest_upstream.sh
-"$downstream_export_location/import_patches.sh"
+"$downstream_export_location/auto_import_patches.sh"
 "$downstream_export_location/auto_build_latest_upstream.sh"

 

  ViewVC Help
Powered by ViewVC 1.1.22