From dcfcec315368afd781651e609b4664ab22ab73fa Mon Sep 17 00:00:00 2001
From: Pavol Zibrita <pavol.zibrita@gmail.com>
Date: Thu, 9 Jun 2011 03:21:33 +0200
Subject: [PATCH 1/2] adjusted build to newer android sdk

---
 OsmAnd/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 7b3b6cab4e..641fd66308 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -114,7 +114,7 @@
 
 
 	<!-- Compiles this project's .java files into .class files. -->
-	<target name="compile" depends="-resource-src, -aidl, -pre-compile" description="Compiles project's .java files into .class files">
+	<target name="compile" depends="-pre-build, -resource-src, -aidl, -pre-compile" description="Compiles project's .java files into .class files">
 		<if condition="${manifest.hasCode}">
 			<then>
 				<!-- If android rules are used for a test project, its classpath should include

From 8901474c6794f1013ca0fdf96b96924985872126 Mon Sep 17 00:00:00 2001
From: Pavol Zibrita <pavol.zibrita@gmail.com>
Date: Thu, 9 Jun 2011 04:02:29 +0200
Subject: [PATCH 2/2] adjust build scripts for the new server and newer git

---
 build-scripts/build_branches.sh | 2 +-
 build-scripts/copyto_dir.sh     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-scripts/build_branches.sh b/build-scripts/build_branches.sh
index 234676dd73..6e3b46a382 100755
--- a/build-scripts/build_branches.sh
+++ b/build-scripts/build_branches.sh
@@ -32,7 +32,7 @@ do
         ## reset all previous changes in working tree
         git checkout . 
         git reset HEAD --hard
-        git checkout $BRANCH
+        git checkout -f $BRANCH
         git reset $GIT_ORIGIN_NAME/$BRANCH --hard
 	sed -e "s/\(APP_DESCRIPTION.*=.*\"\).*\(\".*\)/\1$SHORT_DATE $BRANCH\2/g" $VERSION_FILE >  ${VERSION_FILE}.bak
         mv ${VERSION_FILE}.bak ${VERSION_FILE}
diff --git a/build-scripts/copyto_dir.sh b/build-scripts/copyto_dir.sh
index 16e38cce89..764716884a 100755
--- a/build-scripts/copyto_dir.sh
+++ b/build-scripts/copyto_dir.sh
@@ -2,8 +2,8 @@
 DIRECTORY=$(cd `dirname $0` && pwd)
 
 FTP_SITE=download.osmand.net
-FTP_FOLDER=/home/osmand/www/night-builds
-FTP_LATEST=/home/osmand/www/latest-night-build
+FTP_FOLDER=/var/www-download/night-builds
+FTP_LATEST=/var/www-download/latest-night-build
 # FTP_USER in local.properties
 # FTP_PWD= in local.properties
 BUILD_DIR="$DIRECTORY"/builds