CWS gnumake2: merging minibranches

3 files changed, 86 insertions, 20 deletions

diff --git a/framework/prj/build.lst b/framework/prj/build.lst
index 3591f5b29a63..12e597204710 100644
--- a/framework/prj/build.lst
+++ b/framework/prj/build.lst
@@ -1,3 +1,31 @@
-fr framework : l10n svtools NULL
-fr framework     usr1  - all fr_mkout NULL
-fr framework\prj nmake - all fr_all NULL
+fr	framework	:    l10n svtools NULL
+fr	framework								usr1	-	all	fr_mkout NULL
+fr  framework\inc			        	    nmake   -   all fr_inc NULL
+fr  framework\source\accelerators           nmake   -   all fr_accelerators fr_threadhelp fr_inc NULL
+fr  framework\source\classes                nmake   -   all fr_classes fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\constant               nmake   -   all fr_constant fr_inc NULL
+fr  framework\source\dispatch               nmake   -   all fr_dispatch fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\fwe\classes            nmake   -   all fr_fweclasses fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\fwe\dispatch           nmake   -   all fr_fwedispatch fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\fwe\helper             nmake   -   all fr_fwehelper fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\fwe\interaction        nmake   -   all fr_fweinteraction fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\fwe\xml				nmake   -  	all fr_fwexml fr_threadhelp fr_inc NULL
+fr  framework\source\fwi\classes            nmake   -   all fr_fwiclasses fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\fwi\helper             nmake   -   all fr_fwihelper fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\fwi\jobs               nmake   -   all fr_fwijobs fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\fwi\threadhelp         nmake   -   all fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\fwi\uielement          nmake   -   all fr_fwiuielement fr_threadhelp fr_inc NULL
+fr  framework\source\helper                 nmake   -   all fr_helper fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\interaction            nmake   -   all fr_interaction fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\jobs                   nmake   -   all fr_jobs fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\layoutmanager			nmake   -   all fr_layoutmanager fr_threadhelp fr_inc NULL
+fr  framework\source\loadenv                nmake   -   all fr_loadenv fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\recording              nmake   -   all fr_recording fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\register               nmake   -   all fr_register fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\services               nmake   -   all fr_services fr_threadhelp fr_constant fr_inc NULL
+fr  framework\source\tabwin					nmake   -   all fr_tabwin fr_threadhelp fr_inc NULL
+fr  framework\source\uiconfiguration        nmake   -   all fr_uiconfiguration fr_threadhelp fr_inc NULL
+fr  framework\source\uielement              nmake   -   all fr_uielement fr_threadhelp fr_inc NULL
+fr  framework\source\uifactory              nmake   -   all fr_uifactory fr_threadhelp fr_inc NULL
+fr  framework\source\xml					nmake   -  	all fr_xml fr_threadhelp fr_inc NULL
+fr  framework\util                          nmake   -   all fr_util fr_constant fr_threadhelp fr_classes fr_loadenv fr_jobs fr_interaction fr_helper fr_dispatch fr_services fr_register fr_recording fr_layoutmanager fr_uielement fr_uifactory fr_xml fr_uiconfiguration fr_accelerators fr_tabwin fr_fweclasses fr_fwedispatch fr_fwehelper fr_fweinteraction fr_fwexml fr_fwiclasses fr_fwihelper fr_fwijobs fr_fwiuielement NULL
diff --git a/framework/prj/d.lst b/framework/prj/d.lst
index 8b137891791f..cffe72a703d6 100644
--- a/framework/prj/d.lst
+++ b/framework/prj/d.lst
@@ -1 +1,39 @@
+mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %_DEST%\inc%_EXT%\framework
+mkdir: %_DEST%\xml%_EXT%\uiconfig
+mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
+mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule
+mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar
+mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar
+mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator
+mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator\en-US
+mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar
+
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
+..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*
+..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin
+..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
+..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
+
+..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd
+..\dtd\toolbar.dtd %_DEST%\bin%_EXT%\toolbar.dtd
+..\dtd\statusbar.dtd %_DEST%\bin%_EXT%\statusbar.dtd
+..\dtd\event.dtd %_DEST%\bin%_EXT%\event.dtd
+..\dtd\accelerator.dtd %_DEST%\bin%_EXT%\accelerator.dtd
+..\dtd\image.dtd %_DEST%\bin%_EXT%\image.dtd
+..\dtd\groupuinames.dtd %_DEST%\bin%_EXT%\groupuinames.dtd
+
+..\%__SRC%\lib\ifwe.lib %_DEST%\lib%_EXT%\ifwe.lib
+..\%__SRC%\lib\ifwi.lib %_DEST%\lib%_EXT%\ifwi.lib
+..\inc\framework/*.h %_DEST%\inc%_EXT%\framework\*.h
+..\inc\framework/*.hxx %_DEST%\inc%_EXT%\framework\*.hxx
+
+..\uiconfig\startmodule\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar\*.xml
+..\uiconfig\startmodule\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar\*.xml
+..\uiconfig\startmodule\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator\en-US\*.xml
+..\uiconfig\startmodule\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar\*.xml
+
+..\source\unotypes\fw?.xml %_DEST%\xml%_EXT%\*.xml
 
diff --git a/framework/prj/target_package_inc.mk b/framework/prj/target_package_inc.mk
index 32ae89b7b1be..e087c6038001 100644
--- a/framework/prj/target_package_inc.mk
+++ b/framework/prj/target_package_inc.mk
@@ -26,22 +26,22 @@
 #*************************************************************************
 
 $(eval $(call gb_Package_Package,framework_inc,$(SRCDIR)/framework/inc))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/acceleratorinfo.hxx,helper/acceleratorinfo.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/actiontriggerhelper.hxx,helper/actiontriggerhelper.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonmenu.hxx,classes/addonmenu.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonsoptions.hxx,classes/addonsoptions.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/bmkmenu.hxx,classes/bmkmenu.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/configimporter.hxx,helper/configimporter.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/eventsconfiguration.hxx,xml/eventsconfiguration.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,helper/imageproducer.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imagesconfiguration.hxx,xml/imagesconfiguration.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,dispatch/interaction.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuconfiguration.hxx,xml/menuconfiguration.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuextensionsupplier.hxx,classes/menuextensionsupplier.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/preventduplicateinteraction.hxx,interaction/preventduplicateinteraction.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/sfxhelperfunctions.hxx,classes/sfxhelperfunctions.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/titlehelper.hxx,helper/titlehelper.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/framework/toolboxconfiguration.hxx,xml/toolboxconfiguration.hxx))
-$(eval $(call gb_Package_add_file,framework_inc,inc/fwedllapi.h,fwedllapi.h))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/acceleratorinfo.hxx,framework/acceleratorinfo.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/actiontriggerhelper.hxx,framework/actiontriggerhelper.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonmenu.hxx,framework/addonmenu.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonsoptions.hxx,framework/addonsoptions.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/bmkmenu.hxx,framework/bmkmenu.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/configimporter.hxx,framework/configimporter.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/eventsconfiguration.hxx,framework/eventsconfiguration.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,framework/imageproducer.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imagesconfiguration.hxx,framework/imagesconfiguration.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,framework/interaction.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuconfiguration.hxx,framework/menuconfiguration.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuextensionsupplier.hxx,framework/menuextensionsupplier.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/preventduplicateinteraction.hxx,framework/preventduplicateinteraction.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/sfxhelperfunctions.hxx,framework/sfxhelperfunctions.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/titlehelper.hxx,framework/titlehelper.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/toolboxconfiguration.hxx,framework/toolboxconfiguration.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/fwedllapi.h,fwedllapi.h))
 $(eval $(call gb_Package_add_file,framework_inc,inc/fwkdllapi.h,fwkdllapi.h))
 $(eval $(call gb_Package_add_file,framework_inc,inc/fwidllapi.h,fwidllapi.h))