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

Diff of /auto_update_from_upstream.sh

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

--- auto_update_from_upstream.sh	2010/09/09 21:19:52	113
+++ auto_update_from_upstream.sh	2010/09/09 23:53:30	115
@@ -26,10 +26,8 @@
 	echo $upstream_revision
 	upstream_repository_url=`svn info --xml | grep "<url>" | sed s/"^<url>"// | sed s/"<\/url>$"//`
 	echo "$upstream_repository_url" > "$upstream_trunk/trunk/upstream_repository_url.txt"
-	#UPDATE PCSX2 VERSION
-	PCSX2_VERSION="pcsx2-$upstream_current_version_branch-r$upstream_revision-$downstream_build_configuration";
-	mkdir -p "$downstream_export_location/trunk/bin"
-	echo "$PCSX2_VERSION" > "$downstream_export_location/trunk/bin/pcsx2-version.txt"
+	mkdir -p "$upstream_trunk/trunk/bin"
+	echo "$PCSX2_VERSION" > "$upstream_trunk/trunk/bin/pcsx2-version.txt"
 
 else
 	svn update -r "$upstream_revision" > /dev/null
@@ -39,11 +37,9 @@
 	export upstream_revision=`cat "$upstream_trunk/trunk/upstream_repository_revision.txt"`
 	echo $upstream_revision
 	upstream_repository_url=`svn info --xml | grep "<url>" | sed s/"^<url>"// | sed s/"<\/url>$"//`
-	#UPDATE PCSX2 VERSION
-	PCSX2_VERSION="pcsx2-$upstream_current_version_branch-r$upstream_revision-$downstream_build_configuration";
 	echo "$upstream_repository_url" > "$upstream_trunk/trunk/upstream_repository_url.txt"
-	mkdir -p "$downstream_export_location/trunk/bin"
-	echo "$PCSX2_VERSION" > "$downstream_export_location/trunk/bin/pcsx2-version.txt"
+	mkdir -p "$upstream_trunk/trunk/bin"
+	echo "$PCSX2_VERSION" > "$upstream_trunk/trunk/bin/pcsx2-version.txt"
 
 fi
 
@@ -85,19 +81,18 @@
 echo "Done."
 
 
-#copy current_revision_tag
-cp -f "$upstream_trunk/trunk/upstream_repository_revision.txt" "$downstream_export_location/trunk/upstream_repository_revision.txt" > /dev/null 2>/dev/null
-cp -f "$upstream_trunk/trunk/upstream_repository_url.txt" "$downstream_export_location/trunk/upstream_repository_url.txt" > /dev/null 2>/dev/null
-
-
-
 
 echo
 echo "CREATING DOWNSTREAM TRUNK FOR VERSION: $PCSX2_VERSION"
 
 echo
 echo -n "EXPORTING: $upstream_trunk/trunk to $downstream_export_location/trunk ... "
-svn export --force "$upstream_trunk" "$downstream_export_location" 2>/dev/null
+svn export --force "$upstream_trunk/trunk/" "$downstream_export_location/trunk/" 2>/dev/null
+
+#copy current_revision_tag
+cp -f "$upstream_trunk/trunk/upstream_repository_revision.txt" "$downstream_export_location/trunk/upstream_repository_revision.txt" > /dev/null 2>/dev/null
+cp -f "$upstream_trunk/trunk/upstream_repository_url.txt" "$downstream_export_location/trunk/upstream_repository_url.txt" > /dev/null 2>/dev/null
+cp -f "$upstream_trunk/trunk/bin/pcsx2-version.txt" "$downstream_export_location/trunk/bin/pcsx2-version.txt"
 
 cd "$downstream_export_location"
 "$downstream_export_location/auto_import_3rdparty_deps.sh"

 

  ViewVC Help
Powered by ViewVC 1.1.22