[Libreoffice-commits] core.git: 3 commits - odk/CustomTarget_doxygen.mk sysui/CustomTarget_rpm.mk sysui/desktop

[David Tardon]

 odk/CustomTarget_doxygen.mk            |    2 -
 sysui/CustomTarget_rpm.mk              |   34 +++++++++++++++++++--------------
 sysui/desktop/share/create_mime_xml.pl |    1 
 sysui/desktop/share/create_tree.sh     |    2 -
 sysui/desktop/share/translate.pl       |    1 
 5 files changed, 21 insertions(+), 19 deletions(-)

New commits:
commit 29c8b9a7c9a4d62b7df2e70b71beec488aae5722
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Mar 3 16:23:23 2013 +0100

    silence rpmbuild
    
    Change-Id: Iee5fbadb4eafb1c919bfcef7799e2e81ca3438d8

diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk
index 8d6c433..cd9b3d1 100644
--- a/sysui/CustomTarget_rpm.mk
+++ b/sysui/CustomTarget_rpm.mk
@@ -16,20 +16,26 @@ define rpm_register_target
 $(call gb_CustomTarget_get_target,sysui/rpm): $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm
 
 $(rpm_WORKDIR)/$(1)-desktop-integration.tar.gz: $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm
-$(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm: $(rpm_SRCDIR)/$(2)/$(2)-menus.spec $(call gb_CustomTarget_get_workdir,sysui/share)/$(1)/create_tree.sh
-	$(RPM) -bb $$< \
-	--buildroot $(rpm_WORKDIR)/$(1)/$(2) \
-	--define "_builddir $(call gb_CustomTarget_get_workdir,sysui/share)/$(1)" \
-	--define "_rpmdir $(rpm_WORKDIR)/$(1)" \
-	--define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
-	--define "productname $(PRODUCTNAME.$(1))" \
-	--define "pkgprefix $(1)$(PKGVERSIONSHORT)" \
-	--define "unixfilename $(UNIXFILENAME.$(1))" \
-	--define "productversion $(PRODUCTVERSION)" \
-	--define "iconprefix $(UNIXFILENAME.$(1))" \
-	--define "version $(PKGVERSION)" \
-	--define "release $(LIBO_VERSION_PATCH)" \
-	--define "__debug_install_post %nil"
+$(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm : \
+		$(rpm_SRCDIR)/$(2)/$(2)-menus.spec \
+		$(call gb_CustomTarget_get_workdir,sysui/share)/$(1)/create_tree.sh \
+		| $(rpm_WORKDIR)/$(1)/.dir
+	$(call gb_Helper_print_on_error,\
+		$(RPM) -bb $$< \
+			--buildroot $(rpm_WORKDIR)/$(1)/$(2) \
+			--define "_builddir $(call gb_CustomTarget_get_workdir,sysui/share)/$(1)" \
+			--define "_rpmdir $(rpm_WORKDIR)/$(1)" \
+			--define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
+			--define "productname $(PRODUCTNAME.$(1))" \
+			--define "pkgprefix $(1)$(PKGVERSIONSHORT)" \
+			--define "unixfilename $(UNIXFILENAME.$(1))" \
+			--define "productversion $(PRODUCTVERSION)" \
+			--define "iconprefix $(UNIXFILENAME.$(1))" \
+			--define "version $(PKGVERSION)" \
+			--define "release $(LIBO_VERSION_PATCH)" \
+			--define "__debug_install_post %nil" \
+		, $$@.log \
+	)
 endef
 
 $(eval $(call gb_CustomTarget_CustomTarget,sysui/rpm))
commit 4745b6edcd710204758ceb35dfc0ff78c391810b
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Mar 3 15:57:30 2013 +0100

    silence sysui scripts
    
    Change-Id: I0d27e522ff8059200f9d08a28f4b70d7f436c100

diff --git a/sysui/desktop/share/create_mime_xml.pl b/sysui/desktop/share/create_mime_xml.pl
index 912af3e..bda127c 100755
--- a/sysui/desktop/share/create_mime_xml.pl
+++ b/sysui/desktop/share/create_mime_xml.pl
@@ -56,7 +56,6 @@ print '<?xml version="1.0" encoding="UTF-8"?>';
 print '<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">';
 
 foreach $component (sort(keys %mimehash)) {
-    print STDERR "Processing entries for $component";
     # mimetype and glob
     getMimedata($component);
     print '  <mime-type type="'.$mimetype.'">';
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index b7cc385..606f1a5 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -19,7 +19,6 @@
 umask 022
 
 if [ "${KDEMAINDIR}" ]; then
-  echo "Copying icons..."
   for i in `cd "${ICON_SOURCE_DIR}"; find ${ICON_THEMES:-hicolor/???x??? hicolor/??x?? hicolor/scalable locolor} -name "*.png" -o -name "*.svg"`
   do
     targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname ${i}`
@@ -38,7 +37,6 @@ if [ "${KDEMAINDIR}" ]; then
 fi
 
 if [ "${GNOMEDIR}" ]; then
-  echo "Copying GNOME icons..."
   for i in `cd "${ICON_SOURCE_DIR}/hicolor"; find ??x?? ???x??? scalable -name "*.png" -o -name "*.svg"`
   do
     targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname ${i}`
diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index 9bb60f2..48742b7 100644
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
@@ -105,7 +105,6 @@ close(SOURCE);
 # process templates
 foreach $template (keys %templates) {
     my $outfile = $templates{$template}->{'outfile'};
-    print "processing template $template in $outfile\n";
 
     # open the template file - ignore sections for which no
     # templates exist
commit 310fb291ccfb817a3503785af143828682c0c1f1
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Mar 3 15:45:25 2013 +0100

    silence doxygen
    
    Change-Id: I8114c6ab7a70572ed530800a4fbc323efaa1a641

diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index a01f519..7c4571a 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -51,6 +51,6 @@ $(odk_WORKDIR)/docs/cpp/ref/index.html: $(DOXY_DEPS)
         -e 's!^QUIET = %$$!QUIET = $(if $(VERBOSE),YES,NO)!' \
         -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(DOXY_STRIP_PATH)!' \
 	$< > $(odk_WORKDIR)/Doxyfile
-	$(DOXYGEN) $(odk_WORKDIR)/Doxyfile
+	$(DOXYGEN) $(odk_WORKDIR)/Doxyfile > /dev/null
 
 # vim: set noet sw=4 ts=4: