[Jnode-svn-commits] SF.net SVN: jnode:[4455] trunk/all

[<cr...@us...>]

Revision: 4455
          http://jnode.svn.sourceforge.net/jnode/?rev=4455&view=rev
Author:   crawley
Date:     2008-08-17 06:46:30 +0000 (Sun, 17 Aug 2008)

Log Message:
-----------
Add support for configuring a VMWare virtual disk and saving
the JNode.nvram file in a 'clean' build.

Modified Paths:
--------------
    trunk/all/build-x86.xml
    trunk/all/build.xml
    trunk/all/conf-source/jnode.properties.defaults
    trunk/all/conf-source/jnode.properties.template
    trunk/all/conf-source/script.xml

Modified: trunk/all/build-x86.xml
===================================================================
--- trunk/all/build-x86.xml	2008-08-17 06:43:26 UTC (rev 4454)
+++ trunk/all/build-x86.xml	2008-08-17 06:46:30 UTC (rev 4455)
@@ -78,10 +78,20 @@
 
 		<property name="build.native.dir" value="${my-build.dir}/${jnode.bits}bits/native" />
 		<property name="build.bootimage.dir" value="${my-build.dir}/${jnode.bits}bits/bootimage" />
-		<condition property="vmware.vmx.overrides" value="">
-	        <not>
-	        	<isset property="vmware.vmx.overrides"/>
-	        </not>
+        <condition property="vmware.vmx.overrides" value="">
+        	<and>
+                <not>
+        	        <isset property="vmware.vmx.overrides"/>
+        	    </not>
+        	</and>
+        </condition>
+	    <condition property="vmware.vmx.vmdk.image" 
+	    	value="${jnode.virtual.disk.dir}/${jnode.virtual.disk}" else="">
+	        <and>
+	        	<equals arg1="${jnode.virtualization.platform}" arg2="vmware" casesensitive="false"/>
+                <isset property="jnode.virtual.disk.dir"/>
+                <isset property="jnode.virtual.disk"/>
+	        </and>
 	    </condition>
 	</target>
 
@@ -278,10 +288,12 @@
 
 		<taskdef name="vmware" classname="org.jnode.build.VMwareBuilderTask" classpathref="cp-x86" />
 		<vmware 
-			isofile="${jnode-x86.iso}"
+			isoFile="${jnode-x86.iso}"
 			logFile="${logFile}"
-			memsize="${jnode.virtual.memsize}"
-			overrideFile="${vmware.vmx.overrides}"
+			memSize="${jnode.virtual.memsize}"
+            saveDir="${save.dir}"
+			vmdkImageFile="${vmware.vmx.vmdk.image}"
+		    overrideFile="${vmware.vmx.overrides}"
 		/>
 	</target>
 
@@ -291,9 +303,11 @@
 
 		<taskdef name="vmware" classname="org.jnode.build.VMwareBuilderTask" classpathref="cp-x86" />
 		<vmware 
-			isofile="${jnode-x86-lite.iso}"
+			isoFile="${jnode-x86-lite.iso}"
 			logFile="${logFile}"
-			memsize="${jnode.virtual.memsize}"
+			memSize="${jnode.virtual.memsize}"
+            saveDir="${save.dir}"
+			vmdkImageFile="${vmware.vmx.vmdk.image}"
             overrideFile="${vmware.vmx.overrides}"
 		/>
 	</target>
@@ -303,9 +317,11 @@
 
 		<taskdef name="vmware" classname="org.jnode.build.VMwareBuilderTask" classpathref="cp-x86" />
 		<vmware
-			isofile="${jnode-x86_64-lite.iso}"
+			isoFile="${jnode-x86_64-lite.iso}"
 			logFile="${logFile}"
-			memsize="${jnode.virtual.memsize}"
+			memSize="${jnode.virtual.memsize}"
+			saveDir="${save.dir}"
+			vmdkImageFile="${vmware.vmx.vmdk.image}"
             overrideFile="${vmware.vmx.overrides}"
 		/>
 	</target>

Modified: trunk/all/build.xml
===================================================================
--- trunk/all/build.xml	2008-08-17 06:43:26 UTC (rev 4454)
+++ trunk/all/build.xml	2008-08-17 06:46:30 UTC (rev 4455)
@@ -18,6 +18,7 @@
     <property name="descriptors.dir" value="${build.dir}/descriptors"/>
     <property name="plugins.dir" value="${build.dir}/plugins"/>
     <property name="initjars.dir" value="${build.dir}/initjars"/>
+    <property name="save.dir" value="${basedir}/save"/>
     <property name="backup.dir" value="${build.dir}/backup"/>
 
     <property name="jnode-builder.jar" value="${build.dir}/descriptors/jnode-builder.jar"/>
@@ -204,6 +205,7 @@
         <!-- Create basic build directories -->
         <mkdir dir="${build.dir}"/>
         <mkdir dir="${reports.dir}"/>
+        <mkdir dir="${save.dir}"/>
         <mkdir dir="${cdroms.dir}"/>
         <mkdir dir="${descriptors.dir}"/>
         <mkdir dir="${plugins.dir}"/>
@@ -422,9 +424,14 @@
             <fileset dir="${upload.dir}"/>
         </ftp>
     </target>
+	
+	<!-- Save virtualization etc state across 'clean' -->
+	<target name="save">
+	   <copy file="${cdroms.dir}/JNode.nvram" todir="${save.dir}"/>
+	</target>
 
     <!-- Clean everything files -->
-    <target name="clean">
+    <target name="clean" depends="save">
         <jnode.antall target="clean"/>
         <delete dir="${build.dir}" quiet="on"/>
     </target>

Modified: trunk/all/conf-source/jnode.properties.defaults
===================================================================
--- trunk/all/conf-source/jnode.properties.defaults	2008-08-17 06:43:26 UTC (rev 4454)
+++ trunk/all/conf-source/jnode.properties.defaults	2008-08-17 06:46:30 UTC (rev 4455)
@@ -11,6 +11,7 @@
 jnode.debugger.port=6789
 jnode.virtual.memsize=512
 jnode.virtualization.platform=vmware
-jnode.virtual.disk=none
+jnode.virtual.disk.dir=
+jnode.virtual.disk=
 vmware.vmx.overrides=
 

Modified: trunk/all/conf-source/jnode.properties.template
===================================================================
--- trunk/all/conf-source/jnode.properties.template	2008-08-17 06:43:26 UTC (rev 4454)
+++ trunk/all/conf-source/jnode.properties.template	2008-08-17 06:46:30 UTC (rev 4455)
@@ -70,6 +70,7 @@
 # -----------------------------------------------
 
 @jnode.virtualization.platform/=#@
+...@jn...rtual.disk.dir/=#@
 @jnode.virtual.disk/=#@
 
 # -----------------------------------------------

Modified: trunk/all/conf-source/script.xml
===================================================================
--- trunk/all/conf-source/script.xml	2008-08-17 06:43:26 UTC (rev 4454)
+++ trunk/all/conf-source/script.xml	2008-08-17 06:46:30 UTC (rev 4455)
@@ -11,8 +11,8 @@
   </type>
   <type name="vdisk.type">
     <alt value="none"/>
-    <alt value="ext2"/>
-    <alt value="jfat"/>
+    <alt value="test32.vmdk"/>
+    <alt value="testext2.vmdk"/>
   </type>
   <type name="vplatform.type">
     <alt value="none"/>
@@ -35,8 +35,10 @@
             templateFile="jnode.properties.template">
     <property name="jnode.virtual.memsize" type="integer.type"
 	      description="Enter virtual hardware memory size in Mbytes"/>
+    <property name="jnode.virtual.disk.dir" type="string.type"
+          description="Select the virtual disk image directory"/>
     <property name="jnode.virtual.disk" type="vdisk.type"
-	      description="Select a prebuilt virtual disk"/>
+          description="Select a virtual disk image"/>
     <property name="jnode.virtualization.platform" type="vplatform.type"
 	      description="Select the PC emulation/virtualization platform"/>
     <property name="jnode.memmgr.plugin.id" type="memmgr.type"
@@ -80,6 +82,9 @@
       Specify the memory size for the virtual PC; at least 512 Mbytes 
       is recommended.
     </item>
+    <item property="jnode.virtual.disk.dir">
+      Select the directory containing virtual disk images.
+    </item>
     <item property="jnode.virtual.disk">
       Select a disk image to be mounted as a virtual hard drive.
     </item>


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