diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-21 18:12:16 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-21 18:12:16 -0500 |
| commit | 0d4720d1e1ffcefc43ae2af59c7487ab0bfab2ce (patch) | |
| tree | 7cacea747b7ff3de52f69a8605ef486463201a9c /setup_native/prj | |
| parent | 57b992c0b57daba5f44b5c4cdb08e817f355ea01 (diff) | |
undo anything not wizard related in the previous merge-commit
Diffstat (limited to 'setup_native/prj')
| -rw-r--r-- | setup_native/prj/build.lst | 1 | ||||
| -rw-r--r-- | setup_native/prj/d.lst | 19 |
2 files changed, 10 insertions, 10 deletions
diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst index 4c62f004f0c9..4ca42cac8f80 100644 --- a/setup_native/prj/build.lst +++ b/setup_native/prj/build.lst @@ -4,7 +4,6 @@ pk setup_native\scripts\source nmake - u sn_sour pk setup_native\scripts nmake - u sn_scripts sn_source.u NULL pk setup_native\source\mac nmake - u sn_mac NULL pk setup_native\source\win32\customactions\tools nmake - w sn_tools NULL -pk setup_native\source\win32\customactions\relnotes nmake - w sn_relnotes NULL pk setup_native\source\win32\customactions\rebase nmake - w sn_rebase NULL pk setup_native\source\win32\customactions\regactivex nmake - w sn_regactivex NULL pk setup_native\source\win32\customactions\regpatchactivex nmake - w sn_regpatchactivex NULL diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst index 358fce0f449d..6221f738c123 100644 --- a/setup_native/prj/d.lst +++ b/setup_native/prj/d.lst @@ -1,12 +1,12 @@ -mkdir: %_DEST%\bin%_EXT%\osl -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe -..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar +mkdir: %_DEST%\bin\osl +..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll +..\%__SRC%\bin\*.exe %_DEST%\bin\*.exe +..\%__SRC%\class\*.jar %_DEST%\bin\*.jar -mkdir: %_DEST%\bin%_EXT%\userscripts -..\%__SRC%\bin\install %_DEST%\bin%_EXT%\userscripts\install -..\%__SRC%\bin\uninstall %_DEST%\bin%_EXT%\userscripts\uninstall -..\%__SRC%\bin\noarch\fake-db-1.0-0.noarch.rpm %_DEST%\bin%_EXT%\openoffice.org-userland-1.0-0.noarch.rpm +mkdir: %_DEST%\bin\userscripts +..\%__SRC%\bin\install %_DEST%\bin\userscripts\install +..\%__SRC%\bin\uninstall %_DEST%\bin\userscripts\uninstall +..\%__SRC%\bin\noarch\fake-db-1.0-0.noarch.rpm %_DEST%\bin\openoffice.org-userland-1.0-0.noarch.rpm mkdir: %_DEST%\bin\osolsmf ..\%__SRC%\bin\ulfconv %_DEST%\bin\ulfconv @@ -48,6 +48,7 @@ mkdir: %_DEST%\bin\osolsmf ..\scripts\mac_install.script %_DEST%\bin\mac_install.script ..\scripts\osx_install_languagepack.applescript %_DEST%\bin\osx_install_languagepack.applescript ..\scripts\osx_install_patch.applescript %_DEST%\bin\osx_install_patch.applescript -..\%__SRC%\lib\getuid.so %_DEST%\bin%_EXT%\getuid.so + +..\%__SRC%\lib\getuid.so %_DEST%\bin\getuid.so ..\inc\setup_native\qswin32.h %_DEST%\inc\setup_native\qswin32.h |