diff options
| author | Wade Walker <[email protected]> | 2015-07-05 12:55:00 -0500 |
|---|---|---|
| committer | Wade Walker <[email protected]> | 2015-07-06 17:04:11 -0500 |
| commit | 858dbcb36211e743559070acc49043c21cde6636 (patch) | |
| tree | 0c51cb02bb8eab7d4f92c7da2e64b20ae6648147 | |
| parent | 2e5e0fd315a8cffa0d874f1ec70c4c807bbb3b27 (diff) | |
Fix Eclipse build and Ant makefile
Added proper targets to the Eclipse build. Fixed the Ant makefile
so it works for paths with spaces in them.
| -rw-r--r-- | .externalToolBuilders/jocl-demos-ant.launch | 6 | ||||
| -rw-r--r-- | .project | 5 | ||||
| -rw-r--r-- | build.xml | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/.externalToolBuilders/jocl-demos-ant.launch b/.externalToolBuilders/jocl-demos-ant.launch index 21aebe9..0055d9c 100644 --- a/.externalToolBuilders/jocl-demos-ant.launch +++ b/.externalToolBuilders/jocl-demos-ant.launch @@ -1,6 +1,8 @@ <?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="clean,"/> +<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="compile,"/> +<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/> +<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="compile,"/> <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> @@ -8,7 +10,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jocl-demos"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jocl-demos/build.xml}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="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:/jocl-demos}"/> </launchConfiguration> @@ -7,12 +7,15 @@ <buildSpec> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> <value><project>/.externalToolBuilders/jocl-demos-ant.launch</value> </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> </arguments> </buildCommand> </buildSpec> @@ -22,7 +22,7 @@ <property name="javac.debug" value="${javacdebug}"/> <property name="javac.source" value="${target.sourcelevel}"/> <property name="javac.target" value="${target.targetlevel}"/> - <property name="javac.compilerargs" value="-bootclasspath ${target.rt.jar} -Xlint -g:${javacdebuglevel}"/> + <property name="javac.compilerargs" value="-bootclasspath '${target.rt.jar}' -Xlint -g:${javacdebuglevel}"/> </target> <target name="-pre-jar" depends="jogamp.env.init"> |