[ooo-build-commit] .: patches/dev300

René Engelhard rene at kemper.freedesktop.org
Sat Apr 3 17:50:02 PDT 2010


 patches/dev300/apply                       |    9 
 patches/dev300/cws-buildverbosity.diff     |   27 +-
 patches/dev300/mysqlc-from-OOO320_m14.diff |  263 +++++++++++++++++++++++++++++
 3 files changed, 284 insertions(+), 15 deletions(-)

New commits:
commit 4feafc9213409b70c8aee8384c5b97a0b8c941b6
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Apr 4 02:48:42 2010 +0200

    add missing solenv hunks to mysqlc patch
    
    * patches/dev300/mysqlc-from-OOO320_m14.diff: add missing solenv/ hunks
    * patches/dev300/cws-buildverbosity.diff: adapt
    * patches/dev300/apply: move cws-buildverbosity.diff after MySQL

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0f14038..62dcd6f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -286,10 +286,6 @@ fix-gtk-a11y-gail-version-warning.diff, pmladek
 # Update linkoo for dev300 TODO file upstream
 linkoo-dev300.diff, jholesov
 
-# Make the historically very verbose build quieter, helps us see warnings.
-# From the upstream buildverbosity01 CWS
-cws-buildverbosity.diff, i#84497
-
 # gcc OOMs here otherwise (x86_64)
 writerfilter-qnametostr-NOOPTFILES.diff
 
@@ -3436,6 +3432,11 @@ mysqlc-no-license.diff
 # fix mysqlc to use the SONAME instead of the .so symlink...
 mysqlcppconn-mysqlclient-SONAME.diff
 
+[ TemporaryHacks ]
+# Make the historically very verbose build quieter, helps us see warnings.
+# From the upstream buildverbosity01 CWS
+cws-buildverbosity.diff, i#84497
+
 [ BuildFixWin32 ]
 # FIXME: 2009-09-10: various hacks to get the build to build, should be removed
 # the changes in this patch should be integrated into existing patches or
diff --git a/patches/dev300/cws-buildverbosity.diff b/patches/dev300/cws-buildverbosity.diff
index 2b75e44..ffefe05 100644
--- a/patches/dev300/cws-buildverbosity.diff
+++ b/patches/dev300/cws-buildverbosity.diff
@@ -9889,19 +9889,24 @@ index 25dfa76..120fc10 100644
  .IF "$(OS)$(CPU)"=="WNTI"
  .IF "$(COM)"=="GCC"
     $(GNUCOPY) $(SOLARBINDIR)/mingwm10.dll $(EXTENSIONDIR)
-@@ -129,11 +129,11 @@ PHONYDESC=.PHONY
- .IF "$(DESCRIPTION)"!=""
- $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
+@@ -129,15 +129,15 @@
      @@-$(MKDIRHIER) $(@:d)
--    $(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
-+	$(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
      @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)/$(TARGET)_lang_track.mk
--    $(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $(MISC)/desc.tmp.$(EXTNAME)
-+	$(COMMAND_ECHO)$(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $(MISC)/desc.tmp.$(EXTNAME)
-     @@-$(RM) $@.$(EXTNAME)
--    $(TYPE) $(MISC)/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
-+	$(COMMAND_ECHO)$(TYPE) $(MISC)/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
-     @@-$(RM) $(MISC)/desc.tmp.$(EXTNAME)
+ 
+-	$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.1.$(EXTNAME)
++	$(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.1.$(EXTNAME)
+ 
+-	$(PERL) $(SOLARENV)/bin$/transform_description.pl $@.1.$(EXTNAME) $@.2.$(EXTNAME)
++	$(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin$/transform_description.pl $@.1.$(EXTNAME) $@.2.$(EXTNAME)
+ 	@@-$(RM) $@.1.$(EXTNAME)
+ 
+-	$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $@.3.$(EXTNAME)
++	$(COMMAND_ECHO)$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $@.3.$(EXTNAME)
+ 	@@-$(RM) $@.2.$(EXTNAME)
+ 
+-	$(TYPE) $@.3.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
++	$(COMMAND_ECHO)$(TYPE) $@.3.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
+  	@@-$(RM) $@.3.$(EXTNAME)
  
  .ENDIF			# "$(DESCRIPTION)"!=""
 @@ -151,7 +151,7 @@ PACKLICDEPS=$(CUSTOM_LICENSE)
diff --git a/patches/dev300/mysqlc-from-OOO320_m14.diff b/patches/dev300/mysqlc-from-OOO320_m14.diff
index a447d73..e761f50 100644
--- a/patches/dev300/mysqlc-from-OOO320_m14.diff
+++ b/patches/dev300/mysqlc-from-OOO320_m14.diff
@@ -11867,3 +11867,266 @@ diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
  po	postprocess			    	usr1	-	all	po_mkout NULL
  po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
  po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
+--- /dev/null
++++ solenv/bin/transform_description.pl
+@@ -0,0 +1,138 @@
++#!/usr/bin/perl
++#*************************************************************************
++#*
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2009 by Sun Microsystems, Inc.
++#
++# 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 )
++    {
++        print STDERR "$0: WITH_LANG not set, 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 occurance 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/config/sooo320.ini b/solenv/config/sooo320.ini
+--- solenv/config/sooo320.ini
++++ solenv/config/sooo320.ini
+@@ -13,7 +13,7 @@
+ 			BMP_WRITES_FLAG TRUE
+ 			BTARGET 1
+ 			BUILD_SPECIAL TRUE
+-			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE
++			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC
+ 			common_build TRUE
+ 			COMMON_OUTDIR common
+ 			CONFIG_PROJECT config_office
+@@ -28,6 +28,7 @@
+ 			ENABLE_GTK TRUE
+ 			ENABLE_MEDIAWIKI YES
+ 			ENABLE_MINIMIZER YES
++			ENABLE_MYSQLC YES
+ 			ENABLE_NSS_MODULE YES
+ 			ENABLE_RANDR TRUE
+ 			ENABLE_REPORTBUILDER YES
+@@ -711,6 +712,7 @@
+ 			JDK14PATH %SOLAR_JDK14PATH%
+ 			JDK15PATH %SOLAR_JDK15PATH%
+ 			KDE_ROOT /so/env/kde/linux/kde-3.2.2
++			LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngi6
+ 			NO_BSYMBOLIC True
+ 			OJDK16PATH %SOLAR_OJDK16PATH%
+ 			OS LINUX
+@@ -1036,6 +1038,7 @@
+ 			JDK14PATH %SOLAR_JDK14PATH%
+ 			JDK15PATH %SOLAR_JDK15PATH%
+ 			KDE_ROOT /so/env/kde/linux/kde-3.2.2
++			LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6
+ 			NO_BSYMBOLIC True
+ 			OJDK16PATH %SOLAR_OJDK16PATH%
+ 			OS LINUX
+@@ -1364,6 +1367,7 @@
+ 			JDK13PATH %SOLAR_JDK13PATH%
+ 			JDK14PATH %SOLAR_JDK15PATH%
+ 			JDK15PATH %SOLAR_JDK15PATH%
++			LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxmacxi
+ 			NO_BSYMBOLIC True
+ 			OS MACOSX
+ 			OUTPATH unxmacxi
+@@ -1661,6 +1665,7 @@
+ 			JDK13PATH %SOLAR_JDK13PATH%
+ 			JDK14PATH %SOLAR_JDK14PATH%
+ 			JDK15PATH %SOLAR_JDK15PATH%
++			LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsoli4
+ 			OJDK16PATH %SOLAR_OJDK16PATH%
+ 			OS SOLARIS
+ 			OUTPATH unxsoli4
+@@ -1968,6 +1973,7 @@
+ 			JDK13PATH %SOLAR_JDK13PATH%
+ 			JDK14PATH %SOLAR_JDK14PATH%
+ 			JDK15PATH %SOLAR_JDK15PATH%
++			LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsols4
+ 			LM_LICENSE_FILE %SOLAR_LICENSE_FILE%
+ 			OJDK16PATH %SOLAR_OJDK16PATH%
+ 			OS SOLARIS
+@@ -3518,6 +3522,7 @@
+ 			GVER NT351
+ 			INPATH wntmsci12%PROEXT%
+ 			MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
++			LIBMYSQL_PATH %SOLAR_ENV_ROOT%$/mysql-connector-c-6.0.2$/wntmsci12
+ 			OS WNT
+ 			OUTPATH wntmsci12
+ 			PACKMS %SO_PACK%$/wntmsci12$/MS
+diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
+--- solenv/inc/extension_post.mk
++++ solenv/inc/extension_post.mk
+@@ -1,15 +1,11 @@
+ #*************************************************************************
+ #
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-# 
+-# Copyright 2008 by Sun Microsystems, Inc.
++#
++# Copyright 2000, 2010 Oracle and/or its affiliates.
+ #
+ # OpenOffice.org - a multi-platform office productivity suite
+ #
+-# $RCSfile: extension_post.mk,v $
+-#
+-# $Revision: 1.5 $
+-#
+ # This file is part of OpenOffice.org.
+ #
+ # OpenOffice.org is free software: you can redistribute it and/or modify
+@@ -29,6 +25,8 @@
+ #
+ #*************************************************************************
+ 
++EXTENSION_TARGET:=$(ZIP9TARGETN)
++
+ .SOURCE.xcu : $(MISC)/$(EXTNAME)/merge $(MISC)/$(EXTNAME)/registry/data $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/merge $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/registry/data $(COMPONENT_CONFIGDIR) .
+ .SOURCE.xcs : $(MISC)/$(EXTNAME)/registry $(MISC)/$(EXTNAME)/registry/schema .
+ 
+@@ -129,12 +127,18 @@
+ .IF "$(DESCRIPTION)"!=""
+ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
+ 	@@-$(MKDIRHIER) $(@:d)
+-	$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
+ 	@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)/$(TARGET)_lang_track.mk
+-	$(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $(MISC)/desc.tmp.$(EXTNAME)
+-	@@-$(RM) $@.$(EXTNAME)
+-	$(TYPE) $(MISC)/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
+-	@@-$(RM) $(MISC)/desc.tmp.$(EXTNAME)
++
++	$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.1.$(EXTNAME)
++
++	$(PERL) $(SOLARENV)/bin$/transform_description.pl $@.1.$(EXTNAME) $@.2.$(EXTNAME)
++	@@-$(RM) $@.1.$(EXTNAME)
++
++	$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $@.3.$(EXTNAME)
++	@@-$(RM) $@.2.$(EXTNAME)
++
++	$(TYPE) $@.3.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
++ 	@@-$(RM) $@.3.$(EXTNAME)
+ 
+ .ENDIF			# "$(DESCRIPTION)"!=""
+ # default OOo license text!!!


More information about the ooo-build-commit mailing list