diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
commit | e2682561337c521f10fa2c87594c86c01b3c662a (patch) | |
tree | a8cb220cf9888183c2de5edd3644597c63b67b9a /setup_native/prj | |
parent | 68f53efa2572acc661c8a75ee2ec09f87348aa65 (diff) | |
parent | f9c2beb2cdb4ae448d22ae390c63159b88df9e9e (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
setup_native/prj/build.lst
setup_native/prj/d.lst
wizards/Jar_query.mk
wizards/Module_wizards.mk
wizards/Zip_launcher.mk
wizards/com/sun/star/wizards/report/makefile.mk
wizards/prj/build.lst
wizards/prj/d.lst
wizards/util/target.pmk
Diffstat (limited to 'setup_native/prj')
-rw-r--r-- | setup_native/prj/build.lst | 6 | ||||
-rw-r--r-- | setup_native/prj/d.lst | 108 |
2 files changed, 54 insertions, 60 deletions
diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst index df94edb61a00..edd50fd90ebc 100644 --- a/setup_native/prj/build.lst +++ b/setup_native/prj/build.lst @@ -1,14 +1,15 @@ -pk setup_native : L10N:l10n l10ntools soltools sal sfx2 xml2cmp NULL +pk setup_native : TRANSLATIONS:translations l10ntools soltools sal xml2cmp NULL pk setup_native usr1 - all sn_mkout NULL pk setup_native\scripts\source nmake - u sn_source NULL 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 pk setup_native\source\win32\customactions\reg4allmsdoc nmake - w sn_reg4allmsdoc NULL +pk setup_native\source\win32\customactions\sellang nmake - w sn_sellang NULL +pk setup_native\source\win32\customactions\thesaurus nmake - w sn_thesaurus NULL pk setup_native\source\win32\customactions\reg64 nmake - w sn_reg64 NULL pk setup_native\source\win32\customactions\javafilter nmake - w sn_javafilter NULL pk setup_native\source\win32\customactions\quickstarter nmake - w sn_quickstarter NULL @@ -16,5 +17,4 @@ pk setup_native\source\win32\customactions\shellextensions nmake - w sn_sh pk setup_native\source\win32\customactions\indexingfilter nmake - w sn_indexingfilter NULL pk setup_native\source\win32\customactions\languagepacks nmake - w sn_languagepacks sn_shellextensions.w sn_tools.w NULL pk setup_native\source\win32\customactions\patch nmake - w sn_patch sn_languagepacks.w sn_shellextensions.w sn_quickstarter.w sn_tools.w NULL -pk setup_native\source\win32\stwrapper nmake - w sn_stwrapper NULL pk setup_native\source\ulfconv nmake - all sn_ulfconv NULL diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst index 3a5b80031930..d57569b8c0fa 100644 --- a/setup_native/prj/d.lst +++ b/setup_native/prj/d.lst @@ -1,61 +1,55 @@ -mkdir: %_DEST%\bin%_EXT%\osl -mkdir: %_DEST%\bin%_EXT%\broffice -..\%__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%_EXT%\osolsmf -..\%__SRC%\bin\ulfconv %_DEST%\bin%_EXT%\ulfconv -..\%__SRC%\bin\langpackscript.sh %_DEST%\bin%_EXT%\langpackscript.sh -..\%__SRC%\bin\linuxpatchscript.sh %_DEST%\bin%_EXT%\linuxpatchscript.sh -..\%__SRC%\bin\downloadscript.sh %_DEST%\bin%_EXT%\downloadscript.sh -..\%__SRC%\bin\register_extensions %_DEST%\bin%_EXT%\register_extensions -..\%__SRC%\bin\deregister_extensions %_DEST%\bin%_EXT%\deregister_extensions -..\%__SRC%\bin\unpack_update.sh %_DEST%\bin%_EXT%\unpack_update -..\%__SRC%\bin\update.sh %_DEST%\bin%_EXT%\update -..\%__SRC%\bin\javaloader.sh %_DEST%\bin%_EXT%\javaloader.sh -..\%__SRC%\bin\stclient_wrapper.sh %_DEST%\bin%_EXT%\stclient_wrapper -..\%__SRC%\bin\stclient_wrapper.exe %_DEST%\bin%_EXT%\stclient_wrapper.exe -..\%__SRC%\misc\mac_ulffiles_dest\*.ulf %_DEST%\bin%_EXT%\*.ulf -..\source\win32\msi-encodinglist.txt %_DEST%\bin%_EXT%\msi-encodinglist.txt -..\source\win32\patchlist.txt %_DEST%\bin%_EXT%\patchlist.txt -..\source\win32\desktophelper.txt %_DEST%\bin%_EXT%\desktophelper.txt -..\source\win32\get_retval.bat %_DEST%\bin%_EXT%\get_retval.bat -..\source\win32\nsis\downloadtemplate.nsi %_DEST%\bin%_EXT%\downloadtemplate.nsi -..\source\win32\nsis\*.ico %_DEST%\bin%_EXT%\*.ico -..\source\win32\nsis\*.bmp %_DEST%\bin%_EXT%\*.bmp -..\source\linux\*.dat %_DEST%\bin%_EXT%\*.dat -..\source\mac\*.icns %_DEST%\bin%_EXT%\*.icns -..\source\mac\Info.plist.langpack %_DEST%\bin%_EXT%\Info.plist.langpack -..\source\mac\ooo\osxdndinstall.png %_DEST%\bin%_EXT%\osl\osxdndinstall.png -..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\osl\osxdndinstall_nologo.png -..\source\mac\ooo\DS_Store %_DEST%\bin%_EXT%\osl\DS_Store -..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin%_EXT%\osl\DS_Store_Langpack -..\source\mac\broffice\osxdndinstall.png %_DEST%\bin%_EXT%\broffice\osxdndinstall.png -..\source\mac\broffice\osxdndinstall_nologo.png %_DEST%\bin%_EXT%\broffice\osxdndinstall_nologo.png -..\source\mac\broffice\DS_Store %_DEST%\bin%_EXT%\broffice\DS_Store -..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif -..\source\java\brofficeorg_setup.gif %_DEST%\bin%_EXT%\broffice\Setup.gif -..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat -..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat -..\source\opensolaris\bundledextensions\installed %_DEST%\bin%_EXT%\osolsmf\installed -..\source\opensolaris\bundledextensions\README %_DEST%\bin%_EXT%\osolsmf\README -..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin%_EXT%\osolsmf\ooo_bundled_extensions.xml -..\source\opensolaris\bundledextensions\svc-ooo_bundled_extensions %_DEST%\bin%_EXT%\osolsmf\svc-ooo_bundled_extensions -..\source\packinfo\solariscopyrightfile %_DEST%\bin%_EXT%\solariscopyrightfile -..\source\packinfo\linuxcopyrightfile %_DEST%\bin%_EXT%\linuxcopyrightfile -..\source\packinfo\*.txt %_DEST%\bin%_EXT%\*.txt -..\source\packinfo\*.pcp %_DEST%\bin%_EXT%\*.pcp -..\scripts\admin.pl %_DEST%\bin%_EXT%\admin.pl -..\scripts\*.txt %_DEST%\bin%_EXT%\*.txt -..\scripts\mac_install.script %_DEST%\bin%_EXT%\mac_install.script -..\scripts\osx_install_languagepack.applescript %_DEST%\bin%_EXT%\osx_install_languagepack.applescript -..\scripts\osx_install_patch.applescript %_DEST%\bin%_EXT%\osx_install_patch.applescript +mkdir: %_DEST%\bin\osolsmf +..\%__SRC%\bin\ulfconv %_DEST%\bin\ulfconv +..\%__SRC%\bin\langpackscript.sh %_DEST%\bin\langpackscript.sh +..\%__SRC%\bin\linuxpatchscript.sh %_DEST%\bin\linuxpatchscript.sh +..\%__SRC%\bin\downloadscript.sh %_DEST%\bin\downloadscript.sh +..\%__SRC%\bin\register_extensions %_DEST%\bin\register_extensions +..\%__SRC%\bin\deregister_extensions %_DEST%\bin\deregister_extensions +..\%__SRC%\bin\unpack_update.sh %_DEST%\bin\unpack_update +..\%__SRC%\bin\update.sh %_DEST%\bin\update +..\%__SRC%\bin\javaloader.sh %_DEST%\bin\javaloader.sh +..\%__SRC%\misc\mac_ulffiles_dest\*.ulf %_DEST%\bin\*.ulf +..\source\win32\msi-encodinglist.txt %_DEST%\bin\msi-encodinglist.txt +..\source\win32\patchlist.txt %_DEST%\bin\patchlist.txt +..\source\win32\desktophelper.txt %_DEST%\bin\desktophelper.txt +..\source\win32\get_retval.bat %_DEST%\bin\get_retval.bat +..\source\win32\nsis\downloadtemplate.nsi %_DEST%\bin\downloadtemplate.nsi +..\source\win32\nsis\*.ico %_DEST%\bin\*.ico +..\source\win32\nsis\*.bmp %_DEST%\bin\*.bmp +..\source\linux\*.dat %_DEST%\bin\*.dat +..\source\mac\*.icns %_DEST%\bin\*.icns +..\source\mac\Info.plist.langpack %_DEST%\bin\Info.plist.langpack +..\source\mac\ooo\osxdndinstall.png %_DEST%\bin\osl\osxdndinstall.png +..\source\mac\ooo\osxdndinstall_nologo.png %_DEST%\bin\osl\osxdndinstall_nologo.png +..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store +..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack +..\source\java\openofficeorg_setup.gif %_DEST%\bin\osl\Setup.gif +..\source\java\javaversion.dat %_DEST%\bin\javaversion.dat +..\source\java\javaversion2.dat %_DEST%\bin\javaversion2.dat +..\source\opensolaris\bundledextensions\installed %_DEST%\bin\osolsmf\installed +..\source\opensolaris\bundledextensions\README %_DEST%\bin\osolsmf\README +..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin\osolsmf\ooo_bundled_extensions.xml +..\source\opensolaris\bundledextensions\svc-ooo_bundled_extensions %_DEST%\bin\osolsmf\svc-ooo_bundled_extensions +..\source\packinfo\solariscopyrightfile %_DEST%\bin\solariscopyrightfile +..\source\packinfo\linuxcopyrightfile %_DEST%\bin\linuxcopyrightfile +..\source\packinfo\*.txt %_DEST%\bin\*.txt +..\source\packinfo\*.pcp %_DEST%\bin\*.pcp +..\scripts\admin.pl %_DEST%\bin\admin.pl +..\scripts\*.txt %_DEST%\bin\*.txt +..\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 |