sc/util/createExtPackage.pl | 58 ----------------------------
sysui/Zip_osxicons.mk | 26 +++++++++++-
sysui/desktop/macosx/list_icons.pl | 75 -------------------------------------
3 files changed, 23 insertions(+), 136 deletions(-)
New commits:
commit ba6989df7dffb4fd2c62dbb9f5b1c9b000b4abdd
Author: David Tardon <dtar...@redhat.com>
Date: Wed Apr 10 13:53:12 2013 +0200
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
diff --git a/sysui/Zip_osxicons.mk b/sysui/Zip_osxicons.mk
index 1f73521..d9c1901 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 046c979..0000000
--- 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";
commit d5d69702a5ecfdeb41236ef0ff30397f843b0cb5
Author: David Tardon <dtar...@redhat.com>
Date: Wed Apr 10 07:08:43 2013 +0200
drop unused script
Change-Id: I892d2856c28536a7828c292c8fb3cd8b30fe8ecb
diff --git a/sc/util/createExtPackage.pl b/sc/util/createExtPackage.pl
deleted file mode 100644
index b42fc84..0000000
--- a/sc/util/createExtPackage.pl
+++ /dev/null
@@ -1,58 +0,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 Archive::Zip qw(:ERROR_CODES);
-use File::Basename;
-
-my $zipName = shift || die 'must provide a ext name';
-my $rdbName = shift || die 'must provide a types library';
-my $libName = shift || die 'must provide a component library';
-
-die "can't access type library $rdbName" unless -f $rdbName;
-die "can't access component library $libName" unless -f $libName;
-
-# Read the zip
-my $zip = Archive::Zip->new();
-
-if ( -f $zipName )
-{
- # be stupid and recreate zip every time
- # in another iteration lets try to overwrite it instead
- my $result = 0;
- $result = unlink($zipName);
- if ( result != 0 )
- {
- die 'can not delete old extension';
- }
-}
-my $rdb = basename( $rdbName );
-my $lib = basename( $libName );
-
-my $content2 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-$content2 .= "<!DOCTYPE manifest:manifest PUBLIC \"-//OpenOffice.org//DTD
Manifest 1.0//EN\" \"Manifest.dtd\">\n";
-$content2 .= "<manifest:manifest
xmlns:manifest=\"http://openoffice.org/2001/manifest\";>\n";
-$content2 .= " <manifest:file-entry
manifest:media-type=\"application/vnd.sun.star.uno-typelibrary;type=RDB\"
manifest:full-path=\"$rdb\"/>\n";
-$content2 .= " <manifest:file-entry
manifest:media-type=\"application/vnd.sun.star.uno-component;type=native\"
manifest:full-path=\"$lib\"/>\n";
-$content2 .= "</manifest:manifest>\n";
-
-$zip->addFile( $rdbName, $rdb );
-$zip->addFile( $libName, $lib );
-$zip->addDirectory( "META-INF" );
-$zip->addFile( "META-INF/manifest.xml", "manifest.xml" );
-$zip->addString( $content2, "META-INF/manifest.xml" );
-exit( $zip->writeToFileNamed($zipName) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
