diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
commit | 0fe045d9566b66b766a8dd967e65ad6d57d78e5b (patch) | |
tree | 7a7506427f1225f68a2179fa9e40f9e013549ea4 /sw/prj | |
parent | gnumake2: move make 3.81 check into configure (diff) | |
parent | CWS changehid: #i113152#: arguments shall be checked only for plugins (diff) | |
download | core-0fe045d9566b66b766a8dd967e65ad6d57d78e5b.tar.gz core-0fe045d9566b66b766a8dd967e65ad6d57d78e5b.zip |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'sw/prj')
-rw-r--r--[-rwxr-xr-x] | sw/prj/build.lst | 86 | ||||
-rw-r--r-- | sw/prj/d.lst | 65 |
2 files changed, 151 insertions, 0 deletions
diff --git a/sw/prj/build.lst b/sw/prj/build.lst index d4770eec862c..821015ba1561 100755..100644 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,3 +1,89 @@ +<<<<<<< local sw sw : l10n connectivity OOo:writerperfect svx stoc uui writerfilter filter oovbaapi cui vbahelper NULL sw sw usr1 - all sw_mkout NULL sw sw\prj nmake - all sw_prj NULL +======= +sw sw : filter l10n connectivity OOo:writerperfect vbahelper svx stoc writerfilter NULL +sw sw usr1 - all sw_mkout NULL +sw sw\inc nmake - all sw_inc NULL +sw sw\uiconfig\layout nmake - all sw_layout NULL +sw sw\prj get - all sw_prj NULL +sw sw\source\ui\inc nmake - all sw_uinc NULL +sw sw\source\core\inc get - all sw_cinc NULL +sw sw\source\filter\inc get - all sw_finc NULL +sw sw\res get - all sw_res NULL +sw sw\win\res get - all sw_wres NULL +sw sw\win\imglst get - all sw_wimg NULL +sw sw\sdi nmake - all sw_sdi NULL +sw sw\source\core\bastyp nmake - all sw_bast sw_inc NULL +sw sw\source\ui\app nmake - all sw_app sw_sdi sw_uinc sw_inc NULL +sw sw\source\ui\cctrl nmake - all sw_cctrl sw_inc NULL +sw sw\source\ui\chrdlg nmake - all sw_chrdl sw_inc NULL +sw sw\source\ui\config nmake - all sw_conf sw_inc NULL +sw sw\source\ui\dbui nmake - all sw_dbui sw_inc NULL +sw sw\source\ui\dialog nmake - all sw_dlg sw_inc NULL +sw sw\source\ui\dochdl nmake - all sw_dchdl sw_inc NULL +sw sw\source\ui\docvw nmake - all sw_dcvw sw_inc NULL +sw sw\source\ui\envelp nmake - all sw_envlp sw_inc NULL +sw sw\source\ui\fldui nmake - all sw_fldui sw_inc NULL +sw sw\source\ui\fmtui nmake - all sw_fmtui sw_inc NULL +sw sw\source\ui\frmdlg nmake - all sw_frmdl sw_inc NULL +sw sw\source\ui\globdoc nmake - all sw_globd sw_uinc sw_inc NULL +sw sw\source\ui\index nmake - all sw_index sw_inc NULL +sw sw\source\ui\lingu nmake - all sw_ling sw_inc NULL +sw sw\source\ui\misc nmake - all sw_misc sw_sdi sw_inc NULL +sw sw\source\ui\ribbar nmake - all sw_rbbar sw_inc NULL +sw sw\source\ui\shells nmake - all sw_shell sw_uinc sw_sdi sw_inc NULL +sw sw\source\ui\smartmenu nmake - all sw_smartmenu sw_inc NULL +sw sw\source\ui\table nmake - all sw_table sw_inc NULL +sw sw\source\ui\uiview nmake - all sw_uivw sw_sdi sw_inc NULL +sw sw\source\ui\uno nmake - all sw_uiuno sw_sdi sw_inc NULL +sw sw\source\ui\vba nmake - all sw_vba sw_inc NULL +sw sw\source\ui\utlui nmake - all sw_utlui sw_inc NULL +sw sw\source\ui\web nmake - all sw_web sw_uinc sw_sdi sw_inc NULL +sw sw\source\ui\wrtsh nmake - all sw_wrtsh sw_inc NULL +sw sw\source\core\attr nmake - all sw_attr sw_inc NULL +sw sw\source\core\crsr nmake - all sw_crsr sw_inc NULL +sw sw\source\core\doc nmake - all sw_doc sw_inc NULL +sw sw\source\core\docnode nmake - all sw_dcnd sw_inc NULL +sw sw\source\core\draw nmake - all sw_draw sw_inc NULL +sw sw\source\core\edit nmake - all sw_edit sw_inc NULL +sw sw\source\core\except nmake - all sw_excpt sw_inc NULL +sw sw\source\core\fields nmake - all sw_fld sw_inc NULL +sw sw\source\core\frmedt nmake - all sw_frmed sw_inc NULL +sw sw\source\core\graphic nmake - all sw_grph sw_inc NULL +sw sw\source\core\layout nmake - all sw_layo sw_inc NULL +sw sw\source\core\ole nmake - all sw_ole sw_inc NULL +sw sw\source\core\para nmake - all sw_para sw_inc NULL +sw sw\source\core\sw3io nmake - all sw_sw3io sw_inc NULL +sw sw\source\core\swg nmake - all sw_swg sw_inc NULL +sw sw\source\core\text nmake - all sw_text sw_inc NULL +sw sw\source\core\tox nmake - all sw_tox sw_inc NULL +sw sw\source\core\txtnode nmake - all sw_txtnd sw_inc NULL +sw sw\source\core\undo nmake - all sw_undo sw_inc NULL +sw sw\source\core\view nmake - all sw_view sw_inc NULL +sw sw\source\core\unocore nmake - all sw_uco sw_inc NULL +sw sw\source\core\objectpositioning nmake - all sw_objpos sw_inc NULL +sw sw\source\core\access nmake - all sw_acc sw_inc NULL +sw sw\source\core\SwNumberTree nmake - all sw_NumberTree sw_inc NULL +sw sw\source\core\table nmake - all sw_tablecore sw_inc NULL +sw sw\source\filter\ascii nmake - all sw_ascii sw_inc NULL +sw sw\source\filter\basflt nmake - all sw_bsflt sw_inc NULL +sw sw\source\filter\html nmake - all sw_html sw_inc NULL +sw sw\source\filter\rtf nmake - all sw_rtf sw_inc NULL +sw sw\source\filter\writer nmake - all sw_wrtr sw_inc NULL +sw sw\source\filter\ww1 nmake - all sw_ww1 sw_inc NULL +sw sw\source\filter\ww8 nmake - all sw_ww8 sw_inc NULL +sw sw\source\filter\xml nmake - all sw_xml sw_inc NULL +sw sw\source\ui nmake - all sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu sw_vba NULL +sw sw\source\core nmake - all sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view sw_acc sw_objpos sw_NumberTree sw_tablecore NULL +sw sw\source\filter nmake - all sw_flt sw_ascii sw_bsflt sw_html sw_rtf sw_wrtr sw_ww1 sw_ww8 sw_xml NULL +sw sw\util nmake - all sw_util sw_core sw_flt sw_sdi sw_ui NULL + +sw sw\qa\complex\accessibility nmake - all sw_qa_complex_accessibility sw_util NULL +sw sw\qa\complex\checkColor nmake - all sw_qa_complex_checkColor sw_util NULL +# fails +# sw sw\qa\complex\indeterminateState nmake - all sw_qa_complex_indeterminateState sw_util NULL +# sw sw\qa\complex\writer nmake - all sw_qa_complex_writer sw_util NULL +sw sw\qa\unoapi nmake - all sw_qa_unoapi sw_util NULL +>>>>>>> other diff --git a/sw/prj/d.lst b/sw/prj/d.lst index e69de29bb2d1..d9c3e89d62ab 100644 --- a/sw/prj/d.lst +++ b/sw/prj/d.lst @@ -0,0 +1,65 @@ +<<<<<<< local +======= +mkdir: %COMMON_DEST%\bin%_EXT%\hid +mkdir: %_DEST%\inc%_EXT%\sw +mkdir: %_DEST%\xml%_EXT%\uiconfig +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\menubar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\menubar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\menubar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\menubar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\toolbar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\toolbar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\toolbar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\toolbar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\toolbar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\toolbar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swriter\statusbar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swxform\statusbar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sweb\statusbar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\statusbar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swform\statusbar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar + +..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid +..\xml\*.xml %_DEST%\xml%_EXT%\*.xml +..\%__SRC%\bin\sw?????.dll %_DEST%\bin%_EXT%\sw?????.dll +..\%__SRC%\bin\swd?????.dll %_DEST%\bin%_EXT%\swd?????.dll +..\%__SRC%\bin\swui?????.dll %_DEST%\bin%_EXT%\swui?????.dll +..\%__SRC%\bin\msword?????.dll %_DEST%\bin%_EXT%\msword?????.dll +..\%__SRC%\bin\vbaswobj*.dll %_DEST%\bin%_EXT%\vbaswobj*.dll +..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res +..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* +..\%__SRC%\misc\swd.component %_DEST%\xml%_EXT%\swd.component + +..\uiconfig\swriter\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\menubar\*.xml +..\uiconfig\swxform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\menubar\*.xml +..\uiconfig\sweb\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\menubar\*.xml +..\uiconfig\sglobal\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\menubar\*.xml +..\uiconfig\swform\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\menubar\*.xml +..\uiconfig\swreport\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\menubar\*.xml +..\uiconfig\swriter\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\toolbar\*.xml +..\uiconfig\swxform\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\toolbar\*.xml +..\uiconfig\sweb\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\toolbar\*.xml +..\uiconfig\sglobal\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\toolbar\*.xml +..\uiconfig\swform\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\toolbar\*.xml +..\uiconfig\swreport\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\toolbar\*.xml +..\uiconfig\swriter\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swriter\statusbar\*.xml +..\uiconfig\swxform\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swxform\statusbar\*.xml +..\uiconfig\sweb\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sweb\statusbar\*.xml +..\uiconfig\sglobal\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\sglobal\statusbar\*.xml +..\uiconfig\swform\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swform\statusbar\*.xml +..\uiconfig\swreport\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\swreport\statusbar\*.xml + +..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* +..\%__SRC%\misc\sw.component %_DEST%\xml%_EXT%\sw.component +..\%__SRC%\misc\vbaswobj.component %_DEST%\xml%_EXT%\vbaswobj.component +>>>>>>> other |