[ooo-build-commit] bin/applyflags bin/setup.in bin/unpack configure.in download.in patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Wed Oct 28 11:43:19 PDT 2009
bin/applyflags | 3
bin/setup.in | 2
bin/unpack | 14 ++
configure.in | 39 ++++++++
download.in | 14 ++
patches/dev300/apply | 13 ++
patches/dev300/extensions_configure.diff | 76 +++++++++++++--
patches/dev300/extensions_packinfo.diff | 48 +++++++++-
patches/dev300/nlpsolver-build.diff | 143 ++++++++++++++++++++++++++++++
patches/dev300/piece-nlpsolver.diff | 28 +++++
patches/dev300/postprocess-nlpsolver.diff | 8 +
patches/dev300/scp2_extensions.diff | 104 ++++++++++++++++++---
12 files changed, 458 insertions(+), 34 deletions(-)
New commits:
commit 5091c771cf7f5700fc24a027272e133bf1b06b45
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Oct 28 19:35:50 2009 +0100
Allow to build NLPSolver and oooblogger extensions (fate#304653, fate#304555)
Add missing pieces for the Google Docs & Zoho extesnions into
extensions_configure.diff, extensions_packinfo.diff
* bin/applyflags: apply NLPSolver section when the dir is available
* bin/setup.in:
* bin/unpack:
* configure.in:
* download.in:
* patches/dev300/apply:
* patches/dev300/extensions_configure.diff:
* patches/dev300/extensions_packinfo.diff:
* patches/dev300/nlpsolver-build.diff:
* patches/dev300/piece-nlpsolver.diff:
* patches/dev300/postprocess-nlpsolver.diff:
* patches/dev300/scp2_extensions.diff:
diff --git a/bin/applyflags b/bin/applyflags
index 25322df..53c1727 100755
--- a/bin/applyflags
+++ b/bin/applyflags
@@ -31,6 +31,9 @@ fi
if test -d $OOBUILDDIR/swext -o -d $OOBUILDDIR/sdext -o -d $OOBUILDDIR/reportbuilder; then
echo -n " --distro=Extensions";
fi
+if test -d $OOBUILDDIR/nlpsolver ; then
+ echo -n " --distro=NLPSolver";
+fi
# The localize.sdf's are created during the build when they do not exits.
# Additionally, they are created using something like echo > localize.sdf, so
diff --git a/bin/setup.in b/bin/setup.in
index 240b4a3..e505692 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -34,6 +34,8 @@ OOOP_SAMPLES_PACK='@OOOP_SAMPLES_PACK@'
OOOP_TEMPLATES_PACK='@OOOP_TEMPLATES_PACK@'
LIGHTPROOF_EXTENSION='@LIGHTPROOF_EXTENSION@'
GOOGLE_DOCS_EXTENSION='@GOOGLE_DOCS_EXTENSION@'
+NLPSOLVER_EXTENSION='@NLPSOLVER_EXTENSION@'
+OOOBLOGGER_EXTENSION='@OOOBLOGGER_EXTENSION@'
SUNTEMPLATES_LANG='@SUNTEMPLATES_LANG@'
OOO_BUILDVERSION='@OOO_BUILDVERSION@'
OOO_STRIP='@OOO_STRIP@'
diff --git a/bin/unpack b/bin/unpack
index 011c68b..95fdc49 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -880,6 +880,20 @@ if test "x$GOOGLE_DOCS_EXTENSION" != "x"; then
$GNUCP $SRCDIR/$GOOGLE_DOCS_EXTENSION -d $OOBUILDDIR/extras/source/extensions || exit 1
fi
+if test "x$NLPSOLVER_EXTENSION" != "x"; then
+ check_file $SRCDIR/$NLPSOLVER_EXTENSION
+ echo "Copying NLPSolver extension into the tree"
+ mkdir -p $OOBUILDDIR/nlpsolver/download || exit 1
+ $GNUCP $SRCDIR/$NLPSOLVER_EXTENSION -d $OOBUILDDIR/nlpsolver/download || exit 1
+fi
+
+if test "x$OOOBLOGGER_EXTENSION" != "x"; then
+ check_file $SRCDIR/$OOOBLOGGER_EXTENSION
+ echo "Copying oooblogger extension into the tree"
+ mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
+ $GNUCP $SRCDIR/$OOOBLOGGER_EXTENSION -d $OOBUILDDIR/extras/source/extensions || exit 1
+fi
+
if test "x$OXYGEN_IMAGES_TAR" != "x"; then
check_tarball $SRCDIR/$OXYGEN_IMAGES_TAR
echo "Copying $OXYGEN_IMAGES_TAR into external_images"
diff --git a/configure.in b/configure.in
index 7586e1a..0d15eb6 100644
--- a/configure.in
+++ b/configure.in
@@ -350,6 +350,17 @@ AC_ARG_WITH(google-docs,
--with-google-docs Download and integrate Google Documents extension.],
,)
+AC_ARG_WITH(nlpsolver,
+[
+ --with-nlpsolver Download and integrate NLPSolver extension.],
+,)
+
+
+AC_ARG_WITH(oooblogger,
+[
+ --with-oooblogger Download and integrate oooblogger extension.],
+,)
+
AC_ARG_WITH(dejavu-fonts,
[
@@ -1329,6 +1340,34 @@ fi
AC_SUBST(WITH_GOOGLE_DOCS)
AC_SUBST(GOOGLE_DOCS_EXTENSION)
+AC_MSG_CHECKING([whether to include NLPSolver extension])
+if test "$enable_extensions" != "no" ; then
+ if test "z$with_nlpsolver" = "zyes" ; then
+ NLPSOLVER_EXTENSION="nlpsolver-0.9.tar.bz2"
+ WITH_NLPSOLVER=YES
+ AC_MSG_RESULT([yes])
+ else
+ WITH_NLPSOLVER=NO
+ AC_MSG_RESULT([no])
+ fi
+fi
+AC_SUBST(WITH_NLPSOLVER)
+AC_SUBST(NLPSOLVER_EXTENSION)
+
+AC_MSG_CHECKING([whether to include oooblogger extension])
+if test "$enable_extensions" != "no" ; then
+ if test "z$with_oooblogger" = "zyes" ; then
+ OOOBLOGGER_EXTENSION="oooblogger-0.1.oxt"
+ WITH_OOOBLOGGER=YES
+ AC_MSG_RESULT([yes])
+ else
+ WITH_OOOBLOGGER=NO
+ AC_MSG_RESULT([no])
+ fi
+fi
+AC_SUBST(WITH_OOOBLOGGER)
+AC_SUBST(OOOBLOGGER_EXTENSION)
+
AC_MSG_CHECKING([whether to include lightproof extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_lightproof" = "zyes" ; then
diff --git a/download.in b/download.in
index 7316839..5639f22 100755
--- a/download.in
+++ b/download.in
@@ -149,6 +149,12 @@ sub trim($)
# Google Docs Extension
'gdocs_*' => 'http://download.go-oo.org/src/'
+# NLPSolver Extension
+ 'NLPSolver*' => 'http://download.go-oo.org/src/'
+
+# oooblogger Extension
+ 'oooblogger*' => 'http://download.go-oo.org/src/'
+
);
if ( '@UPSTREAM_NAME@' ne '' ) {
@@ -465,6 +471,14 @@ if ('@GOOGLE_DOCS_EXTENSION@' ne '') {
source_file( '@GOOGLE_DOCS_EXTENSION@' );
}
+if ('@NLPSOLVER_EXTENSION@' ne '') {
+ source_file( '@NLPSOLVER_EXTENSION@' );
+}
+
+if ('@OOOBLOGGER_EXTENSION@' ne '') {
+ source_file( '@OOOBLOGGER_EXTENSION@' );
+}
+
if ('@OXYGEN_IMAGES_TAR@' ne '') {
source_file( '@OXYGEN_IMAGES_TAR@' );
}
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 550ea95..b2aa056 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -34,12 +34,14 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, \
KDE4Experimental, MinGW, CalcExperimental, Mono24, \
OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
- WriterNavigation, WriterDocComparison, SystemGraphiteWithSTLport
+ WriterNavigation, WriterDocComparison, SystemGraphiteWithSTLport
DebianLooseSections: DebianBaseNoHelpContent
# Optional sections
Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes, Win32OnlyExtensionFixes, Linux32OnlyExtensionFixes
# Binfilter patches: a special distro; applied only when building with binfilter
Binfilter : BFBuildBits, BFFixes, BFShrink
+# optional section for NLPSolver extension
+NLPSolver : NLPSolverBits
# System patches: a special distro; applied only when building with the system tarball unpacked
System : SystemBuildBits
# Sdk patches: a special distro; applied only when building with the sdk tarball unpacked
@@ -2673,6 +2675,10 @@ scp2_accessories_templates_makefile.diff
extensions_deliver.diff
+[ NLPSolverBits ]
+# Solver for Nonlinear Programming extension build bits (fate#304653)
+nlpsolver-build.diff, pmladek
+
[ OxygenOfficeDefaultSettings ]
# Always enable extended tips
i27928-extended-tips-on.diff
@@ -2905,6 +2911,7 @@ piece-solenv.diff
piece-services.diff
piece-ant.diff
piece-extensions.diff
+piece-nlpsolver.diff
piece-setup_native.diff
piece-jvmfwk.diff
piece-forms.diff
@@ -3342,6 +3349,10 @@ configure-fix-lpsolve-depends.diff, janneke
configure-fix-use-c++-for-mythes.diff, janneke
build-fix-xulrunner-npapi-inc.diff, janneke
+[ BuildBits ]
+# build NLPSolver extension when enabled (fate#304653)
+postprocess-nlpsolver.diff, pmladek
+
[ DebianBaseOnly ]
# link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include it
system-lpsolve-link-with-colamd.diff, rengelha
diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
index 01dcabd..2bed7e6 100644
--- a/patches/dev300/extensions_configure.diff
+++ b/patches/dev300/extensions_configure.diff
@@ -1,6 +1,6 @@
---- configure.in.original 2008-05-30 10:58:01.000000000 +0200
-+++ configure.in 2008-05-30 11:03:00.000000000 +0200
-@@ -69,6 +69,13 @@
+--- configure.in.old 2009-10-26 16:02:41.000000000 +0100
++++ configure.in 2009-10-27 16:57:35.000000000 +0100
+@@ -74,6 +74,13 @@ AC_ARG_ENABLE(mozilla,
binary for your platform, to build without this
version, use this option.
],,enable_mozilla="yes")
@@ -12,9 +12,9 @@
+,)
+
AC_ARG_WITH(fonts,
- [ --without-fonts Removes Bitstream Vera fonts from
- openoffice.org installation set, for people building
-@@ -810,6 +817,16 @@
+ [ --without-fonts OOo includes some third-party fonts to provide a reliable
+ basis for help content, templates, samples, etc.
+@@ -829,6 +836,31 @@ AC_ARG_WITH(alloc,
[ --with-alloc Define which allocator to build with
(choices are oo, system, tcmalloc)
],,)
@@ -28,10 +28,25 @@
+ --with-lightproof Integrate Lightproof extension],
+,)
+
++AC_ARG_WITH(google-docs,
++[
++ --with-google-docs Download and integrate Google Documents extension.],
++,)
++
++AC_ARG_WITH(nlpsolver,
++[
++ --with-nlpsolver Download and integrate NLPSolver extension.],
++,)
++
++AC_ARG_WITH(oooblogger,
++[
++ --with-oooblogger Download and integrate oooblogger extension.],
++,)
++
AC_ARG_ENABLE(verbose,
[ --enable-verbose Increase build verbosity.
--disable-verbose Decrease build verbosity.
-@@ -5407,6 +5407,7 @@
+@@ -5929,6 +5961,7 @@ if test -n "$enable_minimizer" -a "$enab
else
AC_MSG_RESULT([no])
ENABLE_MINIMIZER=NO
@@ -39,7 +54,7 @@
fi
AC_SUBST(ENABLE_MINIMIZER)
-@@ -5417,6 +5418,7 @@
+@@ -5939,6 +5972,7 @@ if test -n "$enable_presenter_console" -
else
AC_MSG_RESULT([no])
ENABLE_PRESENTER_SCREEN=NO
@@ -47,7 +62,7 @@
fi
AC_SUBST(ENABLE_PRESENTER_SCREEN)
-@@ -5430,6 +5440,7 @@
+@@ -5970,6 +6004,7 @@ if test -n "$enable_pdfimport" -a "$enab
else
AC_MSG_RESULT([no])
ENABLE_PDFIMPORT=NO
@@ -55,15 +70,15 @@
fi
AC_SUBST(ENABLE_PDFIMPORT)
AC_SUBST(SYSTEM_POPPLER)
-@@ -5472,6 +5475,7 @@
+@@ -6000,6 +6035,7 @@ if test -n "$enable_wiki_publisher" -a "
else
AC_MSG_RESULT([no])
ENABLE_MEDIAWIKI=NO
+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
fi
AC_SUBST(ENABLE_MEDIAWIKI)
- AC_SUBST(SYSTEM_APACHE_COMMONS)
-@@ -5876,6 +5876,7 @@
+
+@@ -6208,6 +6244,7 @@ if test -n "$enable_report_builder" -a "
else
AC_MSG_RESULT([no])
ENABLE_REPORTBUILDER=NO
@@ -71,7 +86,7 @@
SYSTEM_JFREEREPORT=NO
fi
AC_SUBST(ENABLE_REPORTBUILDER)
-@@ -6055,6 +6068,64 @@
+@@ -6609,6 +6646,98 @@ else
fi
dnl ===================================================================
@@ -101,6 +116,40 @@
+AC_SUBST(WITH_LIGHTPROOF_EXTENSION)
+
+dnl ===================================================================
++dnl Test whether to include Google Docs extension
++dnl ===================================================================
++AC_MSG_CHECKING([for Google Docs extension integration])
++if test "z$with_google_docs" = "z" -o "z$with_google_docs" = "zno" ; then
++ AC_MSG_RESULT([no])
++else
++ AC_MSG_RESULT([yes])
++ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS"
++fi
++
++dnl ===================================================================
++dnl Test whether to include NLPSolver extension
++dnl ===================================================================
++AC_MSG_CHECKING([for NLPSolver extension integration])
++if test "z$with_nlpsolver" = "z" -o "z$with_nlpsolver" = "zno" ; then
++ AC_MSG_RESULT([no])
++else
++ AC_MSG_RESULT([yes])
++ BUILD_TYPE="$BUILD_TYPE NLPSOLVER"
++ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
++fi
++
++dnl ===================================================================
++dnl Test whether to include oooblogger extension
++dnl ===================================================================
++AC_MSG_CHECKING([for NLPSolver extension integration])
++if test "z$with_oooblogger" = "z" -o "z$with_oooblogger" = "zno" ; then
++ AC_MSG_RESULT([no])
++else
++ AC_MSG_RESULT([yes])
++ SCPDEFS="$SCPDEFS -DWITH_EXTENSION_OOOBLOGGER"
++fi
++
++dnl ===================================================================
+dnl Test whether to include Sun Professinal Template Pack
+dnl ===================================================================
+AC_MSG_CHECKING([for Sun Professinal Template Pack integration (only supported languages displayed)])
@@ -136,4 +185,3 @@
dnl Test whether to include fonts
dnl ===================================================================
AC_MSG_CHECKING([whether to include Bitstream Vera fonts])
-
diff --git a/patches/dev300/extensions_packinfo.diff b/patches/dev300/extensions_packinfo.diff
index d069c67..e206876 100644
--- a/patches/dev300/extensions_packinfo.diff
+++ b/patches/dev300/extensions_packinfo.diff
@@ -1,6 +1,6 @@
--- setup_native/source/packinfo/packinfo_extensions.txt.orig 2008-01-14 20:09:47.000000000 +0100
+++ setup_native/source/packinfo/packinfo_extensions.txt 2008-03-29 11:00:24.000000000 +0100
-@@ -0,0 +1,115 @@
+@@ -0,0 +1,161 @@
+# Format:
+
+# Start
@@ -115,4 +115,50 @@
+packageversion = "%PACKAGEVERSION"
+End
+
++Start
++module = "gid_Module_Optional_Extensions_Google_Docs"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-google-docs"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-google-docs"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
++copyright = "2009 by Przemyslaw Rumik"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "Google Docs extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
++End
+
++Start
++module = "gid_Module_Optional_Extensions_NLPSolver"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-nlpsolver"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-nlpsolver"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
++copyright = "2009 by Sun Microsystems, Inc."
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "NLPSolver extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
++End
++
++Start
++module = "gid_Module_Optional_Extensions_OOoBlogger"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-oooblogger"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-oooblogger"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
++copyright = "2005 by Caolan McNamara"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "oooblogger extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
++End
diff --git a/patches/dev300/nlpsolver-build.diff b/patches/dev300/nlpsolver-build.diff
new file mode 100644
index 0000000..0780a0e
--- /dev/null
+++ b/patches/dev300/nlpsolver-build.diff
@@ -0,0 +1,143 @@
+diff -purN nlpsolver.old/makefile.mk nlpsolver/makefile.mk
+--- nlpsolver.old/makefile.mk 1970-01-01 01:00:00.000000000 +0100
++++ nlpsolver/makefile.mk 2009-10-26 22:34:07.000000000 +0100
+@@ -0,0 +1,72 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: makefile.mk,v $
++#
++# $Revision: 1.10 $
++#
++# 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.
++#
++#*************************************************************************
++
++PRJ=.
++
++PRJNAME=nlpsolver
++TARGET=nlpsolver
++
++.IF "$(SOLAR_JAVA)"!=""
++# --- Settings -----------------------------------------------------
++
++.INCLUDE : settings.mk
++.INCLUDE : antsettings.mk
++
++# --- Files --------------------------------------------------------
++
++TARFILE_NAME=nlpsolver-0.9
++TARFILE_ROOTDIR=nlpsolver-0.9
++
++#ADDITIONAL_FILES= \
++# toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java
++
++PATCH_FILES=nlpsolver-0.9.patch
++
++ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
++
++.IF "$(JAVACISGCJ)"=="yes"
++JAVA_HOME=
++.EXPORT : JAVA_HOME
++BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj uno-package
++.ELSE
++BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dbuild.label="build-$(RSCREVISION)" -Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) uno-package
++.ENDIF
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE : set_ext.mk
++.INCLUDE : target.mk
++.INCLUDE : tg_ext.mk
++
++.ELSE
++all:
++ @echo java disabled
++.ENDIF
+diff -purN nlpsolver.old/nlpsolver-0.9.patch nlpsolver/nlpsolver-0.9.patch
+--- nlpsolver.old/nlpsolver-0.9.patch 1970-01-01 01:00:00.000000000 +0100
++++ nlpsolver/nlpsolver-0.9.patch 2009-10-26 22:32:49.000000000 +0100
+@@ -0,0 +1,51 @@
++--- misc/nlpsolver-0.9/nbproject/build-uno-impl.xml.old 2009-03-30 18:32:00.000000000 +0200
+++++ misc/build/nlpsolver-0.9/nbproject/build-uno-impl.xml 2009-10-28 18:22:40.000000000 +0100
++@@ -197,7 +197,7 @@
++ <!-- enter the class path with external jars, if external jars exit and the user did not enter his own -->
++ <target name="-do-class-path" depends="-external-jars,-check-class-path" unless="class.path.exists">
++ <manifest file="${build.dir}/MANIFEST.MF" mode="update">
++- <attribute name="Class-Path" value="${external.jars}"/>
+++ <attribute name="Class-Path" value="${external.jar.dir}/EvolutionarySolver.jar"/>
++ </manifest>
++ </target>
++ <target name="-check-class-path">
++--- misc/nlpsolver-0.9/nbproject/project.properties.old 2009-03-30 18:32:00.000000000 +0200
+++++ misc/build/nlpsolver-0.9/nbproject/project.properties 2009-10-28 18:09:01.000000000 +0100
++@@ -27,8 +27,10 @@ file.reference.EvolutionarySolver.jar=Th
++ includes=**
++ jar.compress=false
++ javac.classpath=\
++- ${libs.StarOffice 9.classpath}:\
++- ${libs.OpenOffice.org 3.0.classpath}:\
+++ ${solar.jar}/juh.jar:\
+++ ${solar.jar}/jurt.jar:\
+++ ${solar.jar}/ridl.jar:\
+++ ${solar.jar}/unoil.jar:\
++ ${reference.EvolutionarySolver.jar}
++ # Space-separated list of extra javac options
++ javac.compilerargs=
++--- misc/nlpsolver-0.9/nbproject/build-impl.xml.old 2009-03-30 18:32:00.000000000 +0200
+++++ misc/build/nlpsolver-0.9/nbproject/build-impl.xml 2009-10-28 18:19:53.000000000 +0100
++@@ -360,6 +360,8 @@ is divided into following sections:
++ -->
++ <target depends="init" name="deps-jar" unless="no.deps">
++ <ant antfile="${project.EvolutionarySolver}/build.xml" inheritall="false" target="jar"/>
+++ <mkdir dir="${dist.dir}/${external.jar.dir}"/>
+++ <copy file="${reference.EvolutionarySolver.jar}" todir="${dist.dir}/${external.jar.dir}"/>
++ </target>
++ <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
++ <target depends="init" name="-check-automatic-build">
++--- misc/nlpsolver-0.9/src/description.xml.old 2009-03-30 16:56:42.000000000 +0200
+++++ misc/build/nlpsolver-0.9/src/description.xml 2009-10-28 18:29:13.000000000 +0100
++@@ -12,11 +12,6 @@
++ <extension-description>
++ <src lang="en" xlink:href="description/extensiondescription.txt"/>
++ </extension-description>
++- <registration>
++- <simple-license accept-by="admin" default-license-id="en">
++- <license-text lang="en" license-id="en" xlink:href="licenses/lgpl-3.0.txt"/>
++- </simple-license>
++- </registration>
++ <dependencies>
++ <OpenOffice.org-minimal-version xmlns:d="http://openoffice.org/extensions/description/2006" d:name="OpenOffice.org 3.0" value="3.0"/>
++ </dependencies>
+diff -purN nlpsolver.old/prj/build.lst nlpsolver/prj/build.lst
+--- nlpsolver.old/prj/build.lst 1970-01-01 01:00:00.000000000 +0100
++++ nlpsolver/prj/build.lst 2009-10-26 20:50:12.000000000 +0100
+@@ -0,0 +1,3 @@
++nlpsolver nlpsolver : javaunohelper unoil jurt NULL NULL
++nlpsolver nlpsolver usr1 - all nlpsolver_mkout NULL
++nlpsolver nlpsolver nmake - all nlpsolver_nlpsolver NULL
+diff -purN nlpsolver.old/prj/d.lst nlpsolver/prj/d.lst
+--- nlpsolver.old/prj/d.lst 1970-01-01 01:00:00.000000000 +0100
++++ nlpsolver/prj/d.lst 2009-10-26 22:12:02.000000000 +0100
+@@ -0,0 +1 @@
++..\%__SRC%\misc\build\nlpsolver-0.9/dist\NLPSolver.oxt %_DEST%\bin%_EXT%\NLPSolver.oxt
diff --git a/patches/dev300/piece-nlpsolver.diff b/patches/dev300/piece-nlpsolver.diff
new file mode 100644
index 0000000..ff7904d
--- /dev/null
+++ b/patches/dev300/piece-nlpsolver.diff
@@ -0,0 +1,28 @@
+--- nlpsolver/makefile.mk.old 2009-10-26 22:34:07.000000000 +0100
++++ nlpsolver/makefile.mk 2009-10-26 22:10:36.000000000 +0100
+@@ -50,7 +50,7 @@ TARFILE_ROOTDIR=nlpsolver-0.9
+
+ PATCH_FILES=nlpsolver-0.9.patch
+
+-ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
++ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SPLITINSTALLDIR)
+
+ .IF "$(JAVACISGCJ)"=="yes"
+ JAVA_HOME=
+--- nlpsolver/nlpsolver-0.9.patch.old 2009-10-26 22:32:49.000000000 +0100
++++ nlpsolver/nlpsolver-0.9.patch 2009-10-26 22:03:52.000000000 +0100
+@@ -17,10 +17,10 @@
+ javac.classpath=\
+ - ${libs.StarOffice 9.classpath}:\
+ - ${libs.OpenOffice.org 3.0.classpath}:\
+-+ ${solar.jar}/juh.jar:\
+-+ ${solar.jar}/jurt.jar:\
+-+ ${solar.jar}/ridl.jar:\
+-+ ${solar.jar}/unoil.jar:\
+++ ${split.ure}/share/java/juh.jar:\
+++ ${split.ure}/share/java/jurt.jar:\
+++ ${split.ure}/share/java/ridl.jar:\
+++ ${split.install}/classes/unoil.jar:\
+ ${reference.EvolutionarySolver.jar}
+ # Space-separated list of extra javac options
+ javac.compilerargs=
diff --git a/patches/dev300/postprocess-nlpsolver.diff b/patches/dev300/postprocess-nlpsolver.diff
new file mode 100644
index 0000000..9b2efd9
--- /dev/null
+++ b/patches/dev300/postprocess-nlpsolver.diff
@@ -0,0 +1,8 @@
+--- postprocess/prj/build.lst.old 2009-10-26 16:02:14.000000000 +0100
++++ postprocess/prj/build.lst 2009-10-27 17:26:20.000000000 +0100
+@@ -1,4 +1,4 @@
+-po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
++po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport NLPSOLVER:nlpsolver REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
+ po postprocess usr1 - all po_mkout NULL
+ po postprocess\checkxml nmake - all po_checkxml NULL
+ po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
diff --git a/patches/dev300/scp2_extensions.diff b/patches/dev300/scp2_extensions.diff
index 2dc1b95..54364c3 100644
--- a/patches/dev300/scp2_extensions.diff
+++ b/patches/dev300/scp2_extensions.diff
@@ -1,7 +1,6 @@
-diff -Naur scp2.old/source/extensions/file_extensions.scp scp2/source/extensions/file_extensions.scp
---- scp2.old/source/extensions/file_extensions.scp 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/file_extensions.scp 2008-12-15 10:19:14.000000000 +0100
-@@ -0,0 +1,147 @@
+--- scp2/source/extensions/file_extensions.scp.old 2009-10-27 15:31:48.000000000 +0100
++++ scp2/source/extensions/file_extensions.scp 2009-10-27 15:36:41.000000000 +0100
+@@ -0,0 +1,174 @@
+/*************************************************************************
+*
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -132,6 +131,33 @@ diff -Naur scp2.old/source/extensions/file_extensions.scp scp2/source/extensions
+
+#endif
+
++/* ** NLPSolver ** */
++
++#ifdef WITH_EXTENSION_NLPSOLVER
++
++File gid_File_Oxt_NLPSolver
++ TXT_FILE_BODY;
++ Styles = (PACKED);
++ Dir = gid_Brand_Dir_Share_Extension_Install;
++ Name = "NLPSolver.oxt";
++End
++
++#endif
++
++/* ** oooblogger ** */
++
++#ifdef WITH_EXTENSION_OOOBLOGGER
++
++File gid_File_Oxt_OOoBlogger
++ TXT_FILE_BODY;
++ Styles = (PACKED);
++ Dir = gid_Brand_Dir_Share_Extension_Install;
++ Name = "oooblogger-0.1.oxt";
++End
++
++#endif
++
++
+/* ** Sun Template Pack ** */
+
+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
@@ -149,9 +175,8 @@ diff -Naur scp2.old/source/extensions/file_extensions.scp scp2/source/extensions
+End
+
+#endif
-diff -Naur scp2.old/source/extensions/makefile.mk scp2/source/extensions/makefile.mk
---- scp2.old/source/extensions/makefile.mk 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/makefile.mk 2008-11-29 19:01:06.000000000 +0100
+--- scp2/source/extensions/makefile.mk.old 2009-10-27 15:31:48.000000000 +0100
++++ scp2/source/extensions/makefile.mk 2009-10-27 15:31:48.000000000 +0100
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
@@ -211,10 +236,9 @@ diff -Naur scp2.old/source/extensions/makefile.mk scp2/source/extensions/makefil
+
+# --- File ---------------------------------------------------------
+.INCLUDE : target.mk
-diff -Naur scp2.old/source/extensions/module_extensions.scp scp2/source/extensions/module_extensions.scp
---- scp2.old/source/extensions/module_extensions.scp 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/module_extensions.scp 2008-12-18 11:47:16.000000000 +0100
-@@ -0,0 +1,184 @@
+--- scp2/source/extensions/module_extensions.scp.old 2009-10-27 15:31:48.000000000 +0100
++++ scp2/source/extensions/module_extensions.scp 2009-10-27 15:40:55.000000000 +0100
+@@ -0,0 +1,218 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -380,6 +404,40 @@ diff -Naur scp2.old/source/extensions/module_extensions.scp scp2/source/extensio
+#endif
+#endif
+
++/* ** NLPSolver ** */
++
++#ifdef WITH_EXTENSION_NLPSOLVER
++#ifdef WITH_EXTENSION_INTEGRATION
++Module gid_Module_Optional_Extensions_NLPSolver
++ PackageInfo = "packinfo_extensions.txt";
++ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER);
++ ParentID = gid_Module_Optional_Extensions;
++ Files = (
++ gid_File_Oxt_NLPSolver );
++ Minimal = NO;
++ Default = YES;
++ Styles = ( );
++End
++#endif
++#endif
++
++/* ** oooblogger ** */
++
++#ifdef WITH_EXTENSION_OOOBLOGGER
++#ifdef WITH_EXTENSION_INTEGRATION
++Module gid_Module_Optional_Extensions_OOoBlogger
++ PackageInfo = "packinfo_extensions.txt";
++ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER);
++ ParentID = gid_Module_Optional_Extensions;
++ Files = (
++ gid_File_Oxt_OOoBlogger );
++ Minimal = NO;
++ Default = YES;
++ Styles = ( );
++End
++#endif
++#endif
++
+/* ** Sun Template Pack ** */
+
+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
@@ -399,9 +457,8 @@ diff -Naur scp2.old/source/extensions/module_extensions.scp scp2/source/extensio
+#include "alllangmodules_extensions_root.inc"
+
+
-diff -Naur scp2.old/source/extensions/module_extensions_sun_templates.scp scp2/source/extensions/module_extensions_sun_templates.scp
---- scp2.old/source/extensions/module_extensions_sun_templates.scp 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/module_extensions_sun_templates.scp 2008-12-18 23:09:10.000000000 +0100
+--- scp2/source/extensions/module_extensions_sun_templates.scp.old 2009-10-27 15:31:48.000000000 +0100
++++ scp2/source/extensions/module_extensions_sun_templates.scp 2009-10-27 15:31:48.000000000 +0100
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
@@ -458,10 +515,9 @@ diff -Naur scp2.old/source/extensions/module_extensions_sun_templates.scp scp2/s
+#include "alllangmodules_extensions_templates.inc"
+
+#endif
-diff -Naur scp2.old/source/extensions/module_extensions.ulf scp2/source/extensions/module_extensions.ulf
---- scp2.old/source/extensions/module_extensions.ulf 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/module_extensions.ulf 2008-12-19 11:39:02.000000000 +0100
-@@ -0,0 +1,742 @@
+--- scp2/source/extensions/module_extensions.ulf.old 2009-10-27 15:31:48.000000000 +0100
++++ scp2/source/extensions/module_extensions.ulf 2009-10-27 15:50:25.000000000 +0100
+@@ -0,0 +1,760 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -545,6 +601,18 @@ diff -Naur scp2.old/source/extensions/module_extensions.ulf scp2/source/extensio
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS]
+en-US = "Google Docs & Zoho"
+
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER]
++en-US = "Solver for Nonlinear Programming"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER]
++en-US = "Solver for Nonlinear Programming"
++
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
++en-US = "Metaweblog Support"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
++en-US = "Metaweblog Support"
++
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK]
+en-US = "Sun Professional Template Pack"
+
More information about the ooo-build-commit
mailing list