X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=installwine.bat;h=058a76f4bfce5c151cfc3d5c2cfb243b43f0fc19;hb=fbfe73a70583ea825013894d49512c037f48a9e3;hp=ea48521fef95f88081823001baf1f40ea3ac79b7;hpb=1334f77b1ecef00ac31076ce6bf22bdfeb82d347;p=reactos.git

diff --git a/installwine.bat b/installwine.bat
index ea48521..058a76f 100644
--- a/installwine.bat
+++ b/installwine.bat
@@ -6,9 +6,19 @@ if "%1" == "" goto NoParameter
 set WINE_INSTALL=%1
 goto Install
 :NoParameter
-set WINE_INSTALL=c:\reactos\system32
+
 set ROS_INSTALL=c:\reactos
+set WINE_INSTALL=%ROS_INSTALL%\system32
+set WINE_APP_INSTALL=%ROS_INSTALL%\bin
+set WINE_TESTS_INSTALL=%ROS_INSTALL%\test
+
+
 :Install
+echo Installing libwine and wine_unicode to %WINE_INSTALL%
+copy ..\wine\libs\wine\libwine.dll %WINE_INSTALL%
+copy ..\wine\libs\unicode\wine_unicode.dll %WINE_INSTALL%
+
+
 echo Installing dlls to %WINE_INSTALL%
 @echo off
 copy ..\wine\dlls\comctl32\comctl32.dll %WINE_INSTALL%
@@ -18,6 +28,9 @@ copy ..\wine\dlls\dinput\dinput.dll 	%WINE_INSTALL%
 copy ..\wine\dlls\dplay\dplay.dll 	%WINE_INSTALL%
 copy ..\wine\dlls\dplayx\dplayx.dll 	%WINE_INSTALL%
 copy ..\wine\dlls\mapi32\mapi32.dll 	%WINE_INSTALL%
+copy ..\wine\dlls\mpr\mpr.dll 		%WINE_INSTALL%
+copy ..\wine\dlls\netapi32\netapi32.dll %WINE_INSTALL%
+copy ..\wine\dlls\odbc32\odbc32.dll 	%WINE_INSTALL%
 copy ..\wine\dlls\ole32\ole32.dll 	%WINE_INSTALL%
 copy ..\wine\dlls\oleaut32\oleaut32.dll %WINE_INSTALL%
 copy ..\wine\dlls\olecli\olecli32.dll   %WINE_INSTALL%
@@ -34,28 +47,47 @@ copy ..\wine\dlls\shfolder\shfolder.dll	%WINE_INSTALL%
 copy ..\wine\dlls\shlwapi\shlwapi.dll	%WINE_INSTALL%
 copy ..\wine\dlls\tapi32\tapi32.dll	%WINE_INSTALL%
 copy ..\wine\dlls\urlmon\urlmon.dll	%WINE_INSTALL%
+REM copy ..\wine\dlls\version\version.dll	%WINE_INSTALL%
 copy ..\wine\dlls\wintrust\wintrust.dll	%WINE_INSTALL%
+copy ..\wine\dlls\winspool\winspool.drv	%WINE_INSTALL%
 REM
-echo Installing winelib programs to %ROS_INSTALL%\bin
-REM
-copy ..\wine\programs\clock\winclock.exe		%ROS_INSTALL%\bin
-copy ..\wine\programs\cmdlgtst\cmdlgtst.exe		%ROS_INSTALL%\bin
-copy ..\wine\programs\control\control.exe		%ROS_INSTALL%\bin
-copy ..\wine\programs\notepad\notepad.exe		%ROS_INSTALL%\bin
-copy ..\wine\programs\progman\progman.exe		%ROS_INSTALL%\bin
-copy ..\wine\programs\uninstaller\uninstaller.exe	%ROS_INSTALL%\bin
-copy ..\wine\programs\view\view.exe			%ROS_INSTALL%\bin
-copy ..\wine\programs\wcmd\wcmd.exe			%ROS_INSTALL%\bin
-copy ..\wine\programs\winefile\winefile.exe		%ROS_INSTALL%\bin
-copy ..\wine\programs\winemine\winmine.exe		%ROS_INSTALL%\bin
-copy ..\wine\programs\winver\winver.exe			%ROS_INSTALL%\bin
-REM
-echo Installing Regression tests to %ROS_INSTALL%\bin
-copy ..\wine\dlls\advapi32\tests\advapi32_test.exe	%WINE_INSTALL%
-copy ..\wine\dlls\kernel\tests\kernel32_test.exe	%WINE_INSTALL%
-copy ..\wine\dlls\ntdll\tests\ntdll_test.exe		%WINE_INSTALL%
-copy ..\wine\dlls\user32\tests\user32_test.exe		%WINE_INSTALL%
+echo Installing winelib programs to %WINE_APP_INSTALL%
 REM
+copy ..\wine\programs\clock\winclock.exe		%WINE_APP_INSTALL%
+copy ..\wine\programs\cmdlgtst\cmdlgtst.exe		%WINE_APP_INSTALL%
+copy ..\wine\programs\control\control.exe		%WINE_APP_INSTALL%
+copy ..\wine\programs\notepad\notepad.exe		%WINE_APP_INSTALL%
+copy ..\wine\programs\progman\progman.exe		%WINE_APP_INSTALL%
+copy ..\wine\programs\uninstaller\uninstaller.exe	%WINE_APP_INSTALL%
+copy ..\wine\programs\view\view.exe			%WINE_APP_INSTALL%
+copy ..\wine\programs\wcmd\wcmd.exe			%WINE_APP_INSTALL%
+copy ..\wine\programs\winefile\winefile.exe		%WINE_APP_INSTALL%
+copy ..\wine\programs\winemine\winmine.exe		%WINE_APP_INSTALL%
+copy ..\wine\programs\winver\winver.exe			%WINE_APP_INSTALL%
+REM
+echo Installing wine tools to %WINE_APP_INSTALL%
+REM
+copy ..\wine\tools\winedump\winedump.exe		%WINE_APP_INSTALL%
 
+REM
+echo Installing Regression tests to %WINE_TESTS_INSTALL%
+REM
+copy ..\wine\dlls\advapi32\tests\advapi32_test.exe	%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\comctl32\tests\comctl32_test.exe	%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\dsound\tests\dsound_test.exe		%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\gdi\tests\gdi32_test.exe		%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\kernel\tests\kernel32_test.exe	%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\msvcrt\tests\msvcrt_test.exe		%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\netapi\tests\netapi_test.exe		%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\ntdll\tests\ntdll_test.exe		%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\oleaut32\tests\oleaut32_test.exe	%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\shlwapi\tests\shlwapi_test.exe	%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\urlmon\tests\urlmon_test.exe		%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\user32\tests\user32_test.exe		%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\wininet\tests\wininet_test.exe	%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\winmm\tests\winmm_test.exe		%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\winsock\tests\ws_2_32_test.exe	%WINE_TESTS_INSTALL%
+copy ..\wine\dlls\winspool\tests\winspool_test.exe	%WINE_TESTS_INSTALL%
 
-
+REM
+pause