[ooo-build-commit] .: patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Fri Mar 5 11:49:07 PST 2010
patches/dev300/piece-ant.diff | 24 +-
patches/dev300/piece-basic.diff | 10 -
patches/dev300/piece-cpputools.diff | 28 +--
patches/dev300/piece-helpcontent2.diff | 25 +-
patches/dev300/piece-remotebridges.diff | 31 +--
patches/dev300/piece-saxon.diff | 6
patches/dev300/piece-scp2.diff | 16 -
patches/dev300/piece-sdext.diff | 14 -
patches/dev300/piece-solenv.diff | 281 +++++++++++++++-----------------
patches/dev300/piece-svx.diff | 49 ++---
10 files changed, 226 insertions(+), 258 deletions(-)
New commits:
commit abee37968b6e7bd9a6349e4e5acb94b6ad2a4627
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Mar 5 20:48:36 2010 +0100
Defuzzed piece-*.diff
* patches/dev300/piece-ant.diff:
* patches/dev300/piece-basic.diff:
* patches/dev300/piece-cpputools.diff:
* patches/dev300/piece-helpcontent2.diff:
* patches/dev300/piece-remotebridges.diff:
* patches/dev300/piece-saxon.diff:
* patches/dev300/piece-scp2.diff:
* patches/dev300/piece-sdext.diff:
* patches/dev300/piece-solenv.diff:
* patches/dev300/piece-svx.diff: defuzzed
diff --git a/patches/dev300/piece-ant.diff b/patches/dev300/piece-ant.diff
index 596d06f..7f036f7 100644
--- a/patches/dev300/piece-ant.diff
+++ b/patches/dev300/piece-ant.diff
@@ -1,17 +1,15 @@
---- solenv/inc/antsettings.mk 2008-07-23 20:38:00.000000000 +0100
-+++ solenv/inc/antsettings.mk 2008-07-23 20:38:00.000000000 +0100
-@@ -82,6 +82,7 @@
+--- solenv/inc/antsettings.mk.old 2010-03-05 19:59:19.000000000 +0100
++++ solenv/inc/antsettings.mk 2010-03-05 20:26:18.000000000 +0100
+@@ -86,6 +86,7 @@ ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=
-Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
-Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
-Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
+ -Dsplit.install=$(SPLITINSTALLDIR) -Dsplit.dev=$(SPLITDEVDIR) -Dsplit.ure=$(SPLITUREDIR) \
-Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
-
.ELSE # No java
-
-diff -u -r /opt/OpenOffice/dev300-m25/scripting/examples/java/build.xml /usr/src/packages/BUILD/dev300-m25-libs_core/scripting//examples/java/build.xml
---- scripting/examples/java/build.xml 2008-07-21 16:59:39.000000000 +0100
-+++ scripting/examples/java/build.xml 2008-07-23 20:43:42.000000000 +0100
+ ANT=
+--- scripting/examples/java/build.xml.old 2010-02-02 12:49:41.000000000 +0100
++++ scripting/examples/java/build.xml 2010-03-05 20:26:18.000000000 +0100
@@ -42,6 +42,10 @@
<pathelement location="${solar.jar}/juh.jar"/>
<pathelement location="${solar.jar}/ridl.jar"/>
@@ -23,12 +21,9 @@ diff -u -r /opt/OpenOffice/dev300-m25/scripting/examples/java/build.xml /usr/src
</path>
<!-- ===================== HelloWorld example =========================== -->
-
-
-diff -u -r /opt/OpenOffice/dev300-m25/scripting/java/build.xml /usr/src/packages/BUILD/dev300-m25-libs_core/scripting//java/build.xml
---- scripting/java/build.xml 2008-07-21 16:59:39.000000000 +0100
-+++ scripting/java/build.xml 2008-07-23 20:42:47.000000000 +0100
-@@ -60,6 +60,16 @@
+--- scripting/java/build.xml.old 2010-02-02 12:49:41.000000000 +0100
++++ scripting/java/build.xml 2010-03-05 20:26:18.000000000 +0100
+@@ -59,6 +59,16 @@
<pathelement location="${env.BSH_JAR}"/>
<pathelement location="${solar.jar}/js.jar"/>
<pathelement location="${jardir}"/>
@@ -45,4 +40,3 @@ diff -u -r /opt/OpenOffice/dev300-m25/scripting/java/build.xml /usr/src/packages
</path>
<path id="idesupport.class.path">
-
diff --git a/patches/dev300/piece-basic.diff b/patches/dev300/piece-basic.diff
index f523954..8adcf66 100644
--- a/patches/dev300/piece-basic.diff
+++ b/patches/dev300/piece-basic.diff
@@ -1,8 +1,8 @@
---- basic/source/classes/makefile.mk
-+++ basic/source/classes/makefile.mk
-@@ -45,8 +45,9 @@
+--- basic/source/classes/makefile.mk.old 2010-03-05 19:59:21.000000000 +0100
++++ basic/source/classes/makefile.mk 2010-03-05 20:08:02.000000000 +0100
+@@ -45,8 +45,9 @@ ALLTAR .SEQUENTIAL : \
$(MISC)$/$(TARGET).don \
- $(SLOTARGET)
+ $(MISC)$/$(TARGET).slo
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
- +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
@@ -11,4 +11,4 @@
+ +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
echo $@
- # --- Allgemein -----------------------------------------------------------
+ $(MISC)$/$(TARGET).slo : $(SLOTARGET)
diff --git a/patches/dev300/piece-cpputools.diff b/patches/dev300/piece-cpputools.diff
index 28d1e17..7b13885 100644
--- a/patches/dev300/piece-cpputools.diff
+++ b/patches/dev300/piece-cpputools.diff
@@ -1,6 +1,6 @@
---- cpputools/source/registercomponent/makefile.mk
-+++ cpputools/source/registercomponent/makefile.mk
-@@ -39,8 +39,8 @@
+--- cpputools/source/registercomponent/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
++++ cpputools/source/registercomponent/makefile.mk 2010-03-05 20:11:19.000000000 +0100
+@@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
@@ -11,11 +11,10 @@
NO_OFFUH=TRUE
CPPUMAKERFLAGS += -C
-
---- cpputools/source/regsingleton/makefile.mk
-+++ cpputools/source/regsingleton/makefile.mk
-@@ -39,8 +39,8 @@
- # --- Settings -----------------------------------------------------
+--- cpputools/source/regsingleton/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
++++ cpputools/source/regsingleton/makefile.mk 2010-03-05 20:11:19.000000000 +0100
+@@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
+
.INCLUDE : settings.mk
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
@@ -24,12 +23,11 @@
+UNOUCRRDB=$(UNOUCRDEP)
NO_OFFUH=TRUE
- CPPUMAKERFLAGS += -C
-
---- cpputools/source/unoexe/makefile.mk
-+++ cpputools/source/unoexe/makefile.mk
-@@ -39,8 +39,8 @@
- # --- Settings -----------------------------------------------------
+ CPPUMAKERFLAGS+= -C
+--- cpputools/source/unoexe/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
++++ cpputools/source/unoexe/makefile.mk 2010-03-05 20:11:19.000000000 +0100
+@@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
+
.INCLUDE : settings.mk
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
@@ -38,4 +36,4 @@
+UNOUCRRDB=$(UNOUCRDEP)
NO_OFFUH=TRUE
- CPPUMAKERFLAGS += -C
+ CPPUMAKERFLAGS+= -C
diff --git a/patches/dev300/piece-helpcontent2.diff b/patches/dev300/piece-helpcontent2.diff
index 757e31f..926b5df 100644
--- a/patches/dev300/piece-helpcontent2.diff
+++ b/patches/dev300/piece-helpcontent2.diff
@@ -1,20 +1,19 @@
---- helpcontent2/source/auxiliary/makefile.mk
-+++ helpcontent2/source/auxiliary/makefile.mk
-@@ -75,7 +75,7 @@
+--- helpcontent2/source/auxiliary/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
++++ helpcontent2/source/auxiliary/makefile.mk 2010-03-05 20:09:50.000000000 +0100
+@@ -86,7 +86,7 @@ aux_dirs .PHONY :
$(COMMONBIN)$/helpimg.ilst .PHONY:
- -$(RM) $@
-- $(PERL) $(PRJ)$/helpers$/create_ilst.pl -dir=$(SOLARSRC)/default_images/res/helpimg > $@.$(INPATH)
+ -$(RM) $@
+- $(PERL) $(PRJ)$/helpers$/create_ilst.pl -dir=$(SOLARSRC)/default_images/res/helpimg > $@.$(INPATH)
+ $(PERL) $(PRJ)$/helpers$/create_ilst.pl -dir=$(SOLARVER)/default_images/res/helpimg > $@.$(INPATH)
- $(RENAME) $@.$(INPATH) $@
-
+ $(RENAME) $@.$(INPATH) $@
+
-
-
---- helpcontent2/settings.pmk 2008-07-25 16:23:36.000000000 +0100
-+++ helpcontent2/settings.pmk 2008-07-25 16:23:36.000000000 +0100
-@@ -1,11 +1,11 @@
- .INCLUDE : $(INCCOM)$/aux_langs.mk
+--- helpcontent2/settings.pmk.old 2010-03-05 19:59:20.000000000 +0100
++++ helpcontent2/settings.pmk 2010-03-05 20:09:50.000000000 +0100
+@@ -4,12 +4,12 @@
+ WITH_LANG:=en-US
+ .ENDIF "$(HELPCONTENT_EN_US_ONLY)"=="YES"
-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/HelpIndexerTool.jar$
+my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/unoil.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/ridl.jar$(PATH_SEPERATOR)$(SPLITUREDIR)$/share$/java$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SPLITINSTALLDIR)$/classes$/HelpIndexerTool.jar$
diff --git a/patches/dev300/piece-remotebridges.diff b/patches/dev300/piece-remotebridges.diff
index 9855270..b159c44 100644
--- a/patches/dev300/piece-remotebridges.diff
+++ b/patches/dev300/piece-remotebridges.diff
@@ -1,6 +1,6 @@
---- remotebridges/source/bridge/makefile.mk
-+++ remotebridges/source/bridge/makefile.mk
-@@ -35,6 +35,7 @@
+--- remotebridges/source/bridge/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
++++ remotebridges/source/bridge/makefile.mk 2010-03-05 20:24:42.000000000 +0100
+@@ -35,6 +35,7 @@ PRJNAME=remotebridges
TARGET = remotebridge.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = remotebridge
@@ -8,21 +8,19 @@
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-
---- remotebridges/source/dynamicloader/makefile.mk
-+++ remotebridges/source/dynamicloader/makefile.mk
-@@ -35,6 +35,7 @@
+--- remotebridges/source/dynamicloader/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
++++ remotebridges/source/dynamicloader/makefile.mk 2010-03-05 20:24:42.000000000 +0100
+@@ -35,6 +35,7 @@ PRJNAME=remotebridges
TARGET = dynamicloader.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = dynamicloader
+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb
# --- Settings -----------------------------------------------------
- .INCLUDE : settings.mk
-
---- remotebridges/source/factory/makefile.mk
-+++ remotebridges/source/factory/makefile.mk
-@@ -35,6 +35,7 @@
+
+--- remotebridges/source/factory/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
++++ remotebridges/source/factory/makefile.mk 2010-03-05 20:24:42.000000000 +0100
+@@ -35,6 +35,7 @@ PRJNAME=remotebridges
TARGET = bridgefac.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = brdgfctr
@@ -30,14 +28,13 @@
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-
---- remotebridges/source/unourl_resolver/makefile.mk
-+++ remotebridges/source/unourl_resolver/makefile.mk
-@@ -35,6 +35,7 @@
+--- remotebridges/source/unourl_resolver/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
++++ remotebridges/source/unourl_resolver/makefile.mk 2010-03-05 20:24:42.000000000 +0100
+@@ -34,6 +34,7 @@ PRJNAME=remotebridges
TARGET = uuresolver.uno
ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST = uuresolver
+UNOUCRRDB=$(SOLARPIECE)$/$(INPATH)$/bin$/types.rdb
# --- Settings -----------------------------------------------------
- .INCLUDE : settings.mk
+
diff --git a/patches/dev300/piece-saxon.diff b/patches/dev300/piece-saxon.diff
index 544d4d8..d21e3dd 100644
--- a/patches/dev300/piece-saxon.diff
+++ b/patches/dev300/piece-saxon.diff
@@ -1,8 +1,8 @@
---- saxon/makefile.mk.old 2008-10-15 11:43:33.000000000 +0200
-+++ saxon/makefile.mk 2009-10-16 16:16:27.000000000 +0200
+--- saxon/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
++++ saxon/makefile.mk 2010-03-05 20:24:05.000000000 +0100
@@ -54,7 +54,7 @@ TARFILE_ROOTDIR=src
- PATCH_FILE_NAME=saxon-9.0.0.7-bj.patch
+ PATCH_FILES=saxon-9.0.0.7-bj.patch
-BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dsolarbindir=$(SOLARBINDIR) jar-bj
+BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dsolar.bin=$(SOLARPIECE)$/$(INPATH)$/bin jar-bj
diff --git a/patches/dev300/piece-scp2.diff b/patches/dev300/piece-scp2.diff
index 7ecd807..60c2c36 100644
--- a/patches/dev300/piece-scp2.diff
+++ b/patches/dev300/piece-scp2.diff
@@ -1,15 +1,13 @@
---- scp2/prj/build.lst 2008-06-06 10:37:54.000000000 +0100
-+++ scp2/prj/build.lst 2008-06-06 10:37:54.000000000 +0100
+--- scp2/prj/build.lst.old 2010-03-05 19:59:27.000000000 +0100
++++ scp2/prj/build.lst 2010-03-05 20:25:14.000000000 +0100
@@ -1,4 +1,4 @@
-cp scp2 : l10n setup_native transex3 PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp scp2 : soltools PYTHON:python ICU:icu NULL
cp scp2 usr1 - all cp_mkout NULL
cp scp2\macros nmake - all cp_langmacros NULL
cp scp2\source\templates nmake - all cp_langtemplates NULL
-
-
---- scp2/source/ooo/makefile.mk
-+++ scp2/source/ooo/makefile.mk
+--- scp2/source/ooo/makefile.mk.old 2010-03-05 19:59:20.000000000 +0100
++++ scp2/source/ooo/makefile.mk 2010-03-05 20:25:14.000000000 +0100
@@ -39,7 +39,11 @@ TARGETTYPE=CUI
# --- Settings -----------------------------------------------------
@@ -23,7 +21,7 @@
.IF "$(COM)" == "MSC"
SCPDEFS+=-D_MSC
-@@ -168,7 +172,17 @@ SCPDEFS+=-DSYSTEM_HUNSPELL
+@@ -174,7 +178,17 @@ SCPDEFS+=-DSYSTEM_HUNSPELL
.IF "$(SYSTEM_REDLAND)" == "YES"
SCPDEFS+=-DSYSTEM_REDLAND
.ELSE
@@ -41,7 +39,7 @@
+REDLAND_MICRO=0
SCPDEFS+=\
-DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \
- -DRAPTOR_MINOR=$(RAPTOR_MINOR) \
+ -DRASQAL_MAJOR=$(RASQAL_MAJOR) \
@@ -209,7 +223,9 @@ SCPDEFS+=-DSYSTEM_LUCENE
.IF "$(SYSTEM_ICU)" == "YES"
SCPDEFS+=-DSYSTEM_ICU
@@ -53,7 +51,7 @@
SCPDEFS+=\
-DICU_MAJOR=$(ICU_MAJOR) \
-DICU_MINOR=$(ICU_MINOR) \
-@@ -312,8 +328,8 @@ ULFFILES= \
+@@ -323,8 +339,8 @@ ULFFILES= \
.INCLUDE : target.mk
.IF "$(SYSTEM_ICU)" != "YES"
diff --git a/patches/dev300/piece-sdext.diff b/patches/dev300/piece-sdext.diff
index 2db514f..90ae3b7 100644
--- a/patches/dev300/piece-sdext.diff
+++ b/patches/dev300/piece-sdext.diff
@@ -1,16 +1,16 @@
---- sdext/source/minimizer/makefile.mk
-+++ sdext/source/minimizer/makefile.mk
-@@ -123,7 +123,7 @@
-
+--- sdext/source/minimizer/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
++++ sdext/source/minimizer/makefile.mk 2010-03-05 20:10:38.000000000 +0100
+@@ -129,7 +129,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS)
+ .IF "$(L10N_framework)"==""
.INCLUDE : extension_post.mk
-$(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f)
+$(COMPONENT_BITMAPS) : $(SOLARVER)$/$(RSCDEFIMG)$/minimizer$/$$(@:f)
- @@-$(MKDIRHIER) $(@:d)
+ @@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
---- sdext/util/makefile.pmk 2008-04-11 01:21:02.000000000 +0100
-+++ sdext/util/makefile.pmk 2008-07-25 19:12:15.000000000 +0100
+--- sdext/util/makefile.pmk.old 2010-02-02 12:49:41.000000000 +0100
++++ sdext/util/makefile.pmk 2010-03-05 20:10:38.000000000 +0100
@@ -31,7 +31,7 @@
XSLDIR=$(SOLARXMLDIR)$/processing
diff --git a/patches/dev300/piece-solenv.diff b/patches/dev300/piece-solenv.diff
index 0f7491e..319b4bd 100644
--- a/patches/dev300/piece-solenv.diff
+++ b/patches/dev300/piece-solenv.diff
@@ -1,13 +1,13 @@
---- solenv/bin/modules/installer/setupscript.pm 2008-07-18 17:17:13.000000000 +0100
-+++ solenv/bin/modules/installer/setupscript.pm 2008-07-18 17:17:13.000000000 +0100
-@@ -66,10 +66,14 @@
-
- # and now the complete path for the setup script is needed
- # The log file cannot be used, because this is the language independent section
--
-- $scriptnameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptname, $includepatharrayref, 1);
+--- solenv/bin/modules/installer/setupscript.pm.old 2010-02-02 12:49:41.000000000 +0100
++++ solenv/bin/modules/installer/setupscript.pm 2010-03-05 20:25:52.000000000 +0100
+@@ -67,10 +67,14 @@ sub set_setupscript_name
+
+ # and now the complete path for the setup script is needed
+ # The log file cannot be used, because this is the language independent section
+-
+- $scriptnameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptname, $includepatharrayref, 1);
-- $installer::globals::setupscriptname = $$scriptnameref;
+- $installer::globals::setupscriptname = $$scriptnameref;
+ if (defined $ENV{OO_SOLVERDIR}) {
+ $installer::globals::setupscriptname = "$ENV{OO_SOLVERDIR}/bin/$scriptname";
+ } else {
@@ -16,34 +16,31 @@
+ $installer::globals::setupscriptname = $$scriptnameref;
+ }
- if ( $installer::globals::setupscriptname eq "" )
- {
-
---- solenv/bin/modules/installer/globals.pm 2008-07-18 17:53:17.000000000 +0100
-+++ solenv/bin/modules/installer/globals.pm 2008-07-18 17:53:17.000000000 +0100
-@@ -56,7 +56,8 @@
+ if ( $installer::globals::setupscriptname eq "" )
+ {
+--- solenv/bin/modules/installer/globals.pm.old 2010-02-02 12:49:41.000000000 +0100
++++ solenv/bin/modules/installer/globals.pm 2010-03-05 20:25:52.000000000 +0100
+@@ -109,7 +109,8 @@ BEGIN
- $destdir = "";
- $rootpath = "";
--
+ $destdir = "";
+ $rootpath = "";
+-
+
+ $split = 0;
- $required_dotnet_version = "2.0.0.0";
- $productextension = "";
- @languageproducts = ();
-@@ -428,6 +429,8 @@
- if ( $plat =~ /linux/i ) { $islinux = 1; }
- if ( $plat =~ /solaris/i ) { $issolaris = 1; }
+ $required_dotnet_version = "2.0.0.0";
+ $productextension = "";
+ @languageproducts = ();
+@@ -536,6 +537,8 @@ BEGIN
+ if ( $plat =~ /solaris/i ) { $issolaris = 1; }
+ if ( $plat =~ /darwin/i ) { $ismacosx = 1; }
+ $split = 1 if (defined $ENV{SOLARPIECE});
+
- # ToDo: Needs to be expanded for additional platforms
+ # ToDo: Needs to be expanded for additional platforms
}
-
-
---- solenv/bin/modules/installer/scriptitems.pm.old 2009-10-14 15:38:04.000000000 +0200
-+++ solenv/bin/modules/installer/scriptitems.pm 2009-10-14 17:13:44.000000000 +0200
+--- solenv/bin/modules/installer/scriptitems.pm.old 2010-03-05 19:59:19.000000000 +0100
++++ solenv/bin/modules/installer/scriptitems.pm 2010-03-05 20:25:52.000000000 +0100
@@ -1373,8 +1373,10 @@ sub remove_Files_Without_Sourcedirectory
if ( ! ( $styles =~ /\bSTARREGISTRY\b/ )) # StarRegistry files will be created later
@@ -84,9 +81,9 @@
}
}
---- solenv/bin/modules/installer/profiles.pm 2008-07-21 14:04:00.000000000 +0100
-+++ solenv/bin/modules/installer/profiles.pm 2008-07-21 14:04:00.000000000 +0100
-@@ -91,20 +91,32 @@
+--- solenv/bin/modules/installer/profiles.pm.old 2010-02-02 12:49:41.000000000 +0100
++++ solenv/bin/modules/installer/profiles.pm 2010-03-05 20:25:52.000000000 +0100
+@@ -91,20 +91,32 @@ sub sorting_profile
# Adding the newly created profile into the file list
#####################################################################
@@ -111,40 +108,39 @@
+
sub add_profile_into_filelist
{
- my ($filesarrayref, $oneprofile, $completeprofilename, $allvariables) = @_;
+ my ($filesarrayref, $oneprofile, $completeprofilename, $allvariables) = @_;
- my %profile = ();
+ my %profile = ();
-- # Taking the base data from the "gid_File_Lib_Vcl"
+- # Taking the base data from the "gid_File_Lib_Vcl"
-
-- my $vclgid = "gid_File_Lib_Vcl";
-- if ( $allvariables->{'GLOBALFILEGID'} ) { $vclgid = $allvariables->{'GLOBALFILEGID'}; }
-- my $vclfile = installer::existence::get_specified_file($filesarrayref, $vclgid);
+- my $vclgid = "gid_File_Lib_Vcl";
+- if ( $allvariables->{'GLOBALFILEGID'} ) { $vclgid = $allvariables->{'GLOBALFILEGID'}; }
+- my $vclfile = installer::existence::get_specified_file($filesarrayref, $vclgid);
-
-- # copying all base data
-- installer::converter::copy_item_object($vclfile, \%profile);
+- # copying all base data
+- installer::converter::copy_item_object($vclfile, \%profile);
+ create_blank_profile (\%profile);
- # and overriding all new values
-
-
---- solenv/bin/modules/installer/packagelist.pm 2008-07-22 12:05:12.000000000 +0100
-+++ solenv/bin/modules/installer/packagelist.pm 2008-07-22 12:05:12.000000000 +0100
-@@ -501,6 +501,9 @@
- my $gid = $onepackage->{'module'};
- my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfile, "" , 0);
+ # and overriding all new values
+
+--- solenv/bin/modules/installer/packagelist.pm.old 2010-02-02 12:49:41.000000000 +0100
++++ solenv/bin/modules/installer/packagelist.pm 2010-03-05 20:25:52.000000000 +0100
+@@ -533,6 +533,9 @@ sub check_packagelist
+ my $gid = $onepackage->{'module'};
+ my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$scriptfile, "" , 0);
+ if ($$fileref eq "" && $installer::globals::split) {
+ $$fileref = $ENV{OO_INSTDIR} . "/solver/bin/" . $scriptfile;
+ }
- if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find script file $scriptfile for module $gid!", "check_packagelist"); }
+ if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find script file $scriptfile for module $gid!", "check_packagelist"); }
- my $infoline = "$gid: Using script file: \"$$fileref\"!\n";
-@@ -651,7 +654,13 @@
- # The file with package information has to be found in path list
- my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$packinfofile, "" , 0);
+ my $infoline = "$gid: Using script file: \"$$fileref\"!\n";
+@@ -683,7 +686,13 @@ sub collectpackages
+ # The file with package information has to be found in path list
+ my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$packinfofile, "" , 0);
-- if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $packinfofile for module $modulegid!", "collectpackages"); }
+- if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $packinfofile for module $modulegid!", "collectpackages"); }
+ if ( $$fileref eq "" && $installer::globals::split) {
+ $$fileref = $ENV{OO_INSTDIR} . "/solver/bin/" . $packinfofile;
+ }
@@ -153,29 +149,22 @@
+ installer::exiter::exit_program("ERROR: Could not find file $packinfofile for module $modulegid!", "collectpackages");
+ }
- my $infoline = "$modulegid: Using packinfo: \"$$fileref\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
-
-
-
---- solenv/bin/modules/installer/scpzipfiles.pm 2008-07-22 12:42:33.000000000 +0100
-+++ solenv/bin/modules/installer/scpzipfiles.pm 2008-07-22 12:42:33.000000000 +0100
-@@ -148,6 +148,8 @@
-
- my $onefilename = $onefile->{'Name'};
- my $sourcepath = $onefile->{'sourcepath'};
+ my $infoline = "$modulegid: Using packinfo: \"$$fileref\"!\n";
+ push( @installer::globals::logfileinfo, $infoline);
+--- solenv/bin/modules/installer/scpzipfiles.pm.old 2010-02-02 12:49:41.000000000 +0100
++++ solenv/bin/modules/installer/scpzipfiles.pm 2010-03-05 20:25:52.000000000 +0100
+@@ -146,6 +146,8 @@ sub resolving_scpzip_replace_flag
+
+ my $onefilename = $onefile->{'Name'};
+ my $sourcepath = $onefile->{'sourcepath'};
+
+ next if ($installer::globals::split && $sourcepath eq '');
-
- if ( $onefilename =~ /^\s*\Q$installer::globals::separator\E/ ) # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
- {
-
-
-
-
---- solenv/bin/make_installer.pl 2008-07-22 21:13:46.000000000 +0100
-+++ solenv/bin/make_installer.pl 2008-07-22 21:13:46.000000000 +0100
-@@ -302,6 +302,9 @@
+
+ if ( $onefilename =~ /^\s*\Q$installer::globals::separator\E/ ) # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
+ {
+--- solenv/bin/make_installer.pl.old 2010-02-02 12:49:41.000000000 +0100
++++ solenv/bin/make_installer.pl 2010-03-05 20:25:52.000000000 +0100
+@@ -305,6 +305,9 @@ if ( $$includepathref eq "" )
my $includepatharrayref = installer::converter::convert_stringlist_into_array($includepathref, ",");
if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray1.log" ,$includepatharrayref); }
@@ -185,12 +174,29 @@
installer::ziplist::replace_all_variables_in_pathes($includepatharrayref, $pathvariableshashref);
if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray2.log" ,$includepatharrayref); }
-
-
---- solenv/bin/modules/installer/worker.pm 2008-07-22 13:49:26.000000000 +0100
-+++ solenv/bin/modules/installer/worker.pm 2008-07-22 13:49:26.000000000 +0100
-@@ -730,6 +730,17 @@ sub remove_all_items_with_special_flag
- return \@allitems;
+@@ -897,7 +900,8 @@ for ( my $n = 0; $n <= $#installer::glob
+ # "regcomp" or "regcomp.exe". Therefore this function can only be executed on the
+ # corresponding platform.
+
+- if ( $installer::globals::servicesrdb_can_be_created )
++ if ( $installer::globals::servicesrdb_can_be_created &&
++ !$installer::globals::split)
+ {
+ installer::logger::print_message( "... creating preregistered services.rdb ...\n" );
+
+@@ -1016,7 +1020,7 @@ for ( my $n = 0; $n <= $#installer::glob
+ my $profilesinproductlanguageresolvedarrayref;
+ my $profileitemsinproductlanguageresolvedarrayref;
+
+- if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)))
++ if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)) && $ENV{OO_ALLOW_PROFILES})
+ {
+ installer::logger::print_message( "... creating profiles ...\n" );
+
+--- solenv/bin/modules/installer/worker.pm.old 2010-03-05 19:59:19.000000000 +0100
++++ solenv/bin/modules/installer/worker.pm 2010-03-05 20:25:52.000000000 +0100
+@@ -741,6 +741,17 @@ sub remove_all_items_with_special_flag
+ return \@allitems;
}
+# ugly hack, for reasons ~unknown the directory counting
@@ -207,23 +213,23 @@
###########################################################
# Mechanism for simple installation without packing
###########################################################
-@@ -748,6 +759,7 @@ sub install_simple ($$$$$$)
+@@ -759,6 +770,7 @@ sub install_simple ($$$$$$)
- my $destdir = $installer::globals::destdir;
- my @lines = ();
+ my $destdir = $installer::globals::destdir;
+ my @lines = ();
+ my @sources = ();
- installer::logger::print_message( "DestDir: $destdir \n" );
- installer::logger::print_message( "Rootpath: $installer::globals::rootpath \n" );
-@@ -797,11 +809,24 @@ sub install_simple ($$$$$$)
+ installer::logger::print_message( "DestDir: $destdir \n" );
+ installer::logger::print_message( "Rootpath: $installer::globals::rootpath \n" );
+@@ -808,11 +820,24 @@ sub install_simple ($$$$$$)
- push @lines, "$destination\n";
- # printf "cp $sourcepath $destdir$destination\n";
-- copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
-- my $sourcestat = stat($sourcepath);
-- utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
-- chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
-- push @lines, "$destination\n";
+ push @lines, "$destination\n";
+ # printf "cp $sourcepath $destdir$destination\n";
+- copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!";
+- my $sourcestat = stat($sourcepath);
+- utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
+- chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
+- push @lines, "$destination\n";
+
+ next if ($installer::globals::split && $sourcepath eq '');
+
@@ -242,16 +248,16 @@
+ push @lines, "$destination\n";
+ push @sources, "$sourcepath\n";
+ }
- }
-
- for ( my $i = 0; $i <= $#{$linksarray}; $i++ )
-@@ -826,9 +851,15 @@ sub install_simple ($$$$$$)
- push @lines, "$destination\n";
- }
+ }
+
+ for ( my $i = 0; $i <= $#{$linksarray}; $i++ )
+@@ -837,9 +862,15 @@ sub install_simple ($$$$$$)
+ push @lines, "$destination\n";
+ }
-- if ( $destdir ne "" )
-- {
-- my $filelist;
+- if ( $destdir ne "" )
+- {
+- my $filelist;
+ my ($filelist, $fname);
+ if ( $installer::globals::split ) {
+ # don't write file lists, just source lists
@@ -261,61 +267,38 @@
+ close ($filelist);
+ }
+ if ($destdir ne "" ) {
- my $fname = $installer::globals::destdir . "/$packagename";
- open ($filelist, ">$fname") || die "Can't open $fname: $!";
- print $filelist @lines;
-@@ -2292,6 +2323,9 @@ sub add_variables_from_inc_to_hashref
- $includefilename =~ s/^\s*//;
- $includefilename =~ s/\s*$//;
- $includefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$includefilename, $includepatharrayref, 1);
+ my $fname = $installer::globals::destdir . "/$packagename";
+ open ($filelist, ">$fname") || die "Can't open $fname: $!";
+ print $filelist @lines;
+@@ -2317,6 +2348,9 @@ sub add_variables_from_inc_to_hashref
+ $includefilename =~ s/^\s*//;
+ $includefilename =~ s/\s*$//;
+ $includefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$includefilename, $includepatharrayref, 1);
+ if ($$includefilenameref eq "" && $installer::globals::split) {
+ $$includefilenameref = $ENV{OO_INSTDIR} . "/solver/bin/" . $includefilename;
+ }
- if ( $$includefilenameref eq "" ) { installer::exiter::exit_program("Include file $includefilename not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); }
+ if ( $$includefilenameref eq "" ) { installer::exiter::exit_program("Include file $includefilename not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); }
- $infoline = "Including inc file: $$includefilenameref \n";
-@@ -2916,6 +2950,9 @@ sub set_spellcheckerlanguages
+ $infoline = "Including inc file: $$includefilenameref \n";
+@@ -2954,6 +2988,9 @@ sub set_spellcheckerlanguages
{
- my ( $productlanguagesarrayref, $allvariables ) = @_;
+ my ( $productlanguagesarrayref, $allvariables ) = @_;
+ # short circuit in split mode
+ return if ($installer::globals::split);
+
- my %productlanguages = ();
- for ( my $i = 0; $i <= $#{$productlanguagesarrayref}; $i++ ) { $productlanguages{${$productlanguagesarrayref}[$i]} = 1; }
-
---- solenv/bin/make_installer.pl 2008-07-18 17:58:25.000000000 +0100
-+++ solenv/bin/make_installer.pl 2008-07-18 17:58:25.000000000 +0100
-@@ -834,7 +834,8 @@
- # "regcomp" or "regcomp.exe". Therefore this function can only be executed on the
- # corresponding platform.
-
-- if ( $installer::globals::servicesrdb_can_be_created )
-+ if ( $installer::globals::servicesrdb_can_be_created &&
-+ !$installer::globals::split)
- {
- installer::logger::print_message( "... creating preregistered services.rdb ...\n" );
-
-@@ -950,7 +951,7 @@
- my $profilesinproductlanguageresolvedarrayref;
- my $profileitemsinproductlanguageresolvedarrayref;
-
-- if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)))
-+ if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)) && $ENV{OO_ALLOW_PROFILES})
- {
- installer::logger::print_message( "... creating profiles ...\n" );
-
-
-
---- solenv/bin/modules/installer/regmerge.pm 2008-07-23 20:50:16.000000000 +0100
-+++ solenv/bin/modules/installer/regmerge.pm 2008-07-23 20:50:16.000000000 +0100
-@@ -135,6 +135,9 @@
- else { $searchname = "regcomplazy.exe"; }
-
- my $regmergefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, $includepatharrayref, 1);
+ my %productlanguages = ();
+ for ( my $i = 0; $i <= $#{$productlanguagesarrayref}; $i++ ) { $productlanguages{${$productlanguagesarrayref}[$i]} = 1; }
+
+--- solenv/bin/modules/installer/regmerge.pm.old 2010-02-02 12:49:41.000000000 +0100
++++ solenv/bin/modules/installer/regmerge.pm 2010-03-05 20:25:52.000000000 +0100
+@@ -135,6 +135,9 @@ sub get_regmerge_file
+ else { $searchname = "regcomplazy.exe"; }
+
+ my $regmergefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, $includepatharrayref, 1);
+ if ( $$regmergefileref eq "" && $installer::globals::split) {
+ $$regmergefileref = $ENV{OO_INSTDIR} . "/solver/bin/" . $searchname;
+ }
- if ( $$regmergefileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for merging the StarRegistry!", "get_regmerge_file"); }
-
- return $$regmergefileref;
+ if ( $$regmergefileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for merging the StarRegistry!", "get_regmerge_file"); }
+
+ return $$regmergefileref;
diff --git a/patches/dev300/piece-svx.diff b/patches/dev300/piece-svx.diff
index 665a2c3..f5135ce 100644
--- a/patches/dev300/piece-svx.diff
+++ b/patches/dev300/piece-svx.diff
@@ -1,41 +1,40 @@
---- svx/sdi/makefile.mk
-+++ svx/sdi/makefile.mk
-@@ -48,7 +48,7 @@
+--- svx/sdi/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
++++ svx/sdi/makefile.mk 2010-03-05 20:09:17.000000000 +0100
+@@ -50,7 +50,7 @@ SVSDI1DEPEND= \
svxitems.sdi \
- fmslots.sdi \
- svx.sdi \
-- $(SOLARINCXDIR)$/sfxslots.ilb \
+ fmslots.sdi \
+ svx.sdi \
+- $(SOLARINCXDIR)$/sfxslots.ilb \
+ $(SOLARPIECE)$/$(INPATH)$/inc$/sfxslots.ilb \
- xoitems.sdi \
- svxitems.sdi
+ xoitems.sdi \
+ svxitems.sdi
---- svx/util/makefile.mk
-+++ svx/util/makefile.mk
-@@ -206,7 +206,7 @@
- $(SRS)$/svxlink.srs \
- $(SRS)$/accessibility.srs \
- $(SRS)$/toolbars.srs \
-- $(SOLARCOMMONRESDIR)$/sfx.srs
+--- svx/util/makefile.mk.old 2010-03-05 19:59:26.000000000 +0100
++++ svx/util/makefile.mk 2010-03-05 20:09:17.000000000 +0100
+@@ -307,7 +307,7 @@ SRSFILELIST=\
+ $(SRS)$/accessibility.srs \
+ $(SRS)$/table.srs \
+ $(SRS)$/toolbars.srs \
+- $(SOLARCOMMONRESDIR)$/sfx.srs
+ $(SOLARPIECE)$/$(INPATH)$/res$/sfx.srs
RESLIB1NAME=svx
RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw
-
---- svx/source/src/makefile.mk
-+++ svx/source/src/makefile.mk
-@@ -44,8 +44,8 @@
+--- svx/source/src/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
++++ svx/source/src/makefile.mk 2010-03-05 20:09:17.000000000 +0100
+@@ -44,8 +44,8 @@ TARGET=ofa
RES1FILELIST=\
- $(SRS)$/app.srs \
- $(SOLARCOMMONRESDIR)$/svtools.srs \
-- $(SOLARCOMMONRESDIR)$/sfx.srs \
-- $(SOLARCOMMONRESDIR)$/basic.srs
+ $(SRS)$/app.srs \
+ $(SOLARCOMMONRESDIR)$/svtools.srs \
+- $(SOLARCOMMONRESDIR)$/sfx.srs \
+- $(SOLARCOMMONRESDIR)$/basic.srs
+ $(SOLARPIECE)$/$(INPATH)$/res$/sfx.srs \
+ $(SOLARPIECE)$/$(INPATH)$/res$/basic.srs
RESLIB1NAME=$(TARGET)
RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/src
---- svx/uiconfig/layout/layout.mk.old 2010-02-18 19:57:03.000000000 +0100
-+++ svx/uiconfig/layout/layout.mk 2010-02-18 20:01:01.000000000 +0100
+--- svx/uiconfig/layout/layout.mk.old 2010-03-05 19:59:23.000000000 +0100
++++ svx/uiconfig/layout/layout.mk 2010-03-05 20:09:17.000000000 +0100
@@ -1,4 +1,4 @@
-TRALAY=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/tralay
+TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
More information about the ooo-build-commit
mailing list