diff options
| -rw-r--r-- | .externalToolBuilders/jocl-ant.launch | 5 | ||||
| -rw-r--r-- | .project | 1 | ||||
| -rw-r--r-- | make/build.xml | 11 |
3 files changed, 14 insertions, 3 deletions
diff --git a/.externalToolBuilders/jocl-ant.launch b/.externalToolBuilders/jocl-ant.launch index 3d922c89..f41c9b73 100644 --- a/.externalToolBuilders/jocl-ant.launch +++ b/.externalToolBuilders/jocl-ant.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"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -14,7 +17,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jocl"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jocl/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:/jocl/make}"/> </launchConfiguration> @@ -7,7 +7,6 @@ <buildSpec> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>clean,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/make/build.xml b/make/build.xml index fd61304a..4506e68d 100644 --- a/make/build.xml +++ b/make/build.xml @@ -80,6 +80,13 @@ <echo message="Loaded ${user.home}/gluegen.properties." /> </target> + <target name="set.debug"> + <property name="c.compiler.debug" value="true" /> + <property name="c.compiler.optimise" value="none" /> + <property name="javacdebug" value="true" /> + <property name="javacdebuglevel" value="source,lines,vars" /> + </target> + <!-- ================================================================== --> <!-- - Declare all paths and user defined variables. @@ -938,7 +945,9 @@ <!-- - Build everything. --> - <target name="all" depends="jocl.build, test.compile, tag.build, developer-zip-archive"/> + <target name="all" description="Release build" depends="jocl.build, test.compile, tag.build, developer-zip-archive"/> + <target name="all.debug" description="Debug build" depends="set.debug, jocl.build, test.compile, tag.build, developer-zip-archive"/> + <target name="all.ide" description="Debug IDE build, no tagging or archives" depends="set.debug, jocl.build, test.compile"/> <target name="jocl.build" depends="init"> <!-- Generate and compile the Java sources. --> |