Add debug build targets to match those in gluegen and jogl

4 files changed, 16 insertions, 13 deletions

diff --git a/.externalToolBuilders/jocl-demos builder.launch b/.externalToolBuilders/jocl-demos builder.launch
index 95313b7..7fe5d3a 100644
--- a/.externalToolBuilders/jocl-demos builder.launch
+++ b/.externalToolBuilders/jocl-demos builder.launch
@@ -1,8 +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_AUTO_TARGETS" value="compile,"/>
+<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="compile,"/>
+<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}"/>
@@ -12,7 +13,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jocl-demos"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
 <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="incremental,auto,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-demos"/>
 </launchConfiguration>
diff --git a/.project b/.project
index b8ebd3f..c9f73b8 100644
--- a/.project
+++ b/.project
@@ -22,10 +22,6 @@
 					<key>LaunchConfigHandle</key>
 					<value>&lt;project&gt;/.externalToolBuilders/jocl-demos builder.launch</value>
 				</dictionary>
-				<dictionary>
-					<key>incclean</key>
-					<value>true</value>
-				</dictionary>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
diff --git a/build.xml b/build.xml
index 0f5b7d0..9a83b03 100644
--- a/build.xml
+++ b/build.xml
@@ -18,15 +18,16 @@
     <import file="${gluegen.root}/make/jogamp-env.xml" />
     <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
 
+    <target name="set.debug">
+        <property name="javacdebug"       value="true" /> 
+        <property name="javacdebuglevel"  value="source,lines,vars" /> 
+    </target>
+
     <target name="-pre-init" depends="jogamp.env.init">
         <property name="javac.debug" value="${javacdebug}"/>
+        <property name="javac.debuglevel" value="${javacdebuglevel}"/>
         <property name="javac.source" value="${target.sourcelevel}"/>
         <property name="javac.target" value="${target.targetlevel}"/>
-
-    	<property name="c.compiler.debug" value="true" /> 
-        <property name="javacdebug"       value="true" /> 
-        <property name="javacdebuglevel"  value="source,lines,vars" /> 
-
         <property name="javac.compilerargs" value="-bootclasspath '${target.rt.jar}' -Xlint -g:${javacdebuglevel}"/>
     </target>
 
@@ -129,4 +130,8 @@
         </copy>
     </target>
 
+    <target name="all" description="Release build" depends="default"/>
+    <target name="all.debug" description="Debug build" depends="set.debug, default"/>
+    <target name="all.ide" description="Debug IDE build, no tagging or archives" depends="set.debug, compile"/>
+
 </project>
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index b99e6ed..231df5a 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -159,13 +159,14 @@ is divided into following sections:
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${javac.debuglevel}" name="debuglevel"/>
             <attribute default="${empty.dir}" name="sourcepath"/>
             <attribute default="${empty.dir}" name="gensrcdir"/>
             <element name="customize" optional="true"/>
             <sequential>
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
+                <javac debug="@{debug}" debuglevel="@{debuglevel}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>