added new gdx-setup to build, not specifying main class in manifest atm

diff --git a/build.xml b/build.xml
index 6f8de0d..0566056 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -32,6 +32,17 @@
                <ant antfile="build.xml" dir="extensions/gdx-setup-ui/"/>\r
                <copy tofile="${distDir}/gdx-setup-ui.jar" file="extensions/gdx-setup-ui/gdx-setup-ui.jar"/>\r
        </target>\r
+    \r
+    <!-- new gdx setup -->\r
+    <target name="gdx-setup">\r
+               <fileset id="resourcefiles" dir="extensions/gdx-setup/src">\r
+            <exclude name="**/*.java"/>\r
+               </fileset>\r
+               <ant antfile="../../build-template.xml" dir="extensions/gdx-setup">\r
+                       <property name="jar" value="gdx-setup"/>\r
+                       <reference refid="resourcefiles"/>\r
+               </ant>\r
+    </target>\r
 \r
        <!-- gdx core -->\r
        <target name="gdx-core" depends="gdx-jnigen">\r
@@ -314,7 +325,7 @@
        </target>\r
 \r
        <target name="jars"\r
-depends="clean,gdx-setup-ui,gdx-core,gdx-openal,gdx-backend-lwjgl,gdx-backend-jglfw,gdx-backend-android,gdx-backend-gwt,gdx-backend-robovm,gdx-tools,gdx-controllers,gdx-controllers-desktop,gdx-controllers-android,gdx-controllers-gwt,gdx-image,gdx-audio,gdx-freetype,gdx-bullet,gdx-tiled-preprocessor"/>\r
+depends="clean,gdx-setup-ui,gdx-setup,gdx-core,gdx-openal,gdx-backend-lwjgl,gdx-backend-jglfw,gdx-backend-android,gdx-backend-gwt,gdx-backend-robovm,gdx-tools,gdx-controllers,gdx-controllers-desktop,gdx-controllers-android,gdx-controllers-gwt,gdx-image,gdx-audio,gdx-freetype,gdx-bullet,gdx-tiled-preprocessor"/>\r
 \r
        <target name="all" depends="jars,docs">\r
                <!-- copy distribution files (licences etc.) -->\r

diff --git a/extensions/gdx-setup/src/com/badlogic/gdx/setup/GdxSetup.java b/extensions/gdx-setup/src/com/badlogic/gdx/setup/GdxSetup.java
index a270b1d..c2c3573 100644 (file)
--- a/extensions/gdx-setup/src/com/badlogic/gdx/setup/GdxSetup.java
+++ b/extensions/gdx-setup/src/com/badlogic/gdx/setup/GdxSetup.java
@@ -2,7 +2,6 @@ package com.badlogic.gdx.setup;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;

diff --git a/extensions/gdx-setup/src/com/badlogic/gdx/setup/resources/desktop/build.gradle b/extensions/gdx-setup/src/com/badlogic/gdx/setup/resources/desktop/build.gradle
index ab51e84..de3a559 100644 (file)
--- a/extensions/gdx-setup/src/com/badlogic/gdx/setup/resources/desktop/build.gradle
+++ b/extensions/gdx-setup/src/com/badlogic/gdx/setup/resources/desktop/build.gradle
@@ -14,3 +14,7 @@ tasks.ideaModule.doFirst {
 eclipse.project {
     name = appName + "-desktop"
 }
+
+run {
+  ignoreExitValue = true
+}