[Libreoffice-commits] core.git: 3 commits - Repository.mk scp2/AutoInstall.mk scp2/InstallModule_ooo.mk scp2/source solenv/gbuild vcl/unx
Michael Stahl
mstahl at redhat.com
Fri Jul 18 08:56:01 PDT 2014
Repository.mk | 5 ++++-
scp2/AutoInstall.mk | 1 +
scp2/InstallModule_ooo.mk | 1 +
scp2/source/ooo/module_pdfimport.scp | 9 ++++-----
solenv/gbuild/UIConfig.mk | 4 ++--
solenv/gbuild/Zip.mk | 20 +++++++++++++-------
solenv/gbuild/empty.zip |binary
vcl/unx/kde4/tst_exclude_posted_events.hxx | 2 +-
vcl/unx/kde4/tst_exclude_socket_notifiers.hxx | 2 +-
9 files changed, 27 insertions(+), 17 deletions(-)
New commits:
commit baefe3a7251c25c7b5c83c7e75dc79970d6bbfc0
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 18 17:47:43 2014 +0200
gbuild: fix build of installation set with missing .ui translations
As demonstrated by commit b875362cd576b29aee4da899335b8d8f6c74d192,
scp2 will reference all languages' UIConfig zip file, but gbuild only
builds those that have existing input files from translations;
tweak UIConfig class to always build a zip file, and the Zip command to
work with no inputs as well, which requires a little hack.
Change-Id: If6dbb07aa856c94802b9abdcaa20ba03e59d37fa
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 7fdb7e1..0946925 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -225,6 +225,8 @@ $(call gb_Postprocess_register_target,AllUIConfigs,UIConfig,$(1))
endef
define gb_UIConfig__UIConfig_for_lang
+$(call gb_UIConfig_get_target,$(1)) : $(call gb_Zip_get_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2)))
+$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2)))
$(call gb_Zip_Zip_internal,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR)/$(1))
$(call gb_Zip_add_commandoptions,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2)),--suffixes .ui)
$(call gb_Zip_get_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2))) : $(SRCDIR)/solenv/gbuild/UIConfig.mk
@@ -258,8 +260,6 @@ endef
#
# gb_UIConfig__add_uifile_for_lang target file lang
define gb_UIConfig__add_uifile_for_lang
-$(call gb_UIConfig_get_target,$(1)) : $(call gb_Zip_get_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(3)))
-$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(3)))
$(call gb_Zip_add_file,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(3)),$(notdir $(2))/$(3).ui)
$(call gb_Zip_add_dependency,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(3)),$(call gb_UILocalizeTarget_get_target,$(1)/$(notdir $(2))))
$(call gb_Zip_set_install_name,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(3)),$(INSTROOT)/$(gb_UIConfig_INSTDIR)/$(1)/ui/res/$(3).zip)
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index a675766..b8f76d9 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -40,16 +40,22 @@ $(dir $(call gb_Zip_get_target,%))%/.dir :
# rule to create zip package in workdir
# --filesync makes sure that all files in the zip package will be removed that no longer are in $(FILES)
+# if there are no files, zip fails; copy empty zip file to target in that case
$(call gb_Zip_get_target,%) :
$(call gb_Output_announce,$*,$(true),ZIP,3)
- $(if $(FILES),$(call gb_Helper_abbreviate_dirs,\
- RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
+ $(call gb_Helper_abbreviate_dirs,\
+ $(if $(FILES),\
+ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
$(FILES)) && \
- cd $(LOCATION) && cat $${RESPONSEFILE} | tr "[:space:]" "\n" | $(gb_Zip_ZIPCOMMAND) - at rX --filesync --must-match $(call gb_Zip_get_target,$*) && \
- rm -f $${RESPONSEFILE} && \
- touch $@ \
- $(if $(INSTALL_NAME),&& cp $(call gb_Zip_get_target,$*) $(INSTALL_NAME)) \
- ))
+ cd $(LOCATION) && \
+ cat $${RESPONSEFILE} | tr "[:space:]" "\n" | \
+ $(gb_Zip_ZIPCOMMAND) - at rX --filesync --must-match \
+ $(call gb_Zip_get_target,$*) && \
+ rm -f $${RESPONSEFILE} && \
+ touch $@\
+ , cp $(SRCDIR)/solenv/gbuild/empty.zip $@)\
+ $(if $(INSTALL_NAME),&& cp $(call gb_Zip_get_target,$*) $(INSTALL_NAME)) \
+ )
# the preparation target is here to ensure proper ordering of actions in cases
# when we want to, e.g., create a zip from files created by a custom target
diff --git a/solenv/gbuild/empty.zip b/solenv/gbuild/empty.zip
new file mode 100644
index 0000000..15cb0ec
Binary files /dev/null and b/solenv/gbuild/empty.zip differ
commit 80583d1c6dbca9e3f8fd49588be3d888f9c6083b
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 18 16:57:02 2014 +0200
scp2: move pdfimport library to AutoInstall
Change-Id: Iac7d30ea181edbc479034e7b6f8eea285d7f6fbb
diff --git a/Repository.mk b/Repository.mk
index 53d124b..60d86f4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -457,6 +457,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
unowinreg \
))
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,reportbuilder, \
+ pdfimport \
+))
+
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
affine_uno_uno \
$(if $(filter MSC,$(COM)),cli_uno) \
@@ -629,7 +633,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
OGLTrans \
- pdfimport \
postgresql-sdbc \
postgresql-sdbc-impl \
pythonloader \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 744c6cf..0e0bf53 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -29,5 +29,6 @@ $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,xpdfimport,LIBO_LIB_FILE))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index f8f5a02..0a4b83e4 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
ooo \
ooobinarytable \
reportbuilder \
+ xpdfimport \
))
$(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
diff --git a/scp2/source/ooo/module_pdfimport.scp b/scp2/source/ooo/module_pdfimport.scp
index 306ccc3..2b81713 100644
--- a/scp2/source/ooo/module_pdfimport.scp
+++ b/scp2/source/ooo/module_pdfimport.scp
@@ -25,6 +25,8 @@
#include "macros.inc"
+#include "AutoInstall/pdfimport"
+
Module gid_Module_Pdfimport
Name = "PDF Import";
Description = "PDF Import";
@@ -32,10 +34,9 @@ Module gid_Module_Pdfimport
ParentID = gid_Module_Root_Brand;
Styles = (HIDDEN_ROOT);
Dirs = (gid_Dir_Share_Xpdfimport);
- Files = (
+ Files = (auto_pdfimport_ALL,
gid_File_Dat_XpdfimportErrPdf,
gid_File_Exe_Xpdfimport,
- gid_File_Lib_PdfimportUno,
gid_File_Xcd_Pdfimport);
End
@@ -58,9 +59,7 @@ File gid_File_Exe_Xpdfimport
Styles = (PACKED);
End
-STD_LIB_FILE( gid_File_Lib_PdfimportUno, pdfimport )
-
-File gid_File_Xcd_Pdfimport
+rile gid_File_Xcd_Pdfimport
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Share_Registry;
Name = "pdfimport.xcd";
commit 1f2c47cf7d730ffc684d637c74d8a38afcf30aed
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jul 18 16:31:02 2014 +0200
vcl: kde4: [loplugin:saloverride]
Change-Id: I215a53b468710ce26d2729880f3dd9fcd27a30da
diff --git a/vcl/unx/kde4/tst_exclude_posted_events.hxx b/vcl/unx/kde4/tst_exclude_posted_events.hxx
index 7127505..656c8a6 100644
--- a/vcl/unx/kde4/tst_exclude_posted_events.hxx
+++ b/vcl/unx/kde4/tst_exclude_posted_events.hxx
@@ -35,7 +35,7 @@ class TestExcludePostedEvents
Q_OBJECT
public:
TestExcludePostedEvents();
- virtual bool event( QEvent* e );
+ virtual bool event( QEvent* e ) SAL_OVERRIDE;
bool processed;
};
diff --git a/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx b/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx
index acf4d36..5e7843f 100644
--- a/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx
+++ b/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx
@@ -35,7 +35,7 @@ class TestExcludeSocketNotifiers
Q_OBJECT
public:
TestExcludeSocketNotifiers( const int* pipes );
- ~TestExcludeSocketNotifiers();
+ virtual ~TestExcludeSocketNotifiers();
bool received;
public slots:
void slotReceived();
More information about the Libreoffice-commits
mailing list