[Libreoffice-commits] core.git: 2 commits - postprocess/CustomTarget_images.mk solenv/bin

[David Tardon]

 postprocess/CustomTarget_images.mk |    4 --
 solenv/bin/diffmv.pl               |   67 -------------------------------------
 2 files changed, 1 insertion(+), 70 deletions(-)

New commits:
commit 82f93bff42c0ce3b138ca61040c964f42632d000
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jun 6 21:48:32 2016 +0200

    use smaller hammer
    
    Change-Id: I97c7cd945806265e1d447744d1b0531f14d637a6

diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index f8d446d..333e994 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -58,8 +58,7 @@ $(packimages_DIR)/commandimagelist.ilst :
 			grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | $(SORT) | uniq | \
 			sed "s#^#%MODULE%#" | \
 			LC_ALL=C $(SORT) > $@.tmp && \
-		$(PERL) $(SRCDIR)/solenv/bin/diffmv.pl $@.tmp $@ \
-			$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
+		$(call gb_Helper_replace_if_different_and_touch,$@.tmp,$@))
 
 $(packimages_DIR)/sorted.lst : \
 		$(SRCDIR)/postprocess/packimages/image-sort.lst \
diff --git a/solenv/bin/diffmv.pl b/solenv/bin/diffmv.pl
deleted file mode 100644
index 2563689..0000000
--- a/solenv/bin/diffmv.pl
+++ /dev/null
@@ -1,67 +0,0 @@
-:
-    eval 'exec perl -S $0 ${1+"$@"}'
-        if 0;
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-
-my ( $srcfile, $destfile ) = @ARGV;
-my ( @srclines, @destlines );
-my $dest_existing = 0;
- at destlines = ();
-
-usage() if ( ! defined $srcfile || ! defined $destfile);
-
-open(SRCFILE, "$srcfile") or die "ERROR: Can't open $srcfile\n";
- at srclines = <SRCFILE>;
-close SRCFILE;
-
-if ( -f $destfile ) {
-    open(DESTFILE, "$destfile") or die "ERROR: Can't open $destfile\n";
-    @destlines = <DESTFILE>;
-    close DESTFILE;
-    $dest_existing = 1;
-}
-
-if ( ! check_if_lists_equal(\@srclines,  \@destlines) ) {
-    print STDERR "Updating \"$destfile\".\n";
-    unlink "$destfile" or die "ERROR: Can't remove old $destfile\n" if ( $dest_existing );
-    rename "$srcfile", "$destfile" or die "ERROR: Can't rename $srcfile to $destfile\n";
-} else {
-    print STDERR "\"$destfile\" unchanged.\n";
-}
-
-sub check_if_lists_equal
-{
-    my  ( $srclist_ref, $destlist_ref ) = @_;
-    my @srclist  = @{ $srclist_ref };
-    my @destlist  = @{ $destlist_ref };
-    return  0 if ( $#srclist != $#destlist );
-    for ( my $i = 0; $i  < $#srclist; $i++ ) {
-        return 0 if  ( $srclist[$i] ne $destlist[$i]);
-    }
-    return  1;
-}
-
-sub usage
-{
-    print STDERR "Usage: diffmv sourcefile destfile\n";
-    print STDERR "Do move diffing file only\n";
-    exit 1;
-}
-
commit 0df28a3702edb89d1214e65af190394a737bc8d6
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Jun 4 14:42:23 2016 +0200

    there is no image list in firebird
    
    Change-Id: Ic7060ae60b5f11220c922da2ce7fc3183fdf2f61

diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index d86b600..f8d446d 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -45,7 +45,6 @@ $(packimages_DIR)/%.zip : \
 			-l $(dir $(call gb_UIConfig_get_imagelist_target)) \
 			-l $(dir $(call gb_UIConfig_get_imagelist_target,modules/)) \
 			$(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \
-			$(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_FIREBIRD_SDBC),-l $(SRCDIR)/connectivity/source/drivers/firebird)) \
 			-s $< -o $@ \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))