[ros-diffs] [janderwald] 28665: - add linux path - fix bug in getDefaultHDDImage - sysreg can now create the hdd image and start the emulator

[janderwald at svn.reactos.org]

Author: janderwald
Date: Thu Aug 30 04:05:29 2007
New Revision: 28665

URL: http://svn.reactos.org/svn/reactos?rev=28665&view=rev
Log:
- add linux path
- fix bug in getDefaultHDDImage
- sysreg can now create the hdd image and start the emulator

Modified:
    trunk/reactos/tools/sysreg/rosboot_test.cpp
    trunk/reactos/tools/sysreg/sysreg.mak
    trunk/reactos/tools/sysreg/txtmode.cfg

Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.cpp?rev=28665&r1=28664&r2=28665&view=diff
==============================================================================
--- trunk/reactos/tools/sysreg/rosboot_test.cpp (original)
+++ trunk/reactos/tools/sysreg/rosboot_test.cpp Thu Aug 30 04:05:29 2007
@@ -103,7 +103,11 @@
         img = "output-i386";
 
         EnvironmentVariable::getValue(_T("ROS_OUTPUT"), img);
+#ifdef __LINUX__
+        img += _T("/ros.hd");
+#else
         img += _T("\\ros.hd");
+#endif
     }
 //---------------------------------------------------------------------------------------
     bool RosBootTest::isFileExisting(string output)
@@ -142,15 +146,17 @@
             return false;
         }
 
-#ifdef __LINUX___            
-        qemuimgdir += _T("\\qemu-img");
+
+#ifdef __LINUX__
+        qemuimgdir += _T("/qemu-img");
+
 #else
         qemuimgdir += _T("\\qemu-img.exe");
 #endif  
 
        if (!isFileExisting(qemuimgdir))
         {
-            cerr << "Error: ROS_EMU_PATH must contain the path to qemu and qemu-img" << endl;
+            cerr << "Error: ROS_EMU_PATH must contain the path to qemu and qemu-img 	" << qemuimgdir << endl;
             return false;
         }
 

Modified: trunk/reactos/tools/sysreg/sysreg.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?rev=28665&r1=28664&r2=28665&view=diff
==============================================================================
--- trunk/reactos/tools/sysreg/sysreg.mak (original)
+++ trunk/reactos/tools/sysreg/sysreg.mak Thu Aug 30 04:05:29 2007
@@ -74,11 +74,13 @@
 $(SYSREGBUILD_INT_)pipe_reader.o: $(SYSREGBUILD_BASE_)pipe_reader.cpp | $(SYSREGBUILD_INT)
 	$(ECHO_CC)
 	${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@
+	
 ifneq ($(HOST),mingw32-linux)
 $(SYSREGBUILD_INT_)namedpipe_reader.o: $(SYSREGBUILD_BASE_)namedpipe_reader.cpp | $(SYSREGBUILD_INT)
 	$(ECHO_CC)
 	${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@
 endif
+
 $(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | $(SYSREGBUILD_INT)
 	$(ECHO_CC)
 	${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@

Modified: trunk/reactos/tools/sysreg/txtmode.cfg
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?rev=28665&r1=28664&r2=28665&view=diff
==============================================================================
--- trunk/reactos/tools/sysreg/txtmode.cfg (original)
+++ trunk/reactos/tools/sysreg/txtmode.cfg Thu Aug 30 04:05:29 2007
@@ -10,8 +10,8 @@
 ;
 ; This variable sets the path to the emulator 
 ;
-ROS_EMU_PATH=E:\reactos\qemu\qemu.exe
-
+;ROS_EMU_PATH=E:\reactos\qemu\qemu.exe
+ROS_EMU_PATH=/usr/bin/qemu
 
 ; ROS_HDD_IMAGE
 ;