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

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

Revision: 5179
          http://jnode.svn.sourceforge.net/jnode/?rev=5179&view=rev
Author:   lsantha
Date:     2009-03-29 10:53:16 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
Added support for pure Java ISO CDROM image creation in the build - based on a patch by Gilles Duboscq.

Modified Paths:
--------------
    trunk/all/build-x86.xml
    trunk/all/build.xml
    trunk/jnode.properties.dist

Added Paths:
-----------
    trunk/builder/lib/iso9660.jar
    trunk/builder/lib/sabre.jar
    trunk/core/lib/ant-contrib-1.0b3.jar

Modified: trunk/all/build-x86.xml
===================================================================
--- trunk/all/build-x86.xml	2009-03-29 09:40:23 UTC (rev 5178)
+++ trunk/all/build-x86.xml	2009-03-29 10:53:16 UTC (rev 5179)
@@ -275,10 +275,36 @@
             <copy file="${my-lib.dir}/grub.s1" todir="@{dir}/boot/grub" />
             <copy file="${my-lib.dir}/grub.s2" todir="@{dir}/boot/grub" />
             <copy file="${grub.menu.cdrom}" tofile="@{dir}/boot/grub/menu.lst" />
-            <exec executable="mkisofs">
-				<arg line="-o @{destfile} -R -b boot/grub/eltorito.s2 -no-emul-boot -boot-load-size 4 -boot-info-table @{dir}" />
-			</exec>
-		</sequential>
+            <if>
+                <equals arg1="${jnode.enable.mkisofs}" arg2="true" />
+                <then>
+                    <!-- Fail on a Windows platform if there are spaces in the root dir's pathname.  It will
+            	     lead to mkisofs dying with a misleading error message.  bluebit / crawley 2008-05-03 -->
+    	            <fail message="Cannot build JNode from a directory with spaces in the pathname.">
+                	  <condition>
+    	                <and>
+                	      <contains string="${os.name}" substring="windows" casesensitive="false" />
+    	                  <contains string="${root.dir}" substring=" " casesensitive="false" />
+                	    </and>
+                	  </condition>
+                	</fail>
+                    <exec executable="mkisofs">
+				        <arg line="-o @{destfile} -R -b boot/grub/eltorito.s2 -no-emul-boot -boot-load-size 4 -boot-info-table @{dir}" />
+			        </exec>
+                </then>
+                <else>
+                    <taskdef name="jiic-iso" classname="de.tu_darmstadt.informatik.rbg.hatlak.iso9660.ISOTask" classpathref="cp-x86" />                   
+                    <jiic-iso basedir="@{dir}"
+        				destfile="@{destfile}"
+		        		enableRockRidge="true"
+				        mkisofsCompatibility="true"
+        				bootImage="@{dir}/boot/grub/eltorito.s2"
+		        		bootImageSectorCount="4"
+				        genBootInfoTable="true"
+        			/>
+                </else>
+            </if>
+        </sequential>
 	</macrodef>
 
 	<!-- Create a full distributable bootable CDROM image -->

Modified: trunk/all/build.xml
===================================================================
--- trunk/all/build.xml	2009-03-29 09:40:23 UTC (rev 5178)
+++ trunk/all/build.xml	2009-03-29 10:53:16 UTC (rev 5179)
@@ -1,5 +1,6 @@
 <project name="JNode" default="help" basedir=".">
-
+    <!-- if task is used from this -->
+    <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
 	<!-- before including jnode.xml, we must set this property -->
     <condition property="memoryMaximumSize" value="1512m" else="768m">
       <os arch="amd64"/>      
@@ -68,6 +69,9 @@
     <property name="derbytools.jar" value="${root.dir}/distr/lib/derbytools.jar" />
     <property name="nanoxml-java.jar" value="${root.dir}/shell/lib/nanoxml-2.2.3.jar" />
 
+    <property name="iso9660.jar" value="${root.dir}/builder/lib/iso9660.jar" />
+    <property name="sabre.jar" value="${root.dir}/builder/lib/sabre.jar" />
+
     <!-- libraries needed to run tests -->
     <property name="jmock-cglib.jar" value="${root.dir}/core/lib/jmock-cglib-1.0.1.jar"/>
     <property name="jmock.jar" value="${root.dir}/core/lib/jmock-1.0.1.jar"/>
@@ -128,6 +132,8 @@
         <pathelement location="${derby.jar}"/>
         <pathelement location="${derbynet.jar}"/>
         <pathelement location="${derbytools.jar}"/>
+        <pathelement location="${iso9660.jar}"/>
+        <pathelement location="${sabre.jar}"/>
     </path>
 
     <path id="cp-jnode">
@@ -158,17 +164,6 @@
     </patternset>
 
     <target name="prepare">
-    	<!-- Fail on a Windows platform if there are spaces in the root dir's pathname.  It will
-    	     lead to mkisofs dying with a misleading error message.  bluebit / crawley 2008-05-03 -->
-    	<fail message="Cannot build JNode from a directory with spaces in the pathname.">
-    	  <condition>
-    	    <and>
-    	      <contains string="${os.name}" substring="windows" casesensitive="false" />
-    	      <contains string="${root.dir}" substring=" " casesensitive="false" />
-    	    </and>
-    	  </condition>
-    	</fail>
-
         <fail message="Java Runtime version 1.6 needed. Your version is: ${java.runtime.version}">
             <condition>
                 <not>

Added: trunk/builder/lib/iso9660.jar
===================================================================
(Binary files differ)


Property changes on: trunk/builder/lib/iso9660.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/builder/lib/sabre.jar
===================================================================
(Binary files differ)


Property changes on: trunk/builder/lib/sabre.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/core/lib/ant-contrib-1.0b3.jar
===================================================================
(Binary files differ)


Property changes on: trunk/core/lib/ant-contrib-1.0b3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/jnode.properties.dist
===================================================================
--- trunk/jnode.properties.dist	2009-03-29 09:40:23 UTC (rev 5178)
+++ trunk/jnode.properties.dist	2009-03-29 10:53:16 UTC (rev 5179)
@@ -103,3 +103,8 @@
 # -----------------------------------------------
 
 #jnode.security.enabled=true
+
+# -----------------------------------------------
+# Custom build tools
+# -----------------------------------------------
+# jnode.enable.mkisofs=true


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