Merge branch 'gradle'

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

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

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()
+  }
+}

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'

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