From 4bb89a99cabf28cd45343b102e22c756cfd87e9b Mon Sep 17 00:00:00 2001
From: Wade Walker <wwalker3@austin.rr.com>
Date: Wed, 16 Feb 2011 11:33:20 -0600
Subject: Make Eclipse build correctly

Removed the Java builder, since it was rebuilding stuff the Ant build
had already done. Turned on the Ant build for incremental builds.
Changed the classpath of com/jogamp/opengl/impl/gl2/fixme/ to
jogamp/opengl/gl2/fixme/ to reflect the recent move.
---
 .externalToolBuilders/jogl builder.launch                     | 2 +-
 .externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 .externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch

(limited to '.externalToolBuilders')

diff --git a/.externalToolBuilders/jogl builder.launch b/.externalToolBuilders/jogl builder.launch
index 6123a0b0b..c5acb1d8c 100644
--- a/.externalToolBuilders/jogl builder.launch	
+++ b/.externalToolBuilders/jogl builder.launch	
@@ -9,7 +9,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jogl"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jogl/make/build.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,clean"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/jogl/make}"/>
 </launchConfiguration>
diff --git a/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch b/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch
new file mode 100644
index 000000000..7fe64afc0
--- /dev/null
+++ b/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.jdt.core.javabuilder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
-- 
cgit v1.2.3


From e5777ec9e6ea79e0aface29fa679ccea4035f0e2 Mon Sep 17 00:00:00 2001
From: Wade Walker <wwalker3@austin.rr.com>
Date: Thu, 17 Feb 2011 11:20:39 -0600
Subject: 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.
---
 .classpath                                | 16 ++++++----------
 .externalToolBuilders/jogl builder.launch |  3 +++
 make/build.xml                            |  2 ++
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to '.externalToolBuilders')

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>
-- 
cgit v1.2.3