From cee96c9ed028d22c851b0d9997256c670f3cabdb Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Sat, 1 Mar 2014 15:58:08 +0100
Subject: [PATCH 1/3] gradle: test configureondemand

---
 gradle.properties         | 19 +++++++++++++++++++
 vtm-gdx-html/build.gradle |  5 +++++
 vtm/build.gradle          |  1 -
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 gradle.properties

diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..04262388
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,19 @@
+# VERSION_NAME=0.9.2-SNAPSHOT
+# VERSION_CODE=92
+# GROUP=com.github.chrisbanes.actionbarpulltorefresh
+
+# POM_DESCRIPTION=A vector-tile-map for android, java-desktop and gwt 
+# POM_URL=https://github.com/hjanetzek/vtm
+# POM_SCM_URL=https://github.com/hjnaetzek/vtm
+# POM_SCM_CONNECTION=scm:git@github.com:hjanetzek/vtm.git
+# POM_SCM_DEV_CONNECTION=scm:git@github.com:hjanetzek/vtm.git
+# POM_LICENCE_NAME=GNU Lesser General Public License, Version 3.0
+# POM_LICENCE_URL=http://www.gnu.org/licenses/lgpl-3.0.txt
+# POM_LICENCE_DIST=repo
+# POM_DEVELOPER_ID=hjanetzek
+# POM_DEVELOPER_NAME=Hannes Janetzek
+
+#org.gradle.daemon=true
+#org.gradle.parallel=true
+org.gradle.configureondemand=true
+org.gradle.jvmargs=-Xmx1024m
diff --git a/vtm-gdx-html/build.gradle b/vtm-gdx-html/build.gradle
index d6f87369..5a2a6120 100644
--- a/vtm-gdx-html/build.gradle
+++ b/vtm-gdx-html/build.gradle
@@ -31,6 +31,11 @@ dependencies {
   providedCompile 'org.slf4j:slf4j-api:1.7.5'
 }
 
+// explicit dependencies for org.gradle.configureondemand=true
+evaluationDependsOn(':vtm')
+evaluationDependsOn(':vtm-themes')
+evaluationDependsOn(':vtm-gdx')
+
 gwt {
   gwtVersion='2.6.0'
   modules 'org.oscim.gdx.GwtDefinition'
diff --git a/vtm/build.gradle b/vtm/build.gradle
index e8f71e00..beee9872 100644
--- a/vtm/build.gradle
+++ b/vtm/build.gradle
@@ -11,7 +11,6 @@ dependencies {
 sourceSets {
   main.java.srcDirs = ['src']
   main.compileClasspath += configurations.providedCompile
-  //main.resources.srcDirs = ['assets']
 }
 
 //... there is probably a better way

From 3118086ff37c054a63ef1e87f04f1da91053dc91 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Sat, 1 Mar 2014 16:01:16 +0100
Subject: [PATCH 2/3] gradle: add android-example run task

---
 vtm-android-example/build.gradle | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle
index a637d7c1..8441e321 100644
--- a/vtm-android-example/build.gradle
+++ b/vtm-android-example/build.gradle
@@ -64,5 +64,17 @@ eclipse.project {
   buildCommand 'com.android.ide.eclipse.adt.ResourceManagerBuilder'
   buildCommand 'com.android.ide.eclipse.adt.PreCompilerBuilder'
   buildCommand 'com.android.ide.eclipse.adt.ApkBuilder'
-
 }
+
+
+task run (dependsOn: 'installDebug'){
+  doFirst {
+    println(">> adb run...")
+    String adb = System.getenv()['ANDROID_HOME'] + '/platform-tools/adb'
+    String cmd = "${adb} shell am start -n org.oscim.android.test/.Samples"
+    def proc = cmd.execute()
+    proc.in.eachLine {line -> println line}
+    proc.err.eachLine {line -> System.err.println( 'ERROR: ' + line)}
+    proc.waitFor()
+  }
+}
\ No newline at end of file

From 45dba4443258d1f4da987115a32dd7b84897e778 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Sat, 1 Mar 2014 16:15:32 +0100
Subject: [PATCH 3/3] update README

---
 README.md | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index a0beb8e2..4741afff 100644
--- a/README.md
+++ b/README.md
@@ -19,13 +19,6 @@ VTM is part of the OpenScienceMap project and developed at University of Bremen.
   - HTML5/WebGL (through libgdx and GWT)
   - iOS sooner or later
 
-## Getting started
-
-`git clone --recursive https://github.com/opensciencemap/vtm`
-
-`cd vtm/vtm-android-app/assets && ln -s ../../vtm/assets/* .`
-
-
 ### Projects
 - **vtm** contains the core library
 - **vtm-android** Android backend  (no libgdx required)
@@ -36,15 +29,26 @@ VTM is part of the OpenScienceMap project and developed at University of Bremen.
 - **vtm-gdx-html** HTML5/GWT application
 - **vtm-gdx-android** Android application using libgdx backend
 
-### Eclipse
-Import all 'vtm' projects that you need into Eclipse.
+## Getting started
 
-### Gradle / Android-Studio
-Just import build.gradle - should work, not much tested though. <br/>
-Or run gradle tasks from the commandline:<br/>
+`git clone --recursive https://github.com/opensciencemap/vtm`
+
+### Eclipse
+```
+export ANDROID_HOME=/path/to/android-sdk
+./gradlew eclipse
+```
+Import all 'vtm' sub-projects into Eclipse.
+
+### Android-Studio
+Just import build.gradle - should work, not much tested though.
+
+### Gradle
+Or run gradle tasks directly (see also `./gradlew -q tasks`):<br/>
 `./gradlew clean install` <br/> to build the libraries and add them to the local maven repository.<br/>
-`./gradlew :vtm-android-example:installDebug` <br/> to run the android example<br/>
-`./gradlew :vtm-gdx-desktop:run` <br/>to run the desktop demo (only Linux and Win64 or compile the native libs)
+`./gradlew :vtm-android-example:run` <br/> to run the android example<br/>
+`./gradlew :vtm-gdx-desktop:run` <br/>to run the desktop demo (only Linux64 and Win64 native libs are provided atm)<br/>
+`./gradlew :vtm-gdx-html:jettyDraftWar` <br/>to run the webgl demo<br/>
 
 
 ## WebGL Demo