summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWade Walker <[email protected]>2011-02-17 11:20:39 -0600
committerWade Walker <[email protected]>2011-02-18 08:52:34 -0600
commite5777ec9e6ea79e0aface29fa679ccea4035f0e2 (patch)
tree3c6aa4c6f51c9ffcac7724b7a17dbc08494147cc
parent943313af19da04044dddda57cb6bc4bd399eb76e (diff)
Add new all.ide target for use in Eclipse, NetBeans, and IntelliJ
The new target just omits final JAR creation and file copying for extra speed within an IDE. We also change where Eclipse looks for the native libraries, since this new target doesn't copy them to jogl/build/lib.
-rw-r--r--.classpath16
-rw-r--r--.externalToolBuilders/jogl builder.launch3
-rw-r--r--make/build.xml2
3 files changed, 11 insertions, 10 deletions
diff --git a/.classpath b/.classpath
index 308a7cc07..a37a33820 100644
--- a/.classpath
+++ b/.classpath
@@ -2,32 +2,28 @@
<classpath>
<classpathentry kind="src" output="build/nativewindow/classes" path="src/nativewindow/classes">
<attributes>
- <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jogl/build/lib"/>
+ <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jogl/build/nativewindow/obj"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="build/jogl/classes" path="build/jogl/gensrc/classes">
<attributes>
- <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jogl/build/lib"/>
+ <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jogl/build/jogl/obj"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="build/nativewindow/classes" path="build/nativewindow/gensrc/classes">
<attributes>
- <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jogl/build/lib"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="build/test/build/classes" path="src/test">
- <attributes>
- <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jogl/build/lib"/>
+ <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jogl/build/nativewindow/obj"/>
</attributes>
</classpathentry>
+ <classpathentry kind="src" output="build/test/build/classes" path="src/test"/>
<classpathentry excluding="com/jogamp/audio/windows/waveout/TestSpatialization.java|jogamp/opengl/gl2/fixme/" kind="src" output="build/jogl/classes" path="src/jogl/classes">
<attributes>
- <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jogl/build/lib"/>
+ <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jogl/build/jogl/obj"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="build/newt/classes" path="src/newt/classes">
<attributes>
- <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jogl/build/lib"/>
+ <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jogl/build/newt/obj"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
diff --git a/.externalToolBuilders/jogl builder.launch b/.externalToolBuilders/jogl builder.launch
index c5acb1d8c..eab22e8ed 100644
--- a/.externalToolBuilders/jogl builder.launch
+++ b/.externalToolBuilders/jogl builder.launch
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="all.ide,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="all.ide,"/>
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="all.ide,"/>
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
diff --git a/make/build.xml b/make/build.xml
index 518e17309..40b001afd 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -12,6 +12,8 @@
<target name="all.but-archives" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,test.compile,one.dir,tag.build" />
+ <target name="all.ide" description="Build nativewindow, jogl and newt projects, including all junit tests, but don't copy libs or JARs or tag the build" depends="init,build.nativewindow,build.jogl,build.newt,test.compile" />
+
<target name="test.compile">
<ant antfile="build-test.xml" target="test.compile" inheritRefs="true" inheritAll="true"/>
</target>