diff --git a/build.gradle b/build.gradle index 314d64ef..8b5325f6 100644 --- a/build.gradle +++ b/build.gradle @@ -31,5 +31,4 @@ subprojects { } eclipseProject.dependsOn copySettings - } diff --git a/vtm-gdx-html/HOWTO-SuperDevMode.txt b/vtm-gdx-html/HOWTO-SuperDevMode.txt index 3ce71b53..f87143bf 100644 --- a/vtm-gdx-html/HOWTO-SuperDevMode.txt +++ b/vtm-gdx-html/HOWTO-SuperDevMode.txt @@ -5,16 +5,10 @@ For an introduction see: http://www.gwtproject.org/articles/superdevmode.html http://www.badlogicgames.com/wordpress/?p=3073 -Preparation: -- Change build.xml <property name="gwt.location" value="/home/src/gwt-2.5.1" /> to the appropriate location. - Then run 'ant extract-jars' - -- To serve tiles and the html project from the same origin one can use this apache2 configuration: - ProxyPass /tiles/ http://city.informatik.uni-bremen.de/tiles/vtm/ - ProxyPassReverse /tiles/ http://city.informatik.uni-bremen.de/tiles/vtm/ - -- Create a link to the project by 'ln -s /path/to/vtm/vtm-gdx-html/war ~/public_html/vtm' - to make it available via http://localhost/~my_user/vtm - Running: -- The codeserver can be executed with 'ant VTMSuperDevMode' +- Serve the website +$../gradlew jettyDraftWar + +- The codeserver can be executed on another shell +$export _JAVA_OPTIONS="-Xmx1024m" +$../gradlew gwtSuperDev diff --git a/vtm-gdx-html/build.gradle b/vtm-gdx-html/build.gradle index 30fe8a9d..9f1205fb 100644 --- a/vtm-gdx-html/build.gradle +++ b/vtm-gdx-html/build.gradle @@ -1,9 +1,10 @@ buildscript { repositories { + mavenLocal() + mavenCentral() maven { url 'https://github.com/steffenschaefer/gwt-gradle-plugin/raw/maven-repo/' } - mavenCentral() } dependencies { classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.3' @@ -32,12 +33,11 @@ dependencies { providedCompile 'org.slf4j:slf4j-api:1.7.5' } -task copyAssets(type: Copy) { - from "$rootDir/vtm/assets" - into "$buildDir/gwt/draftOut/assets" - include '**/*' -} - +// task copyAssets(type: Copy) { +// from "$rootDir/vtm/assets" +// into "$buildDir/gwt/draftOut/assets" +// include '**/*' +// } //compileGwt.dependsOn copyAssets //draftCompileGwt.dependsOn copyAssets @@ -45,20 +45,17 @@ task copyAssets(type: Copy) { gwt { gwtVersion='2.5.1' modules 'org.oscim.gdx.GwtDefinition' - + superDev { noPrecompile=true } - - src += files(sourceSets.main.java.srcDirs) - src += files(project(':vtm').sourceSets.main.allJava.srcDirs) - //src += files(project(':vtm').sourceSets.main.output.resourcesDir) - - src += files(project(':vtm-gdx').sourceSets.main.allJava.srcDirs) - //src += files(project(':vtm-gdx').sourceSets.main.output.resourcesDir) - //src += files(project(':vtm-gdx-html').sourceSets.main.allJava.srcDirs) -} + src += files(sourceSets.main.java.srcDirs) + src += files(project(':vtm').sourceSets.main.allJava.srcDirs) + src += files(project(':vtm-themes').sourceSets.main.allJava.srcDirs) + src += files(project(':vtm-themes').sourceSets.main.resources.srcDirs) + src += files(project(':vtm-gdx').sourceSets.main.allJava.srcDirs) +} // Configuring Eclipse classpath eclipse.classpath { @@ -68,7 +65,7 @@ eclipse.classpath { file { whenMerged { classpath -> - classpath.entries.findAll { entry -> + classpath.entries.findAll { entry -> entry.path == 'src' }*.excludes = ['main','org/oscim/gdx/emu/'] } // Direct manipulation of the generated classpath XML diff --git a/vtm-gdx-html/build.xml b/vtm-gdx-html/build.xml deleted file mode 100644 index fa80fd24..00000000 --- a/vtm-gdx-html/build.xml +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<project basedir="." default="build" name="vtm-gdx-html"> - <property environment="env" /> - <property name="gwt.location" value="/home/src/gwt-2.5.1" /> - <property name="vtm-libs.location" value="../vtm-ext-libs" /> - <property name="vtm.location" value="../vtm" /> - <property name="vtm-gdx.location" value="../vtm-gdx" /> - <property name="debuglevel" value="source,lines,vars" /> - <property name="target" value="1.6" /> - <property name="source" value="1.6" /> - <path id="vtm.classpath"> - <pathelement location="${vtm.location}/bin" /> - <pathelement location="${vtm-libs.location}/findbugs/annotations.jar" /> - <pathelement location="${vtm-libs.location}/libs/slf4j-api-1.7.5.jar" /> - </path> - <path id="vtm-gdx.classpath"> - <pathelement location="${vtm-gdx.location}/bin" /> - <path refid="vtm.classpath" /> - <pathelement location="${vtm-libs.location}/gdx/gdx.jar" /> - </path> - <path id="GWT SDK [gwt-2.5.1 - 2.5.1].libraryclasspath"> - <pathelement location="${gwt.location}/gwt-user.jar" /> - <pathelement location="${gwt.location}/gwt-dev.jar" /> - <pathelement location="${gwt.location}/validation-api-1.0.0.GA.jar" /> - <pathelement location="${gwt.location}/validation-api-1.0.0.GA-sources.jar" /> - </path> - <path id="vtm-gdx-html.classpath"> - <pathelement location="war/WEB-INF/classes" /> - <path refid="vtm-gdx.classpath" /> - <path refid="GWT SDK [gwt-2.5.1 - 2.5.1].libraryclasspath" /> - <path refid="vtm.classpath" /> - <pathelement location="${vtm-libs.location}/gdx/gdx-backend-gwt-sources.jar" /> - <pathelement location="${vtm-libs.location}/gdx/gdx-backend-gwt.jar" /> - <pathelement location="${vtm-libs.location}/gdx/gdx-sources.jar" /> - <pathelement location="${vtm-libs.location}/gdx/gdx.jar" /> - <pathelement location="${vtm-libs.location}/libs/hudson-gwt-slf4j-2.1.2.jar" /> - </path> - <path id="run.VTMSuperDevMode.classpath"> - <path refid="vtm-gdx-html.classpath" /> - <pathelement location="${gwt.location}/gwt-codeserver.jar" /> - </path> - <target name="init"> - <mkdir dir="war/WEB-INF/classes" /> - <copy includeemptydirs="false" todir="war/WEB-INF/classes"> - <fileset dir="src"> - <exclude name="**/*.launch" /> - <exclude name="**/*.java" /> - <exclude name="org/oscim/gdx/emu/" /> - </fileset> - </copy> - <copy includeemptydirs="false" todir="war/WEB-INF/classes"> - <fileset dir="src/org/oscim/gdx/emu"> - <exclude name="**/*.launch" /> - <exclude name="**/*.java" /> - </fileset> - </copy> - </target> - <target name="clean"> - <delete dir="war/WEB-INF/classes" /> - </target> - <target depends="clean" name="cleanall"> - <ant antfile="build.xml" dir="${vtm.location}" inheritAll="false" target="clean" /> - <ant antfile="build.xml" dir="${vtm-gdx.location}" inheritAll="false" target="clean" /> - </target> - <target depends="build-subprojects,build-project" name="build" /> - <target name="build-subprojects"> - <ant antfile="build.xml" dir="${vtm.location}" inheritAll="false" target="build-project" /> - <ant antfile="build.xml" dir="${vtm-gdx.location}" inheritAll="false" target="build-project" /> - </target> - <target depends="init" name="build-project"> - <echo message="${ant.project.name}: ${ant.file}" /> - <javac debug="true" debuglevel="${debuglevel}" destdir="war/WEB-INF/classes" includeantruntime="false" source="${source}" target="${target}"> - <src path="src" /> - <src path="src/org/oscim/gdx/emu" /> - <exclude name="org/oscim/gdx/emu/" /> - <classpath refid="vtm-gdx-html.classpath" /> - </javac> - </target> - <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects" /> - - <target name="extract-jars"> - <unzip src="${vtm-libs.location}/gdx/gdx-sources.jar" dest="war/WEB-INF/lib/"> - </unzip> - <unzip src="${vtm-libs.location}/gdx/gdx-backend-gwt-sources.jar" dest="war/WEB-INF/lib/"> - </unzip> - <unzip src="${vtm-libs.location}/libs/hudson-gwt-slf4j-2.1.2.jar" dest="war/WEB-INF/lib/"> - </unzip> - </target> - <target name="VTMSuperDevMode"> - <java classname="com.google.gwt.dev.codeserver.CodeServer" failonerror="true" fork="yes"> - <arg line="-src src/ -src ../vtm/src/ -src ../vtm-gdx/src/ -src war/WEB-INF/lib/ org.oscim.gdx.GwtDefinition" /> - <classpath refid="run.VTMSuperDevMode.classpath" /> - </java> - </target> -</project> diff --git a/vtm-gdx-html/src/org/oscim/gdx/GwtDefinition.gwt.xml b/vtm-gdx-html/src/org/oscim/gdx/GwtDefinition.gwt.xml index 1fd7928d..c0e21f98 100644 --- a/vtm-gdx-html/src/org/oscim/gdx/GwtDefinition.gwt.xml +++ b/vtm-gdx-html/src/org/oscim/gdx/GwtDefinition.gwt.xml @@ -21,9 +21,8 @@ <super-source path="emu" /> - <set-configuration-property name="gdx.assetpath" value="../vtm/assets" /> - - <!-- for gradle build --> + <set-configuration-property name="gdx.assetpath" value="../vtm-themes/resources/assets" /> + <!-- for gradle build, commend out for eclipse build/devmode --> <set-configuration-property name="gdx.assetoutputpath" value="build/gwt/draftOut" /> <set-property name="user.agent" value="safari"/> diff --git a/vtm-gdx/build.gradle b/vtm-gdx/build.gradle index 98c581b4..dbb10fd0 100644 --- a/vtm-gdx/build.gradle +++ b/vtm-gdx/build.gradle @@ -2,13 +2,13 @@ apply plugin: 'java' apply plugin: 'maven' sourceSets { - main.java.srcDirs = ['src'] - main.resources.srcDirs = ['src'] + main.java.srcDirs = ['src'] + main.resources.srcDirs = ['src'] } dependencies { - compile project(':vtm') - compile project(':vtm-themes') - compile files('../vtm-ext-libs/gdx/gdx.jar') - //compile "com.badlogicgames.gdx:gdx:$gdxVersion" -} \ No newline at end of file + compile project(':vtm') + compile project(':vtm-themes') + compile files('../vtm-ext-libs/gdx/gdx.jar') + //compile "com.badlogicgames.gdx:gdx:$gdxVersion" +}