[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3428] trunk/LWJGL

[<sp...@us...>]

Revision: 3428
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3428&view=rev
Author:   spasi
Date:     2010-10-02 12:19:00 +0000 (Sat, 02 Oct 2010)

Log Message:
-----------
Attempt to fix build issues.

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/build-generator.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2010-10-01 22:37:45 UTC (rev 3427)
+++ trunk/LWJGL/build.xml	2010-10-02 12:19:00 UTC (rev 3428)
@@ -34,23 +34,21 @@
 	</target>
 
 	<!-- Cleans up any files created during the execution of this script -->
-	<target name="clean" description="Cleans the directories controlled by this ant script" depends="clean-generated">
-		<delete dir="${lwjgl.temp}" quiet="true" failonerror="false" taskname="cleaning temp folder" />
-		<delete dir="${lwjgl.docs}/javadoc" quiet="true" failonerror="false" taskname="cleaning javadoc folder" />
+	<target name="clean" description="Cleans all directories controlled by this ant script" depends="clean-java, clean-native"/>
+
+    <!-- Cleans up any non-native files created during the execution of this script -->
+    <target name="clean-java" description="Cleans non-native files generated by this ant script" depends="clean-generated">
+        <delete dir="${lwjgl.temp}" quiet="true" failonerror="false" taskname="cleaning temp folder" />
+        <delete dir="${lwjgl.docs}/javadoc" quiet="true" failonerror="false" taskname="cleaning javadoc folder" />
         <!-- Delete java classes only to avoid unnecessary native recompilation -->
-		<delete dir="${lwjgl.bin}/org" quiet="true" failonerror="false" taskname="cleaning bin folder" />
-	</target>
+        <delete dir="${lwjgl.bin}/org" quiet="true" failonerror="false" taskname="cleaning bin folder" />
+    </target>
 
     <!-- Useful when we need to force native recompilation -->
-    <target name="clean-native" description="Cleans bin folder's native directory" depends="clean-generated-native">
+    <target name="clean-native" description="Cleans native files generated by this ant script" depends="clean-generated-native">
         <delete dir="${lwjgl.bin}/lwjgl" quiet="true" failonerror="false" taskname="cleaning native bin folder" />
-        <mkdir dir="${lwjgl.bin}/lwjgl" taskname="initialiazing native bin folder" />
     </target>
 
-    <target name="clean-all" depends="clean, clean-generated-native" description="Cleans all directories controlled by this ant script">
-        <delete dir="${lwjgl.bin}/lwjgl" quiet="true" failonerror="false" taskname="cleaning native bin folder" />
-    </target>
-
 	<!-- Creates a distribution of LWJGL -->
 	<target name="release" description="Creates a distribution of LWJGL using supplied native binaries">
 		<!-- Warn user -->
@@ -67,7 +65,7 @@
 
         <!-- prepare -->
         <delete dir="${lwjgl.dist}" quiet="true" failonerror="false" />
-        <antcall target="clean" />
+        <antcall target="clean-java" />
         <antcall target="-initialize" />
 
         <!-- compile and create debug jars -->
@@ -335,6 +333,7 @@
 	  <sequential>
 			<java classname="org.lwjgl.test.NativeTest" logError="false" resultproperty="nativetest.res" outputproperty="nativetest.out" errorproperty="nativetest.err" fork="true">
 				<jvmarg value="-Djava.library.path=libs/@{platform}"/>
+                <jvmarg value="-Dorg.lwjgl.util.Debug=true"/>
 	    	<classpath>
 	      	<pathelement path="${lwjgl.bin}"/>
 	        <pathelement path="${java.class.path}"/>
@@ -371,7 +370,7 @@
 		<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.5" target="1.5" taskname="examples" />
 	</target>
 
-	<target name="compile_native" depends="headers, touch-version, version-mismatch" description="Compiles the native files">
+	<target name="compile_native" depends="-initialize, headers, touch-version, version-mismatch" description="Compiles the native files">
 		<condition property="lwjgl.platform.windows">
 			<os family="windows" />
 		</condition>

Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml	2010-10-01 22:37:45 UTC (rev 3427)
+++ trunk/LWJGL/platform_build/build-generator.xml	2010-10-02 12:19:00 UTC (rev 3428)
@@ -7,8 +7,8 @@
 		</delete>
 	</target>
 
-    <target name="clean-generated-native" description="Deletes the generated native source">
-        <delete quiet="true" failonerror="false">
+    <target name="clean-generated-native" description="Deletes the generated native source" depends="clean-generated">
+        <delete quiet="false" failonerror="false">
             <fileset dir="${lwjgl.src.native}/generated" includes="**"/>
         </delete>
     </target>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.