[Libreoffice-commits] core.git: scp2/source solenv/gbuild
David Tardon
dtardon at redhat.com
Thu Jul 11 06:47:38 PDT 2013
scp2/source/base/module_base.scp | 2 +-
scp2/source/calc/module_calc.scp | 2 +-
scp2/source/gnome/module_gnome.scp | 2 +-
scp2/source/graphicfilter/module_graphicfilter.scp | 2 +-
scp2/source/impress/module_impress.scp | 2 +-
scp2/source/kde/module_kde.scp | 3 +--
scp2/source/math/module_math.scp | 2 +-
scp2/source/onlineupdate/module_onlineupdate.scp | 2 +-
scp2/source/ooo/module_hidden_ooo.scp | 2 +-
scp2/source/ooo/ure.scp | 2 +-
scp2/source/tde/module_tde.scp | 3 +--
scp2/source/writer/module_writer.scp | 2 +-
solenv/gbuild/AutoInstall.mk | 16 ++++++++++------
13 files changed, 22 insertions(+), 20 deletions(-)
New commits:
commit bd3aa6983796f9dedf85c446a0ce5e5505583809
Author: David Tardon <dtardon at redhat.com>
Date: Thu Jul 11 12:23:39 2013 +0200
fdo#66072 do not end auto_*_ALL by a comma
Change-Id: I7d0fbe865cd10d0a3ef690e521d4752d6d7f3939
Reviewed-on: https://gerrit.libreoffice.org/4829
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index 4dfd886..7a46408 100644
--- 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_ALL
+ Files = (auto_base_ALL,
gid_File_Share_Registry_Base_Xcd
);
End
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 35aafdf..191577a 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -35,7 +35,7 @@ Module gid_Module_Prg_Calc_Bin
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (auto_calc_ALL
+ Files = (auto_calc_ALL,
gid_File_Share_Registry_Calc_Xcd,
gid_File_Lib_Lpsolve);
End
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 2b45bb1..57a05c4 100644
--- 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_ALL
+ Files = (auto_gnome_ALL,
#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
gid_File_Share_Registry_Gnome_Xcd,
#endif
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index 88ab156..47031d1 100644
--- 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_ALL
+ Files = (auto_graphicfilter_ALL,
gid_File_Share_Registry_Graphicfilter_Xcd);
End
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index ebf90a2..d4ef187 100644
--- 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_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,
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index c82a094..6fa6155 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -26,6 +26,5 @@ Module gid_Module_Optional_Kde
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
Styles = ();
- Files = (auto_kde_ALL
- );
+ Files = (auto_kde_ALL);
End
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index 0c01f98..d433178 100644
--- 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_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);
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp
index ecd0cda..a2afd3a 100644
--- 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_ALL
+ Files = (auto_onlineupdate_ALL,
gid_File_Bin_UnpackUpdate,
gid_File_Share_Registry_Onlineupdate_Xcd);
End
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index b561a57..fd1f892 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -140,7 +140,7 @@ Module gid_Module_Root_Files_4
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Dat_Root4,
- auto_ooo_ALL
+ auto_ooo_ALL,
gid_File_Lib_Bib,
gid_File_Lib_J,
gid_File_Lib_Oox,
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 417b376..0ce9a73 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -598,7 +598,7 @@ Module gid_Module_Root_Ure_Hidden
gid_Dir_Ure_Share,
gid_Dir_Ure_Java,
gid_Dir_Ure_Misc);
- Files = (auto_ure_ALL
+ Files = (auto_ure_ALL,
gid_File_ThirdpartylicensereadmeHtml_Ure,
gid_File_Readme_Ure,
gid_File_License_Ure,
diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
index 03138fe..24725de 100644
--- a/scp2/source/tde/module_tde.scp
+++ b/scp2/source/tde/module_tde.scp
@@ -19,7 +19,6 @@ Module gid_Module_Optional_Tde
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
Styles = ();
- Files = (auto_tde_ALL
- );
+ Files = (auto_tde_ALL);
End
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 6ffc167..7fe2210 100644
--- 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_ALL
+ auto_writer_ALL,
gid_File_Jar_Email,
gid_File_Jar_Mail,
gid_File_Jar_Activation,
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 6187199..6494c64 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -9,18 +9,22 @@
# AutoInstall class
+define gb_AutoInstall__make_define
+echo "#define auto_$*_ALL \ " >> $@
+$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo " $(binary), \ " >> $@;)
+echo " $(lastword $(1))" >> $@;
+echo "" >> $@
+endef
+
$(dir $(call gb_AutoInstall_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoInstall.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 "" >> $@
+ $(call gb_AutoInstall__make_define,\
+ $(foreach lib,$(gb_Library_MODULE_$*),auto_$*_lib_$(lib)) \
+ $(foreach exe,$(gb_Executable_MODULE_$*),auto_$*_exe_$(exe)))
$(foreach lib,$(gb_Library_MODULE_$*),\
echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;)
$(foreach exe,$(gb_Executable_MODULE_$*),\
More information about the Libreoffice-commits
mailing list