[Jnode-svn-commits] SF.net SVN: jnode:[5258] trunk

[<ls...@us...>]

Revision: 5258
          http://jnode.svn.sourceforge.net/jnode/?rev=5258&view=rev
Author:   lsantha
Date:     2009-04-13 08:34:39 +0000 (Mon, 13 Apr 2009)

Log Message:
-----------
Activated precompiled classlib based build.

Modified Paths:
--------------
    trunk/all/build.xml
    trunk/core/build.xml

Added Paths:
-----------
    trunk/all/lib/classlib.pack.gz

Property Changed:
----------------
    trunk/all/lib/

Modified: trunk/all/build.xml
===================================================================
--- trunk/all/build.xml	2009-04-13 08:19:29 UTC (rev 5257)
+++ trunk/all/build.xml	2009-04-13 08:34:39 UTC (rev 5258)
@@ -45,6 +45,7 @@
 	<property name="jnode-mmtk-ms.jar" value="${root.dir}/core/build/classes-plan/org.jnode.vm.memmgr.mmtk.ms"/>
 	<property name="jnode-mmtk-nogc.jar" value="${root.dir}/core/build/classes-plan/org.jnode.vm.memmgr.mmtk.nogc"/>
 
+    <property name="classlib.jar" value="${root.dir}/all/lib/classlib.jar"/>
     <property name="ant.jar" value="${root.dir}/core/lib/ant.jar"/>
     <property name="ant-launcher.jar" value="${root.dir}/core/lib/ant-launcher.jar"/>
     <property name="commons-net.jar" value="${root.dir}/core/lib/commons-net-1.1.0.jar"/>
@@ -197,6 +198,35 @@
         <mkdir dir="${descriptors.dir}"/>
         <mkdir dir="${plugins.dir}"/>
         <mkdir dir="${initjars.dir}"/>
+        <if>
+          <or>
+              <not>
+                <available file="${classlib.jar}" />
+              </not>
+              <uptodate srcfile="${classlib.jar}" targetfile="${root.dir}/all/lib/classlib.pack.gz"/>
+          </or>
+          <then>
+            <delete file="${classlib.jar}"/>
+            <echo message="Creating ${classlib.jar}"/>
+            <exec executable="unpack200">
+              <arg file="${root.dir}/all/lib/classlib.pack.gz"/>
+              <arg file="${classlib.jar}"/>
+            </exec>
+          </then>
+        </if>
+        <property name="classlib.stamp" value="${root.dir}/all/build/classlib.stamp" />
+        <if>
+            <or>
+              <not>
+                <available file="${classlib.stamp}" />
+              </not>
+              <uptodate srcfile="${classlib.stamp}" targetfile="${classlib.jar}"/>
+            </or>
+            <then>
+              <unjar src="${classlib.jar}" dest="${jnode-core.jar}"/>
+              <touch file="${classlib.stamp}"/>  
+            </then>
+        </if>
     </target>
 
     <!-- Call the assemble target of all subprojects -->


Property changes on: trunk/all/lib
___________________________________________________________________
Added: svn:ignore
   + classlib.jar


Added: trunk/all/lib/classlib.pack.gz
===================================================================
(Binary files differ)


Property changes on: trunk/all/lib/classlib.pack.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml	2009-04-13 08:19:29 UTC (rev 5257)
+++ trunk/core/build.xml	2009-04-13 08:34:39 UTC (rev 5258)
@@ -141,15 +141,18 @@
 
   <!-- Compile all subproject java files -->
   <target name="compile" depends="prepare">
+      <!--
     <jnode.compile>
       <src refid="classpath-sources" />
       <classpath refid="my-cp"/>
     </jnode.compile>
+    -->
     <parallel >
       <jnode.compile>
         <src refid="my-sources" />
         <classpath refid="my-cp"/>
       </jnode.compile>
+        <!--
       <jnode.compile>
         <src refid="classpath-sources-corba" />
         <classpath refid="my-cp"/>
@@ -162,6 +165,7 @@
         <src refid="classpath-sources-langtools" />
         <classpath refid="my-cp"/>
       </jnode.compile>
+      -->
     </parallel>
 
     <!-- Copy all non java files to class dir -->
@@ -190,7 +194,7 @@
 	    <fileset dir="${my-src.dir}/driver" excludes="${my-non-resources}"/>
 	    <fileset dir="${my-src.dir}/test" excludes="${my-non-resources}"/>
     </copy>
-  	
+
   	<!-- Create & compile plan classes -->
 	<CreatePlan package="org.jnode.vm.memmgr.mmtk.genrc"/>
 	<CreatePlan package="org.jnode.vm.memmgr.mmtk.ms"/>


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