From c78c1a7434b8600c438acdb20554c652ba86da9b Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 23 Jan 2011 12:49:57 +0100
Subject: [PATCH] Prepare old scripts for night building to remove

---
 DataExtractionOSM/build.xml  |  1 +
 OsmAnd/build.xml             | 69 +++++++++++++++++++-----------------
 build-scripts/daily_build.sh |  4 +--
 3 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/DataExtractionOSM/build.xml b/DataExtractionOSM/build.xml
index 7031006511..b1b21abcf8 100644
--- a/DataExtractionOSM/build.xml
+++ b/DataExtractionOSM/build.xml
@@ -102,6 +102,7 @@
 		<delete file="OsmAndMapCreator.jar" />
 	</target>
 
+	<!-- NOT USED now could be deleted -->
 	<typedef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="ant.lib.path" />
 
 	<target name="update">
diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index a8de4d1d64..da352314cc 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -160,39 +160,6 @@
 		<fileset dir="ant-lib" includes="*.jar" />
 	</path>
 
-	<typedef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="lib.path" />
-
-	<target name="update">
-		<svn svnkit="true">
-			<info target="." />
-		</svn>
-		<echo>Current revision: ${svn.info.rev}</echo>
-		<svn svnkit="true">
-			<update dir="." revision="HEAD" />
-			<update dir="${use.absolute.dir}" revision="HEAD" />
-			<info target="." />
-		</svn>
-		<echo>Updated to revision: ${svn.info.rev}</echo>
-		<echo>Modyfing Version.java to include revision info: debug r${svn.info.rev}</echo>
-		<replaceregexp file="${use.absolute.dir}/net/osmand/Version.java" match='(APP_DESCRIPTION.*=.*\").*(\".*)' replace='\1debug r${svn.info.rev}\2' byline="true" />
-	</target>
-
-	<target name="nightbuild" depends="clean,update,debug">
-		<ftp action="del" server="download.osmand.net" userid="${ftp.user}" password="${ftp.password}">
-			<fileset>
-				<include name="night-builds/OsmAnd-debug.apk" />
-			</fileset>
-		</ftp>
-
-
-		<ftp server="download.osmand.net" remotedir="night-builds" userid="${ftp.user}" password="${ftp.password}" depends="yes">
-			<fileset dir="bin">
-				<include name="OsmAnd-debug.apk" />
-			</fileset>
-		</ftp>
-
-	</target>
-
 	<!-- Execute the Android Setup task that will setup some properties
          specific to the target, and import the build rules files.
 
@@ -213,4 +180,40 @@
     -->
 	<setup />
 
+	
+	<!-- NOT used now for night builds could be deleted -->
+	<typedef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="lib.path" />
+	
+	<target name="update">
+		<svn svnkit="true">
+			<info target="." />
+		</svn>
+		<echo>Current revision: ${svn.info.rev}</echo>
+		<svn svnkit="true">
+			<update dir="." revision="HEAD" />
+			<update dir="${use.absolute.dir}" revision="HEAD" />
+			<info target="." />
+		</svn>
+		<echo>Updated to revision: ${svn.info.rev}</echo>
+		<echo>Modyfing Version.java to include revision info: debug r${svn.info.rev}</echo>
+		<replaceregexp file="${use.absolute.dir}/net/osmand/Version.java" match='(APP_DESCRIPTION.*=.*\").*(\".*)' replace='\1debug r${svn.info.rev}\2' byline="true" />
+	</target>
+	
+	
+
+	<target name="nightbuild" depends="clean,update,debug">
+		<ftp action="del" server="download.osmand.net" userid="${ftp.user}" password="${ftp.password}">
+			<fileset>
+				<include name="night-builds/OsmAnd-debug.apk" />
+			</fileset>
+		</ftp>
+
+
+		<ftp server="download.osmand.net" remotedir="night-builds" userid="${ftp.user}" password="${ftp.password}" depends="yes">
+			<fileset dir="bin">
+				<include name="OsmAnd-debug.apk" />
+			</fileset>
+		</ftp>
+
+	</target>
 </project>
diff --git a/build-scripts/daily_build.sh b/build-scripts/daily_build.sh
index 096a4da727..a8b668d02a 100755
--- a/build-scripts/daily_build.sh
+++ b/build-scripts/daily_build.sh
@@ -11,7 +11,7 @@ mkdir $LOG_DIR
 # check build already run today
 if [ -e "$LOG_FILE" ]; then
     echo "Build already ran today"
-   # exit
+    exit
 fi
 touch $LOG_FILE
 
@@ -23,7 +23,7 @@ touch $LOG_FILE
 "${DIRECTORY}/build_branches.sh" &> $LOG_FILE
 
 # 3. upload to ftp server
-#"${DIRECTORY}/upload_ftp.sh" &> $LOG_FILE
+"${DIRECTORY}/upload_ftp.sh" &> $LOG_FILE
 
 # 4. Synchronize github with googlecode mercurial
 "${DIRECTORY}/sync_git_hg.sh" &> $LOG_FILE