[or-cvs] r16341: Fix win32 automated installer ISO script to support CDROM on (in torvm/trunk/build/win32: . files)

[coderman at seul.org]

Author: coderman
Date: 2008-08-01 19:50:08 -0400 (Fri, 01 Aug 2008)
New Revision: 16341

Modified:
   torvm/trunk/build/win32/Makefile
   torvm/trunk/build/win32/files/install.bat
   torvm/trunk/build/win32/files/run.bat
Log:
Fix win32 automated installer ISO script to support CDROM on various drive letters past D:

Modified: torvm/trunk/build/win32/Makefile
===================================================================
--- torvm/trunk/build/win32/Makefile	2008-08-01 23:20:17 UTC (rev 16340)
+++ torvm/trunk/build/win32/Makefile	2008-08-01 23:50:08 UTC (rev 16341)
@@ -191,7 +191,8 @@
 	mv $(ISODIR)/dl/$(PTHREADS_F) $(ISODIR)/dl/src/; \
 	mv $(ISODIR)/dl/$(QEMU_F) $(ISODIR)/dl/src/; \
 	mv $(ISODIR)/dl/$(SDL_F) $(ISODIR)/dl/src/; \
-	mv $(ISODIR)/dl/$(ZLIBSRC_F) $(ISODIR)/dl/src/;
+	mv $(ISODIR)/dl/$(ZLIBSRC_F) $(ISODIR)/dl/src/; \
+	touch $(ISODIR)/VMDEVISO.TXT
 
 buildiso: extract
 	@if [ -f w32build.iso ]; then \

Modified: torvm/trunk/build/win32/files/install.bat
===================================================================
--- torvm/trunk/build/win32/files/install.bat	2008-08-01 23:20:17 UTC (rev 16340)
+++ torvm/trunk/build/win32/files/install.bat	2008-08-01 23:50:08 UTC (rev 16341)
@@ -1,4 +1,11 @@
-set ISODRV=D:\
+ at echo off
+for %%d in (d,e,f,g,h) do IF EXIST %%d:\VMDEVISO.TXT (
+  set ISODRV=%%d:\
+  GOTO GOTDRV
+)
+GOTO FAILED
+
+:GOTDRV
 set DDRV=C:\
 set DDIR=MinGW
 set MDIR=msys
@@ -46,8 +53,14 @@
 set PATH=%WD%;%PATH%
 
 %WD%bash %BUILDER%
-EXIT
+GOTO DONE
 
 :NOINSTALL
 ECHO "Found existing install directories.  Delete any previous install targets and try again."
-EXIT
+GOTO DONE
+
+:FAILED
+ECHO "Unable to locate a functional installer CDROM with win32 build image."
+GOTO DONE
+
+:DONE

Modified: torvm/trunk/build/win32/files/run.bat
===================================================================
--- torvm/trunk/build/win32/files/run.bat	2008-08-01 23:20:17 UTC (rev 16340)
+++ torvm/trunk/build/win32/files/run.bat	2008-08-01 23:50:08 UTC (rev 16341)
@@ -7,9 +7,10 @@
 rem    MASK=<VM netmask>
 rem    GW=<default gateway>
 rem    MAC=<VM ethernet MAC address>
+rem    MTU=<max ether frame size>
 rem
 SET MAC=00:11:22:33:44:55
 SET DEVICE="Local Area Connection"
 SET RAMSZ=32
 
-qemu.exe -name "Tor VM" -L . -kernel vmlinuz -append "quiet loglevel=1" -hda hdd.img -m %RAMSZ% -std-vga -net nic,model=pcnet,macaddr=%MAC% -net pcap,devicename=%DEVICE%
+qemu.exe -name " Tor VM " -L . -kernel vmlinuz -append "quiet loglevel=1" -hda hdd.img -m %RAMSZ% -std-vga -net nic,model=pcnet,macaddr=%MAC% -net pcap,devicename=%DEVICE%