Hope I fixed the broken issue.

svn path=/trunk/; revision=4031

diff --git a/os2/install.bat b/os2/install.bat
new file mode 100644 (file)
index 0000000..f0e4dd6
--- /dev/null
+++ b/os2/install.bat
@@ -0,0 +1,20 @@
+@echo off
+if "%1" == "" goto NoParameter
+set ROS_INSTALL=%1
+goto Install
+:NoParameter
+set ROS_INSTALL=c:\reactos
+:Install
+echo Installing to %ROS_INSTALL%
+@echo off
+
+md %ROS_INSTALL%
+md %ROS_INSTALL%\bin
+md %ROS_INSTALL%\symbols
+md %ROS_INSTALL%\system32
+
+copy ..\os2\apps\bepslep\bepslep.exe %ROS_INSTALL%\bin
+copy ..\os2\lib\doscalls\doscalls.dll %ROS_INSTALL%\system32
+copy ..\os2\lib\doscalls\doscalls.sym %ROS_INSTALL%\symbols
+copy ..\os2\server\os2ss.exe %ROS_INSTALL%\system32
+copy ..\os2\server\os2ss.sym %ROS_INSTALL%\symbols

diff --git a/posix/install.bat b/posix/install.bat
index 853f6ae..4380b9a 100644 (file)
--- a/posix/install.bat
+++ b/posix/install.bat
@@ -13,10 +13,10 @@ md %ROS_INSTALL%\bin
 md %ROS_INSTALL%\symbols
 md %ROS_INSTALL%\system32
 
-copy apps\baresh\baresh.exe %ROS_INSTALL%\bin
-copy apps\posixw32\posixw32.exe %ROS_INSTALL%\bin
-copy server\psxss.exe %ROS_INSTALL%\system32
-copy lib\psxdll\psxdll.dll %ROS_INSTALL%\system32
-copy lib\psxdll\psxdll.map %ROS_INSTALL%\symbols
-copy lib\psxx\psxx.dll %ROS_INSTALL%\system32
-copy lib\psxx\psxx.map %ROS_INSTALL%\symbols
+copy ..\posix\apps\baresh\baresh.exe %ROS_INSTALL%\bin
+copy ..\posix\apps\posixw32\posixw32.exe %ROS_INSTALL%\bin
+copy ..\posix\server\psxss.exe %ROS_INSTALL%\system32
+copy ..\posix\lib\psxdll\psxdll.dll %ROS_INSTALL%\system32
+copy ..\posix\lib\psxdll\psxdll.map %ROS_INSTALL%\symbols
+copy ..\posix\lib\psxx\psxx.dll %ROS_INSTALL%\system32
+copy ..\posix\lib\psxx\psxx.map %ROS_INSTALL%\symbols

diff --git a/reactos/install.bat b/reactos/install.bat
index 9735a54..537b95a 100644 (file)
--- a/reactos/install.bat
+++ b/reactos/install.bat
@@ -19,6 +19,7 @@ md %ROS_INSTALL%\system32\config
 md %ROS_INSTALL%\system32\drivers
 md %ROS_INSTALL%\media
 md %ROS_INSTALL%\media\fonts
+
 copy boot.bat %ROS_INSTALL%
 copy bootc.lst %ROS_INSTALL%
 copy aboot.bat %ROS_INSTALL%
@@ -141,21 +142,20 @@ copy media\fonts\timr____.ttf %ROS_INSTALL%\media\fonts
 rem copy media\nls\*.nls %ROS_INSTALL%\system32
 copy ntoskrnl\ntoskrnl.map %ROS_INSTALL%\symbols
 
-if %ROS_BUILD_EXT == "" goto Finish
+if "%ROS_BUILD_EXT%" == "" goto Finish
 
 echo Installing extra programs from rosapps directory...
-pushd ..\rosapps
-call install.bat
-popd
+call ..\rosapps\install.bat %1
+
 echo Installing targets modules ported from WINE...
-pushd ..\wine
-call install.bat
-popd
+call ..\wine\install.bat %1
+
 echo Installing targets for POSIX+ support...
-pushd ..\posix
-call install.bat
-popd
+call ..\posix\install.bat %1
+
+echo Installing targets for OS/2 support...
+call ..\os2\install.bat %1
+
 echo Done.
 
 :Finish
-

diff --git a/rosapps/.cvsignore b/rosapps/.cvsignore
index b10a706..c4c4ffc 100644 (file)
--- a/rosapps/.cvsignore
+++ b/rosapps/.cvsignore
@@ -1,2 +1 @@
-*.bat
 *.zip

diff --git a/rosapps/install.bat b/rosapps/install.bat
new file mode 100644 (file)
index 0000000..f4a858f
--- /dev/null
+++ b/rosapps/install.bat
@@ -0,0 +1,49 @@
+@echo off
+if "%1" == "" goto NoParameter
+set ROS_INSTALL=%1
+goto Install
+:NoParameter
+set ROS_INSTALL=c:\reactos
+:Install
+echo Installing ReactOS user programs to %ROS_INSTALL%\bin
+@echo off
+
+copy ..\rosapps\cmd\cmd.exe                    %ROS_INSTALL%\bin
+copy ..\rosapps\calc\calc.exe                  %ROS_INSTALL%\bin
+copy ..\rosapps\cmdutils\tee.exe               %ROS_INSTALL%\bin
+copy ..\rosapps\cmdutils\more.exe              %ROS_INSTALL%\bin
+copy ..\rosapps\cmdutils\y.exe                 %ROS_INSTALL%\bin
+copy ..\rosapps\cmdutils\mode\mode.exe         %ROS_INSTALL%\bin
+copy ..\rosapps\cmdutils\touch\touch.exe       %ROS_INSTALL%\bin
+copy ..\rosapps\control\control.exe            %ROS_INSTALL%\bin
+copy ..\rosapps\ctlpanel\roscfg\roscfg.cpl     %ROS_INSTALL%\system32
+copy ..\rosapps\ctlpanel\rospower\rospower.cpl %ROS_INSTALL%\system32
+copy ..\rosapps\dflat32\edit.exe               %ROS_INSTALL%\bin
+copy ..\rosapps\hcalc\hcalc.exe                        %ROS_INSTALL%\bin
+copy ..\rosapps\mc\release\mc.exe              %ROS_INSTALL%\bin
+copy ..\rosapps\net\arp\arp.exe                        %ROS_INSTALL%\bin
+copy ..\rosapps\net\echo\echo.exe              %ROS_INSTALL%\bin
+copy ..\rosapps\net\finger\finger.exe          %ROS_INSTALL%\bin
+copy ..\rosapps\net\ipconfig\ipconfig.exe      %ROS_INSTALL%\bin
+copy ..\rosapps\net\ipecho\ipecho.exe          %ROS_INSTALL%\bin
+copy ..\rosapps\net\ncftp\ncftp.exe            %ROS_INSTALL%\bin
+copy ..\rosapps\net\netstat\netstat.exe        %ROS_INSTALL%\bin
+copy ..\rosapps\net\niclist\niclist.exe        %ROS_INSTALL%\bin
+copy ..\rosapps\net\ping\ping.exe              %ROS_INSTALL%\bin
+copy ..\rosapps\net\route\route.exe            %ROS_INSTALL%\bin
+copy ..\rosapps\net\telnet\telnet.exe          %ROS_INSTALL%\bin
+copy ..\rosapps\net\telnet\telnet.cfg          %ROS_INSTALL%\bin
+copy ..\rosapps\net\telnet\telnet.ini          %ROS_INSTALL%\bin
+copy ..\rosapps\net\whois\whois.exe            %ROS_INSTALL%\bin
+copy ..\rosapps\notevil\notevil.exe            %ROS_INSTALL%\bin
+copy ..\rosapps\sysutils\chkdsk.exe            %ROS_INSTALL%\bin
+copy ..\rosapps\sysutils\chklib.exe            %ROS_INSTALL%\bin
+copy ..\rosapps\sysutils\format.exe            %ROS_INSTALL%\bin
+copy ..\rosapps\sysutils\ldd.exe               %ROS_INSTALL%\bin
+copy ..\rosapps\sysutils\pedump.exe            %ROS_INSTALL%\bin
+copy ..\rosapps\sysutils\regexpl\regexpl.exe   %ROS_INSTALL%\bin
+copy ..\rosapps\sysutils\tlist\tlist.exe       %ROS_INSTALL%\bin
+copy ..\rosapps\regedit\regedit.exe            %ROS_INSTALL%\bin
+copy ..\rosapps\regedt32\regedt32.exe          %ROS_INSTALL%\bin
+copy ..\rosapps\taskmgr\taskmgr.exe            %ROS_INSTALL%\bin
+copy ..\rosapps\winfile\winfile.exe            %ROS_INSTALL%\bin