gbuild: rework AutoInstallLibs and autoinstall ure executables

Change-Id: I7312d94f90758d450a69410819c5e8c142756a47

gbuild: rework AutoInstallLibs and autoinstall ure executables
Change-Id: I7312d94f90758d450a69410819c5e8c142756a47
74f5df9b · Matúš Kukan · 6b408d1c · 74f5df9b · 74f5df9b · 74f5df9b
Kaydet (Commit) 74f5df9b authored Haz 09, 2013 tarafından Matúš Kukan
17 changed files
--- a/Repository.mk
+++ b/Repository.mk
@@ -151,22 +151,15 @@ endif

 endif

-ifneq ($(OS),IOS)
-
-$(eval $(call gb_Helper_register_executables,UREBIN,\
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+$(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
 	regmerge \
 	regview \
-	uno \
+	$(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS))),javaldx) \
 ))
-
-endif
-
-ifneq ($(OS),MACOSX)
-
 $(eval $(call gb_Helper_register_executables,UREBIN,\
-	javaldx \
+	uno \
 ))
-
 endif

 ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)
@@ -203,35 +196,35 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \

 endif

-$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,BASE, \
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
    abp \
    dbp \
    dbu \
 ))

-$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
    svgfilter \
    flash \
    wpftdraw \
    graphicfilter \
 ))

-$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,tde, \
    $(if $(ENABLE_TDE),tdebe1) \
 ))

-$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,IMPRESS, \
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
    animcore \
    placeware \
    PresenterScreen \
 ))

-$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ONLINEUPDATE, \
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
    updatecheckui \
    updchk \
 ))

-$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
    $(if $(ENABLE_EVOAB2),evoab) \
    $(if $(ENABLE_GTK),vclplug_gtk) \
    $(if $(ENABLE_GTK3),vclplug_gtk3) \
@@ -242,17 +235,17 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \
    $(if $(ENABLE_GNOMEVFS),ucpgvfs1) \
 ))

-$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
    $(if $(ENABLE_KDE),kdebe1) \
    $(if $(ENABLE_KDE4),kde4be1) \
 ))

-$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,MATH, \
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
    sm \
    smd \
 ))

-$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	avmedia \
 	$(if $(DISABLE_SCRIPTING),,basctl) \
    basegfx \
@@ -376,7 +369,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
    xsltfilter \
 ))

-$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
 	hwp \
 	$(if $(ENABLE_LWP),lwpft) \
 	msword \
@@ -458,7 +451,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
    unotest \
 ))

-$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
 	affine_uno \
 	$(if $(SOLAR_JAVA),java_uno) \
 	$(if $(SOLAR_JAVA),juh) \
@@ -477,7 +470,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \
 	$(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \
 ))

-$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,URE, \
+$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,ure, \
 	acceptor \
 	binaryurp \
 	bootstrap \
@@ -505,7 +498,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 	$(if $(filter WNT,$(OS)),jpipx) \
 ))

-$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,OOO, \
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	comphelper \
 	deployment \
 	fileacc \

--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Module_add_targets,jvmfwk,\
    Package_jreproperties \
 ))

-ifneq ($(OS),MACOSX)
+ifneq (,$(filter-out MACOSX WNT,$(OS)))
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,jvmfwk,\
    Executable_javaldx \

--- a/scp2/AutoInstallLibs.mk
+++ b/scp2/AutoInstallLibs.mk
@@ -9,16 +9,16 @@

 $(eval $(call gb_AutoInstallLibs_AutoInstallLibs))

-$(eval $(call gb_AutoInstallLibs_add_category,base,BASE,LIBO_LIB_FILE,auto_Base_Lib))
-$(eval $(call gb_AutoInstallLibs_add_category,gnome,GNOME,LIBO_LIB_FILE,auto_Gnome_Lib))
-$(eval $(call gb_AutoInstallLibs_add_category,graphicfilter,GRAPHICFILTER,LIBO_LIB_FILE,auto_Graphicfilter_Lib))
-$(eval $(call gb_AutoInstallLibs_add_category,impress,IMPRESS,LIBO_LIB_FILE,auto_Impress_Lib))
-$(eval $(call gb_AutoInstallLibs_add_category,kde,KDE,LIBO_LIB_FILE,auto_Kde_Lib))
-$(eval $(call gb_AutoInstallLibs_add_category,math,MATH,LIBO_LIB_FILE,auto_Math_Lib))
-$(eval $(call gb_AutoInstallLibs_add_category,onlineupdate,ONLINEUPDATE,LIBO_LIB_FILE,auto_Onlineupdate_Lib))
-$(eval $(call gb_AutoInstallLibs_add_category,ooo,OOO,LIBO_LIB_FILE,auto_File_Lib))
-$(eval $(call gb_AutoInstallLibs_add_category,tde,TDE,LIBO_LIB_FILE,auto_Tde_Lib))
-$(eval $(call gb_AutoInstallLibs_add_category,ure,URE,URE_PRIVATE_LIB,auto_Ure_Private_Lib))
-$(eval $(call gb_AutoInstallLibs_add_category,writer,WRITER,LIBO_LIB_FILE,auto_Writer_Lib))
+$(eval $(call gb_AutoInstallLibs_add_module,base,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstallLibs_add_module,gnome,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstallLibs_add_module,graphicfilter,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstallLibs_add_module,impress,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstallLibs_add_module,kde,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstallLibs_add_module,math,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstallLibs_add_module,onlineupdate,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstallLibs_add_module,ooo,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstallLibs_add_module,tde,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstallLibs_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE))
+$(eval $(call gb_AutoInstallLibs_add_module,writer,LIBO_LIB_FILE))

 # vim: set noet sw=4 ts=4:
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -445,6 +445,14 @@ End
        Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \
    End

+#define URE_EXECUTABLE(id,name) \
+    File id \
+        BIN_FILE_BODY; \
+        Dir = gid_Dir_Ure_Bin; \
+        Name = name; \
+        Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \
+    End
+
 #define GALLERY_NAME(id) \

 #define GALLERY_FILELIST(id) \

--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -35,7 +35,7 @@ Module gid_Module_Prg_Base_Bin
    Minimal = NO;
    Default = YES;
    Styles = (HIDDEN_ROOT);
-    Files = (auto_Base_Lib_ALL
+    Files = (auto_base_ALL
        gid_File_Share_Registry_Base_Xcd
    );
 End

--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -29,7 +29,7 @@ Module gid_Module_Optional_Gnome
 #ifdef ENABLE_GNOMEVFS
    XpdCheckSolaris = "SUNWgnome-vfs";
 #endif
-    Files = (auto_Gnome_Lib_ALL
+    Files = (auto_gnome_ALL
 #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
      gid_File_Share_Registry_Gnome_Xcd,
 #endif

--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -26,6 +26,6 @@ Module gid_Module_Optional_Grfflt
    Sortkey = "600";
    ParentID = gid_Module_Optional;
    Default = YES;
-    Files = (auto_Graphicfilter_Lib_ALL
+    Files = (auto_graphicfilter_ALL
        gid_File_Share_Registry_Graphicfilter_Xcd);
 End
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -35,7 +35,7 @@ Module gid_Module_Prg_Impress_Bin
    Minimal = YES;
    Default = YES;
    Styles = (HIDDEN_ROOT);
-    Files = (auto_Impress_Lib_ALL
+    Files = (auto_impress_ALL
    gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,
    gid_File_Share_Registry_Impress_Xcd,
    gid_File_sd_xml,

--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -26,6 +26,6 @@ Module gid_Module_Optional_Kde
    PackageInfo = "packinfo_office.txt";
    MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
    Styles = ();
-    Files = (auto_Kde_Lib_ALL
+    Files = (auto_kde_ALL
    );
 End
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -35,7 +35,7 @@ Module gid_Module_Prg_Math_Bin
    Minimal = YES;
    Default = YES;
    Styles = (HIDDEN_ROOT);
-    Files = (auto_Math_Lib_ALL
+    Files = (auto_math_ALL
 	gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
    gid_File_Share_Registry_Math_Xcd,
    gid_File_Tmp_Userinstall_Math_Inf);

--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -27,7 +27,7 @@ Module gid_Module_Optional_Onlineupdate
    ParentID = gid_Module_Optional;
    Default = YES;
    Styles = ();
-    Files = (auto_Onlineupdate_Lib_ALL
+    Files = (auto_onlineupdate_ALL
             gid_File_Bin_UnpackUpdate,
             gid_File_Share_Registry_Onlineupdate_Xcd);
 End
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -143,7 +143,7 @@ Module gid_Module_Root_Files_4
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Dat_Root4,
-	auto_File_Lib_ALL
+	auto_ooo_ALL
 	gid_File_Lib_Bib,
 	gid_File_Lib_J,
 	gid_File_Lib_Oox,

--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -84,32 +84,6 @@ Shortcut gid_Shortcut_Exe_Uno
 End
 #endif

-File gid_File_Exe_Regmerge
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(regmerge);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "881BCC1D-BA4A-4527-9C7D-D89157C2D03B";
-End
-
-File gid_File_Exe_Regview
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(regview);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "DAB09DCD-8491-4DC8-B153-2BA81A830AC2";
-End
-
-#if !defined MACOSX && !defined WNT && defined SOLAR_JAVA
-File gid_File_Exe_Javaldx
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Ure_Bin;
-    Name = EXENAME(javaldx);
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1";
-End
-#endif
-
 // Private Executables:

 #if !defined WNT
@@ -643,13 +617,11 @@ Module gid_Module_Root_Ure_Hidden
            gid_Dir_Ure_Share,
            gid_Dir_Ure_Java,
            gid_Dir_Ure_Misc);
-    Files = (gid_File_ThirdpartylicensereadmeHtml_Ure,
+    Files = (auto_ure_ALL
+            gid_File_ThirdpartylicensereadmeHtml_Ure,
            gid_File_Readme_Ure,
            gid_File_License_Ure,
            gid_File_Exe_Uno,
-            gid_File_Exe_Regmerge,
-            gid_File_Exe_Regview,
-            gid_File_Exe_Javaldx,
            gid_File_Exe_StartupSh,
            gid_File_Exe_UnoBin,
            gid_File_Dl_Cli_Uno,
@@ -684,7 +656,6 @@ Module gid_Module_Root_Ure_Hidden
            gid_Unixlink_File_Dl_Store,
            gid_Unixlink_File_Dl_Jvmaccess,
            gid_Unixlink_File_Dl_Jvmfwk,
-            auto_Ure_Private_Lib_ALL
            gid_File_Dl_JrepropertiesClass,
            gid_File_Dl_Profile_Jvmfwk3rc,
            gid_File_Dl_Jpipe,

--- a/scp2/source/tde/module_tde.scp
+++ b/scp2/source/tde/module_tde.scp
@@ -19,7 +19,7 @@ Module gid_Module_Optional_Tde
    PackageInfo = "packinfo_office.txt";
    MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
    Styles = ();
-    Files = (auto_Tde_Lib_ALL
+    Files = (auto_tde_ALL
    );
 End

--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -37,7 +37,7 @@ Module gid_Module_Prg_Wrt_Bin
    Styles = (HIDDEN_ROOT);
    Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
    gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
-    auto_Writer_Lib_ALL
+    auto_writer_ALL
    gid_File_Lib_Vbaswobj,
    gid_File_Jar_Email, 
    gid_File_Jar_Mail, 

--- a/solenv/gbuild/AutoInstallLibs.mk
+++ b/solenv/gbuild/AutoInstallLibs.mk
@@ -12,15 +12,19 @@
 $(dir $(call gb_AutoInstallLibs_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))

-$(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk
-	$(call gb_Output_announce,$*,$(true),AIL,3)
-	echo "/* autogenerated library installs for group $(INSTALLMODULE) */" > $@
-	echo "#define $(SCP2ID)_ALL \ " >> $@
-	$(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
-		echo "    $(SCP2ID)_$(lib), \ " >> $@;)
+$(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoInstallLibs.mk
+	$(call gb_Output_announce,$*,$(true),AIN,3)
+	echo "/* autogenerated installs for group $* */" > $@
+	echo "#define auto_$*_ALL \ " >> $@
+	$(foreach lib,$(gb_Library_MODULE_$*),\
+		echo "    auto_$*_lib_$(lib), \ " >> $@;)
+	$(foreach exe,$(gb_Executable_MODULE_$*),\
+		echo "    auto_$*_exe_$(exe), \ " >> $@;)
 	echo "" >> $@
-	$(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
-		echo "$(SCP2TEMPLATE)($(SCP2ID)_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;)
+	$(foreach lib,$(gb_Library_MODULE_$*),\
+		echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;)
+	$(foreach exe,$(gb_Executable_MODULE_$*),\
+		echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(exe),$(exe)$(gb_Executable_EXT))" >> $@;)


 $(call gb_AutoInstallLibs_get_clean_target,%) :
@@ -35,16 +39,16 @@ $(call gb_Helper_make_userfriendly_targets,all,AutoInstallLibs)

 endef

-define gb_AutoInstallLibs_add_category
+# gb_AutoInstallLibs_add_module module lib_template optional:exe_template
+define gb_AutoInstallLibs_add_module
 $(call gb_AutoInstallLibs_get_target,all) : $(call gb_AutoInstallLibs_get_target,$(1))
 $(call gb_AutoInstallLibs_get_clean_target,all) : $(call gb_AutoInstallLibs_get_clean_target,$(1))
 $(call gb_Helper_make_userfriendly_targets,$(1),AutoInstallLibs)

 $(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 $(call gb_AutoInstallLibs_get_target,$(1)) :| $(dir $(call gb_AutoInstallLibs_get_target,$(1))).dir
-$(call gb_AutoInstallLibs_get_target,$(1)) : INSTALLMODULE = $(2)
-$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2TEMPLATE = $(3)
-$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2ID = $(4)
+$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2LIBTEMPLATE := $(2)
+$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2EXETEMPLATE := $(3)

 endef


--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -109,7 +109,6 @@ endef
 define gb_Helper_init_registries
 gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
 gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := BASE ONLINEUPDATE GRAPHICFILTER GNOME TDE IMPRESS KDE MATH OOO URE WRITER
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE

 $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=))
@@ -148,6 +147,13 @@ gb_Executable_$(1) += $(2)

 endef

+define gb_Helper_register_executables_for_install
+$(call gb_Helper_register_executables,$(1),$(3))
+
+gb_Executable_MODULE_$(2) += $(3)
+
+endef
+
 define gb_Helper_register_libraries
 ifeq ($$(filter $(1),$$(gb_Library_VALIDGROUPS)),)
 $$(eval $$(call gb_Output_error,$(1) is not a valid group for libraries. Valid groups are: $$(gb_Library_VALIDGROUPS)))
@@ -166,9 +172,6 @@ endef
 # the first argument is the group, which sets rpaths etc.
 # the second argument is the install module, which describes in which distro package/msi a lib should show up
 define gb_Helper_register_libraries_for_install
-ifeq ($$(filter $(2),$$(gb_Library_VALIDINSTALLMODULES)),)
-$$(eval $$(call gb_Output_error,$(2) is not a valid install module for libraries. Valid groups are: $$(gb_Library_VALIDINSTALLMODULES)))
-endif
 $(call gb_Helper_register_libraries,$(1),$(3))

 gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(3))