[Libreoffice-commits] .: 2 commits - sdext/source solenv/bin solenv/inc
Andras Timar
timar at kemper.freedesktop.org
Fri Dec 9 00:23:16 PST 2011
sdext/source/presenter/makefile.mk | 41 ----------
solenv/bin/transform_description.pl | 138 ------------------------------------
solenv/inc/extension_post.mk | 69 ------------------
3 files changed, 2 insertions(+), 246 deletions(-)
New commits:
commit 567e4ba27300f5d38775a5f8c7ba8fd01163df35
Author: Andras Timar <atimar at suse.com>
Date: Fri Dec 9 09:22:52 2011 +0100
we don't pack runtime with internal extensions
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index a0d8d0f..fd95093 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -311,47 +311,6 @@ $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
$(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
@-$(MKDIRHIER) $(@:d)
+$(COPY) $< $@
-.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
- .IF "$(COM)"=="GCC"
- $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR)
- .ELSE
- .IF "$(PACKMS)"!=""
- .IF "$(CCNUMVER)" <= "001399999999"
- $(GNUCOPY) $(PACKMS)$/msvcr71.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/msvcp71.dll $(ZIP1DIR)
- .ELSE
- .IF "$(CCNUMVER)" <= "001499999999"
- $(GNUCOPY) $(PACKMS)$/msvcr80.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/msvcp80.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/msvcm80.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/Microsoft.VC80.CRT.manifest $(ZIP1DIR)
- .ELSE
- $(GNUCOPY) $(PACKMS)$/msvcr90.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/msvcp90.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/msvcm90.dll $(ZIP1DIR)
- $(GNUCOPY) $(PACKMS)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR)
- .ENDIF
- .ENDIF
- .ELSE # "$(PACKMS)"!=""
- .IF "$(CCNUMVER)" <= "001399999999"
- $(GNUCOPY) $(SOLARBINDIR)$/msvcr71.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/msvcp71.dll $(ZIP1DIR)
- .ELSE
- .IF "$(CCNUMVER)" <= "001499999999"
- $(GNUCOPY) $(SOLARBINDIR)$/msvcr80.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/msvcp80.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/msvcm80.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC80.CRT.manifest $(ZIP1DIR)
- .ELSE
- $(GNUCOPY) $(SOLARBINDIR)$/msvcr90.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/msvcp90.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/msvcm90.dll $(ZIP1DIR)
- $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR)
- .ENDIF
- .ENDIF
- .ENDIF # "$(PACKMS)"!=""
- .ENDIF #"$(COM)"=="GCC"
-.ENDIF #"$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 90e5529..20b8682 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -65,74 +65,12 @@ $(COMPONENT_JARFILES) : $(CLASSDIR)/$$(@:f)
.ENDIF # "$(COMPONENT_JARFILES)"!=""
.IF "$(COMPONENT_LIBRARIES)"!=""
-PACK_RUNTIME!:=TRUE
# TODO(Q3): strip the binary?
$(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COMMAND_ECHO)$(COPY) $< $@
.ENDIF # "$(COMPONENT_LIBRARIES)"!=""
-.IF "$(PACK_RUNTIME)"!=""
-PACK_RUNTIME_FLAG:=$(MISC)/$(TARGET)_pack_runtime.flag
-.IF "$(depend)" == ""
-$(EXTENSION_TARGET) : $(PACK_RUNTIME_FLAG)
-.END
-
-$(EXTENSIONDIR) :
- @@-$(MKDIRHIER) $(@:d)
-
-$(PACK_RUNTIME_FLAG) : $(EXTENSIONDIR)
- @@-$(MKDIRHIER) $(@:d)
-.IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
-.IF "$(COM)"=="GCC"
- $(GNUCOPY) $(SOLARBINDIR)/mingwm10.dll $(EXTENSIONDIR)
- .IF "$(MINGW_GCCDLL)"!=""
- $(GNUCOPY) $(SOLARBINDIR)/$(MINGW_GCCDLL) $(EXTENSIONDIR)
- .ENDIF
- .IF "$(MINGW_GXXDLL)"!=""
- $(GNUCOPY) $(SOLARBINDIR)/$(MINGW_GXXDLL) $(EXTENSIONDIR)
- .ENDIF
-.ELSE
-.IF "$(PACKMS)"!=""
-.IF "$(CCNUMVER)" <= "001399999999"
- $(GNUCOPY) $(PACKMS)/msvcr71.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcp71.dll $(EXTENSIONDIR)
-.ELSE # "$(CCNUMVER)" <= "001399999999"
-.IF "$(CCNUMVER)" <= "001499999999"
- $(GNUCOPY) $(PACKMS)/msvcr80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcp80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcm80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
-.ELSE # "$(CCNUMVER)" <= "001499999999"
- $(GNUCOPY) $(PACKMS)/msvcr90.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcp90.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcm90.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR)
-.ENDIF # "$(CCNUMVER)" <= "001499999999"
-.ENDIF # "$(CCNUMVER)" <= "001399999999"
-.ELSE # "$(PACKMS)"!=""
-.IF "$(CCNUMVER)" <= "001399999999"
- $(GNUCOPY) $(SOLARBINDIR)/msvcr71.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/msvcp71.dll $(EXTENSIONDIR)
-.ELSE # "$(CCNUMVER)" <= "001399999999"
-.IF "$(CCNUMVER)" <= "001499999999"
- $(GNUCOPY) $(SOLARBINDIR)/msvcr80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/msvcp80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/msvcm80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
-.ELSE # "$(CCNUMVER)" <= "001499999999"
- $(GNUCOPY) $(SOLARBINDIR)/msvcr90.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/msvcp90.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/msvcm90.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR)
-.ENDIF # "$(CCNUMVER)" <= "001499999999"
-.ENDIF # "$(CCNUMVER)" <= "001399999999"
-.ENDIF # "$(PACKMS)"!=""
-.ENDIF #"$(COM)"=="GCC"
-.ENDIF # "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
- @$(TOUCH) $@
-.ENDIF # "$(PACK_RUNTIME)"!=""
-
IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)-$(PLATFORMID)"
.INCLUDE .IGNORE : $(MISC)/$(TARGET)_lang_track.mk
commit 738cef29aa53e60c839d686c0e018e9c912f20b9
Author: Andras Timar <atimar at suse.com>
Date: Fri Dec 9 08:50:39 2011 +0100
remove transform_description.pl, obsoleted by l10ntools
diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl
deleted file mode 100644
index ff99df4..0000000
--- a/solenv/bin/transform_description.pl
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/perl
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-parse_args();
-execute_args();
-exit(0);
-
-my $source = undef;
-my $dest = undef;
-my @languages = undef;
-
-sub parse_args
-{
- # at most two arguments
- explain(), exit(100) if ( $#ARGV > 1 );
-
- # destination file is the second argument, if present
- $dest = $ARGV[1] if ( $#ARGV > 0 );
-
- # source file is the first argument if present
- if ( $#ARGV > -1 )
- {
- $source = $ARGV[0];
- if ( ! -f $source )
- {
- print STDERR "$source is not a valid file, aborting";
- exit(101);
- }
- }
-
- # check which languages to use
- my $languages = $ENV{WITH_LANG};
- if ( ( ! defined $languages ) || ( "$languages" eq "" ) )
- {
- print STDERR "$0: WITH_LANG not set or empty, defaulting to 'en-US'\n";
- $languages = "en-US";
- }
- @languages = split ( ' ', $languages );
-}
-
-sub execute_args
-{
- my @description = ();
- if ( defined $source )
- {
- open SOURCE, "$source" || die "could not open $source: $?\n";
- @description = <SOURCE>;
- close SOURCE;
- }
- else
- {
- @description = <STDIN>;
- }
-
- if ( defined $dest )
- {
- open DEST, ">$dest" || die "could not open $dest for writing: $?\n";
- }
-
- foreach (@description)
- {
- chomp; s/\r//;
-
- if ( /\#LANG\#/ )
- {
- foreach $lang ( @languages )
- {
- my $transformed = $_;
- $transformed =~ s/\#LANG#/$lang/g;
- if ( defined $dest )
- {
- print DEST "$transformed\n";
- }
- else
- {
- print STDOUT "$transformed\n";
- }
- }
- }
- else
- {
- if ( defined $dest )
- {
- print DEST "$_\n";
- }
- else
- {
- print STDOUT "$_\n";
- }
- }
- }
-
- close DEST if ( defined $dest );
-}
-
-# explains the program's usage
-sub explain
-{
- print STDOUT "usage:\n";
- print STDOUT " $0 [<description_file> [<output_file>]]\n";
- print STDOUT " transforms the given extension description file\n";
- print STDOUT "\n";
- print STDOUT " If <output_file> is not given, STDOUT is used.\n";
- print STDOUT " If <description_file> is not given, STDIN is used.\n";
- print STDOUT "\n";
- print STDOUT " The following transformations are done at the moment:\n";
- print STDOUT " - duplicate all lines containing #LANG#, for ever token of \$WITH_LANG\n";
- print STDOUT " replacing every occurrence of \$LANG with a token\n";
- print STDOUT "\n";
- print STDOUT " And yes, the functionality of this script should be\n";
- print STDOUT " - moved to solenv/inc/tg_ext.mk\n";
- print STDOUT " - implemented as XSLT, to be much less error-prone\n";
-}
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 22f2e81..90e5529 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -144,14 +144,11 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
@@-$(MKDIRHIER) $(@:d)
@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)/$(TARGET)_lang_track.mk
- $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/transform_description.pl $(DESCRIPTION_SRC) $@.1.$(EXTNAME)
+ $(COMMAND_ECHO)$(TYPE) $(DESCRIPTION_SRC) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $@.1.$(EXTNAME)
- $(COMMAND_ECHO)$(TYPE) $@.1.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $@.2.$(EXTNAME)
+ $(COMMAND_ECHO)$(TYPE) $@.1.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
@@-$(RM) $@.1.$(EXTNAME)
- $(COMMAND_ECHO)$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
- @@-$(RM) $@.2.$(EXTNAME)
-
.ENDIF # "$(DESCRIPTION)"!=""
# default OOo license text!!!
# may not fit...
More information about the Libreoffice-commits
mailing list