From ba6989df7dffb4fd2c62dbb9f5b1c9b000b4abdd Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 10 Apr 2013 13:53:12 +0200
Subject: just use explicit list of files

IMHO it does not make much sense to dynamically generate a list that is
practically unchanging.

Change-Id: If5898956d11b9f410cf36d1ebe5535194365a954
---
 sysui/Zip_osxicons.mk              | 26 +++++++++++--
 sysui/desktop/macosx/list_icons.pl | 75 --------------------------------------
 2 files changed, 23 insertions(+), 78 deletions(-)
 delete mode 100644 sysui/desktop/macosx/list_icons.pl

(limited to 'sysui')

diff --git a/sysui/Zip_osxicons.mk b/sysui/Zip_osxicons.mk
index 1f735216dec7..d9c19019df0b 100644
--- a/sysui/Zip_osxicons.mk
+++ b/sysui/Zip_osxicons.mk
@@ -7,12 +7,32 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-osxicons_LIST := $(shell $(PERL) -w $(SRCDIR)/sysui/desktop/macosx/list_icons.pl < $(SRCDIR)/sysui/desktop/macosx/Info.plist)
-
 $(eval $(call gb_Zip_Zip,osxicons,$(SRCDIR)/sysui/desktop))
 
 $(eval $(call gb_Zip_add_files,osxicons,\
-	$(addprefix icons/,$(osxicons_LIST)) \
+    icons/text.icns \
+    icons/oasis-text.icns \
+    icons/spreadsheet.icns \
+    icons/oasis-spreadsheet.icns \
+    icons/presentation.icns \
+    icons/oasis-presentation.icns \
+    icons/drawing.icns \
+    icons/oasis-drawing.icns \
+    icons/master-document.icns \
+    icons/oasis-master-document.icns \
+    icons/formula.icns \
+    icons/oasis-formula.icns \
+    icons/text-template.icns \
+    icons/oasis-text-template.icns \
+    icons/spreadsheet-template.icns \
+    icons/oasis-spreadsheet-template.icns \
+    icons/presentation-template.icns \
+    icons/oasis-presentation-template.icns \
+    icons/drawing-template.icns \
+    icons/oasis-drawing-template.icns \
+    icons/oasis-database.icns \
+    icons/extension.icns \
+    icons/main.icns \
 	macosx/Info.plist \
 ))
 
diff --git a/sysui/desktop/macosx/list_icons.pl b/sysui/desktop/macosx/list_icons.pl
deleted file mode 100644
index 046c979b039f..000000000000
--- a/sysui/desktop/macosx/list_icons.pl
+++ /dev/null
@@ -1,75 +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 .
-#
-
-use warnings;
-use strict 'vars';
-
-# package all .icns if XML::Parser module is not installed
-eval 'use XML::Parser;'; if ( $@ ) { print '*.icns'; exit 0; };
-
-my $valuetype = "none";
-my $key = "none";
-
-#
-# XML handlers
-#
-
-sub start_handler {
-  my ($parser,$element,%attributes) = @_;
-  $valuetype = "$element";
-}
-
-sub char_handler {
-  my ($parser,$string) = @_;
-  if ( $key eq "CFBundleTypeIconFile" || $key eq "CFBundleIconFile" ) {
-    $string =~ s/^\s+//;
-    $string =~ s/\s+$//;
-    print "$string " if length($string) > 0;
-  }
-  $key = "$string" if $valuetype eq "key";
-}
-
-sub default_handler {
-  my ($parser,$string) = @_;
-}
-
-sub end_handler {
-  my ($parser,$element) = @_;
-
-  $key = "none" if $valuetype ne "key";
-  $valuetype = "none";
-}
-
-#
-# main
-#
-
-my $parser = new XML::Parser(ErrorContext => 2,
-                             Namespaces => 1);
-
-$parser->setHandlers( Start => \&start_handler,
-                      End => \&end_handler,
-                      Char => \&char_handler,
-                      Default => \&default_handler);
-$parser->parse(STDIN);
-
-print "\n";
-- 
cgit