diff options
| author | Wade Walker <[email protected]> | 2011-02-16 11:33:20 -0600 |
|---|---|---|
| committer | Wade Walker <[email protected]> | 2011-02-18 08:52:34 -0600 |
| commit | 4bb89a99cabf28cd45343b102e22c756cfd87e9b (patch) | |
| tree | b354956d250b9d483b9d5ad4015c93c4f77cfb85 | |
| parent | bff7e97c2f22673bb0457765696fb867d3e4f69d (diff) | |
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.
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | .externalToolBuilders/jogl builder.launch | 2 | ||||
| -rw-r--r-- | .externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch | 7 | ||||
| -rw-r--r-- | .project | 8 |
4 files changed, 15 insertions, 4 deletions
diff --git a/.classpath b/.classpath index a4ef906a2..308a7cc07 100644 --- a/.classpath +++ b/.classpath @@ -20,7 +20,7 @@ <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jogl/build/lib"/> </attributes> </classpathentry> - <classpathentry excluding="com/jogamp/audio/windows/waveout/TestSpatialization.java|com/jogamp/opengl/impl/gl2/fixme/" kind="src" output="build/jogl/classes" path="src/jogl/classes"> + <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"/> </attributes> 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> @@ -7,7 +7,6 @@ <buildSpec> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>clean,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> @@ -16,8 +15,13 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>full,incremental,</triggers> <arguments> + <dictionary> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value> + </dictionary> </arguments> </buildCommand> </buildSpec> |