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

[Bjoern Michaelsen]

 postprocess/CustomTarget_images.mk |    2 -
 solenv/bin/sort.pl                 |   41 -------------------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)

New commits:
commit bc45700b1b8a0579502e09b3a7d6ec4c0c96dc8b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Aug 21 17:35:48 2013 +0200

    remove superfluous sort.pl
    
    Change-Id: I5d182aa00c4c0488edb52633392f6747772b7176

diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 8c2963d..541941c 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -61,7 +61,7 @@ $(packimages_DIR)/commandimagelist.ilst :
 	$(call gb_Helper_abbreviate_dirs, \
 		find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \
 			sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \
-			$(PERL) $(SOLARENV)/bin/sort.pl > $@.$(INPATH) && \
+			LC_ALL=C sort > $@.$(INPATH) && \
 		$(PERL) $(SOLARENV)/bin/diffmv.pl $@.$(INPATH) $@ \
 			$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
 
diff --git a/solenv/bin/sort.pl b/solenv/bin/sort.pl
deleted file mode 100644
index 01d2cd1..0000000
--- a/solenv/bin/sort.pl
+++ /dev/null
@@ -1,41 +0,0 @@
-:
-eval 'exec perl -wS $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 .
-#
-
-#
-# sort.pl - Simply sort the input from stdin and pipe it to stdout.
-#           The sort needs to be *independent* of the settings of
-#           LC_ALL resp. LC_COLLATE
-#
-
-use strict;
-# be explicit: we want the perl standard sorting regardless the locale
-no locale;
-
-
-my @buffer;
-
-while(<>) {
-    push(@buffer, $_);
-}
-
-foreach (sort @buffer) {
-    print $_;
-}