[Jnode-svn-commits] SF.net SVN: jnode:[5624] trunk/builder/build.xml

[<fd...@us...>]

Revision: 5624
          http://jnode.svn.sourceforge.net/jnode/?rev=5624&view=rev
Author:   fduminy
Date:     2009-07-30 12:32:50 +0000 (Thu, 30 Jul 2009)

Log Message:
-----------
target native2ascii: changed execution order of move and native2ascii tasks to avoid a failure on windows (file locked)

Modified Paths:
--------------
    trunk/builder/build.xml

Modified: trunk/builder/build.xml
===================================================================
--- trunk/builder/build.xml	2009-07-30 12:29:27 UTC (rev 5623)
+++ trunk/builder/build.xml	2009-07-30 12:32:50 UTC (rev 5624)
@@ -74,16 +74,19 @@
   </target>
 
   <target name="native2ascii" depends="javacc" if="run.native2ascii">
-      <native2ascii src="${jnasm-preprocessor-gen.dir}" includes="JNAsmPP.java"
-                    dest="${jnasm-preprocessor-gen.dir}" ext=".tmp"/>
-      <move file="${jnasm-preprocessor-gen.dir}/JNAsmPP.tmp"
-            tofile="${jnasm-preprocessor-gen.dir}/JNAsmPP.java" overwrite="yes"/>
-      <native2ascii src="${jnasm-assembler-gen.dir}" includes="JNAsm.java"
-                    dest="${jnasm-assembler-gen.dir}" ext=".tmp"/>
-      <move file="${jnasm-assembler-gen.dir}/JNAsm.tmp"
-            tofile="${jnasm-assembler-gen.dir}/JNAsm.java" overwrite="yes"/>
+  	<!-- Don't swap move & native2ascii tasks ! On Windows, we need to call them 
+  	         in that order because native2ascii prevent from overwritting its source file -->
+    <move file="${jnasm-preprocessor-gen.dir}/JNAsmPP.java"
+        tofile="${jnasm-preprocessor-gen.dir}/JNAsmPP" overwrite="yes"/>
+    <native2ascii src="${jnasm-preprocessor-gen.dir}" includes="JNAsmPP"
+                 dest="${jnasm-preprocessor-gen.dir}" ext=".java"/>
+     
+    <move file="${jnasm-assembler-gen.dir}/JNAsm.java"
+        tofile="${jnasm-assembler-gen.dir}/JNAsm" overwrite="yes"/>
+    <native2ascii src="${jnasm-assembler-gen.dir}" includes="JNAsm"
+                 dest="${jnasm-assembler-gen.dir}" ext=".java"/> 
   </target>
-
+	
 <!-- Compile all subproject java files -->
   <target name="compile" depends="native2ascii">
     <jnode.compile>


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