[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300
Michael Meeks
michael at kemper.freedesktop.org
Fri Apr 8 13:27:50 PDT 2011
patches/dev300/apply | 20 -
patches/dev300/config_office-XINC-XLIB-defaults.diff | 35 --
patches/dev300/disable-python.diff | 255 -------------------
patches/dev300/gentoo-sandbox.diff | 11
patches/dev300/jvm-search-path.diff | 224 ----------------
5 files changed, 1 insertion(+), 544 deletions(-)
New commits:
commit de513b3301b1198d973347e39138627721ece05a
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Apr 8 21:26:34 2011 +0100
remove Gentoo pieces that Hanno has merged
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9435c7b..dcee9f3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -80,8 +80,7 @@ Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, No
# openmamba
openmamba: LinuxCommon, GlobalDesktopFiles
#Gentoo
-GentooBase : LinuxCommon, GentooOnly, BerkeleyDB43
-GentooUnstable: GentooBase, GentooExperimental
+GentooBase : LinuxCommon, BerkeleyDB43
Gentoo : GentooBase
Gentoo64: GentooBase
# rPath Linux
@@ -469,18 +468,6 @@ jdbc-driver-classpaths-debian.diff
# fixes for visual studio express 2005 ( ooo-build only )
2005-express-stl-remove.diff, noelpwer, i#71404
-[ GentooOnly ]
-SectionOwner => aprosky
-
-# support server-only versions of 64bit JDKs
-64bit-jdk-server-paths.diff, i#65974, hmth
-# default inc/lib
-config_office-XINC-XLIB-defaults.diff, i#65976
-# Sandbox problem with wrong path
-gentoo-sandbox.diff
-# specific JVM search path
-jvm-search-path.diff
-
[ DebianBaseOnly ]
SectionOwner => rengelha
@@ -1545,11 +1532,6 @@ speed-sfx2-dont-throw-too-much.diff, i#107512, jholesov
calc-pdf-export-allow-filtered-range-sc.diff, n#585028, kohei
calc-pdf-export-allow-filtered-range-filter.diff, n#585028, kohei
-[ GentooExperimental ]
-SectionOwner => hmth
-# make Python2 optional
-disable-python.diff
-
[ Netbook ]
vcl-netbook.diff, rodo
diff --git a/patches/dev300/config_office-XINC-XLIB-defaults.diff b/patches/dev300/config_office-XINC-XLIB-defaults.diff
deleted file mode 100644
index 17b2d25..0000000
--- a/patches/dev300/config_office-XINC-XLIB-defaults.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.in.orig 2009-02-20 15:35:35.000000000 +0100
-+++ configure.in 2009-02-20 15:37:24.000000000 +0100
-@@ -4536,20 +4536,9 @@
- if test -z "$x_libraries"; then
- x_libraries="no_x_libraries"
- fi
--if test "$x_includes" = "default_x_includes"; then
-- XINC="/usr/include"
--else
-- XINC="$x_includes"
--fi
-+XINC="$x_includes"
-+XLIB="$x_libraries"
- AC_SUBST(XINC)
--if test "$x_libraries" = "default_x_libraries"; then
-- XLIB=`$PKG_CONFIG --variable=libdir x11`
-- if test "x$XLIB" = x; then
-- XLIB="/usr/lib"
-- fi
--else
-- XLIB="$x_libraries"
--fi
- AC_SUBST(XLIB)
- AC_SUBST(XAU_LIBS)
-
-@@ -6200,6 +6189,9 @@
- XINERAMA_LINK=dynamic
- AC_MSG_RESULT([yes])
- elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
-+ if test "$x_libraries" = "default_x_libraries"; then
-+ XLIB="/usr/lib"
-+ fi
- if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
- # we have both versions, let the user decide but use the dynamic one
- # per default
diff --git a/patches/dev300/disable-python.diff b/patches/dev300/disable-python.diff
deleted file mode 100644
index 8391c84..0000000
--- a/patches/dev300/disable-python.diff
+++ /dev/null
@@ -1,255 +0,0 @@
---- configure.in.orig 2010-01-02 16:33:48.000000000 +0100
-+++ configure.in 2010-01-02 16:44:30.000000000 +0100
-@@ -215,6 +215,9 @@
- using the cheaper standard compiler. )
- ],,)
-
-+AC_ARG_ENABLE(python,
-+[ --disable-python Disable build of Python 2.x UNO API
-+],,)
- AC_ARG_ENABLE(gtk,
- [ --disable-gtk Determines whether to use Gtk+ vclplug on platforms
- where Gtk+ is available.
-@@ -4104,8 +4107,13 @@
- AC_SUBST(LIBXML_LIBS)
-
- dnl ===================================================================
--dnl Check for system python
-+dnl Check for python
- dnl ===================================================================
-+AC_MSG_CHECKING([whether to enable Python 2.x UNO API])
-+if test "$enable_python" != "no"; then
-+ AC_MSG_RESULT([yes])
-+ BUILD_TYPE="$BUILD_TYPE PYUNO"
-+
- AC_MSG_CHECKING([which python to use])
- if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
- with_system_python=yes
-@@ -4153,6 +4159,12 @@
- AC_SUBST(PYTHON_LIBS)
- HOME=`echo $HOME | sed 's:\\\\:/:g'`
- AC_SUBST(HOME)
-+dnl disable python
-+else
-+AC_MSG_RESULT([no])
-+DISABLE_PYTHON=TRUE
-+AC_SUBST(DISABLE_PYTHON)
-+fi
-
- dnl ===================================================================
- dnl Check for system berkley db
---- set_soenv.in.orig 2010-01-02 15:50:06.000000000 +0100
-+++ set_soenv.in 2010-01-02 16:46:20.000000000 +0100
-@@ -1879,6 +1879,7 @@
- ToFile( "SYSTEM_OPENSSL", "@SYSTEM_OPENSSL@", "e" );
- ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" );
- ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" );
-+ToFile( "DISABLE_PYTHON", "@DISABLE_PYTHON@", "e" );
- ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" );
- ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" );
- ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" );
---- postprocess/prj/build.lst.orig 2010-01-02 17:25:56.000000000 +0100
-+++ postprocess/prj/build.lst 2010-01-02 17:26:22.000000000 +0100
-@@ -1,4 +1,4 @@
--po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui 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 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign CT2N:ct2n NLPSOLVER:nlpsolver LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver NULL
-+po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui 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 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries PYUNO:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign CT2N:ct2n NLPSOLVER:nlpsolver LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver 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
---- testtools/prj/build.lst.orig 2010-01-02 17:26:31.000000000 +0100
-+++ testtools/prj/build.lst 2010-01-02 17:26:41.000000000 +0100
-@@ -1,4 +1,4 @@
--tt testtools : cpputools io remotebridges stoc javaunohelper pyuno cli_ure offapi QADEVOOO:qadevOOo NULL
-+tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi QADEVOOO:qadevOOo NULL
- tt testtools\inc nmake - all tt_inc NULL
- tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_javaTestObjs tt_inc NULL
- tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL
---- testtools/source/bridgetest/pyuno/makefile.mk.orig 2010-01-02 17:31:46.000000000 +0100
-+++ testtools/source/bridgetest/pyuno/makefile.mk 2010-01-02 17:32:00.000000000 +0100
-@@ -41,6 +41,7 @@
-
- .INCLUDE : settings.mk
- # --- Files --------------------------------------------------------
-+.IF "$(DISABLE_PYTHON)" != "TRUE"
- .IF "$(L10N_framework)"==""
- PYEXC=$(DLLDEST)$/python$(EXECPOST)
- REGEXC=$(DLLDEST)$/regcomp$(EXECPOST)
-@@ -91,8 +92,11 @@
- doc \
- ALLTAR
- .ENDIF # L10N_framework
-+.ENDIF # DISABLE_PYTHON
-
- .INCLUDE : target.mk
-+
-+.IF "$(DISABLE_PYTHON)" != "TRUE"
- .IF "$(L10N_framework)"==""
- $(DLLDEST)$/%.py: %.py
- cp $? $@
-@@ -117,4 +121,5 @@
- cd $(DLLDEST) && $(TEST_ENV) && $(WRAPCMD) $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \
- -l com.sun.star.loader.Python -c vnd.sun.star.expand:$$FOO/samplecomponent.py
- .ENDIF # L10N_framework
-+.ENDIF # DISABLE_PYTHON
-
---- scp2/source/python/makefile.mk.orig 2010-01-02 17:34:50.000000000 +0100
-+++ scp2/source/python/makefile.mk 2010-01-02 17:37:33.000000000 +0100
-@@ -41,11 +41,15 @@
-
- .INCLUDE : settings.mk
-
-+.IF "$(DISABLE_PYTHON)" == "TRUE"
-+SCPDEFS+=-DDISABLE_PYUNO
-+.ELSE
- .IF "$(SYSTEM_PYTHON)" == "YES"
- SCPDEFS+=-DSYSTEM_PYTHON
- .ELSE
- .INCLUDE : pyversion.mk
- .ENDIF
-+.ENDIF
-
- SCPDEFS+=\
- -DPYVERSION=$(PYVERSION) -DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \
---- scp2/source/python/file_python.scp.orig 2010-01-02 17:38:00.000000000 +0100
-+++ scp2/source/python/file_python.scp 2010-01-02 17:40:06.000000000 +0100
-@@ -30,6 +30,8 @@
-
- #include "macros.inc"
-
-+#ifndef DISABLE_PYUNO
-+
- File gid_File_Lib_Pyuno
- TXT_FILE_BODY;
- #ifdef UNX
-@@ -157,3 +159,5 @@
-
- #endif
-
-+// DISABLE_PYUNO
-+#endif
---- scp2/source/python/profileitem_python.scp.orig 2010-01-02 17:40:50.000000000 +0100
-+++ scp2/source/python/profileitem_python.scp 2010-01-02 17:41:43.000000000 +0100
-@@ -30,6 +30,7 @@
-
- #include "macros.inc"
-
-+#ifndef DISABLE_PYUNO
-
- Profile gid_Profile_Pythonloader_Uno_Ini
- ModuleID = gid_Module_Optional_Pyuno;
-@@ -83,3 +84,6 @@
- #endif
- #endif
- End
-+
-+// DISABLE_PYUNO
-+#endif
---- scp2/source/python/module_python.scp.orig 2010-01-02 17:44:06.000000000 +0100
-+++ scp2/source/python/module_python.scp 2010-01-02 17:44:16.000000000 +0100
-@@ -30,6 +30,8 @@
-
- #include "macros.inc"
-
-+#ifndef DISABLE_PYUNO
-+
- Module gid_Module_Optional_Pyuno
- PackageInfo = "packinfo_office.txt";
- MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
-@@ -40,3 +42,5 @@
- Default = YES;
- Styles = ( );
- End
-+
-+#endif
---- scp2/source/python/module_python_mailmerge.scp.orig 2010-01-02 17:44:38.000000000 +0100
-+++ scp2/source/python/module_python_mailmerge.scp 2010-01-02 17:44:51.000000000 +0100
-@@ -30,6 +30,7 @@
- #include "macros.inc"
-
- #ifndef AIX
-+#ifndef DISABLE_PYUNO
- File gid_File_Pymailmerge
- TXT_FILE_BODY;
- Dir = gid_Dir_Program;
-@@ -37,3 +39,4 @@
- Styles = (PACKED,UNO_COMPONENT);
- End
- #endif
-+#endif
---- scp2/source/ooo/makefile.mk.orig 2010-01-02 17:47:45.000000000 +0100
-+++ scp2/source/ooo/makefile.mk 2010-01-02 17:48:19.000000000 +0100
-@@ -241,9 +241,13 @@
- SCPDEFS+=-DDISABLE_ATL
- .ENDIF
-
-+.IF "$(DISABLE_PYTHON)" == "TRUE"
-+SCPDEFS+=-DDISABLE_PYUNO
-+.ELSE
- .IF "$(SYSTEM_PYTHON)" == "YES"
- SCPDEFS+=-DSYSTEM_PYTHON
- .ENDIF
-+.ENDIF
-
- .IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
- SCPDEFS+=-DSYSTEM_LIBTEXTCAT
---- scp2/source/ooo/common_brand.scp.orig 2010-01-02 17:48:26.000000000 +0100
-+++ scp2/source/ooo/common_brand.scp 2010-01-02 17:49:41.000000000 +0100
-@@ -1373,7 +1373,7 @@
- #endif
-
- //TODO: This actually belongs into a module of its own:
--#if !defined SYSTEM_PYTHON
-+#if !defined DISABLE_PYUNO && !defined SYSTEM_PYTHON
- File gid_Brand_File_Bin_Python
- BIN_FILE_BODY;
- Name = EXENAME(pyuno/python);
---- scripting/source/pyprov/makefile.mk.orig 2010-01-02 17:58:48.000000000 +0100
-+++ scripting/source/pyprov/makefile.mk 2010-01-02 17:59:16.000000000 +0100
-@@ -42,6 +42,7 @@
-
-
- # --- Targets ------------------------------------------------------
-+.IF "$(DISABLE_PYTHON)" != "TRUE"
- ALL : ALLTAR \
- $(DLLDEST)$/pythonscript.py \
- $(DLLDEST)$/officehelper.py \
-@@ -49,5 +50,6 @@
-
- $(DLLDEST)$/%.py: %.py
- cp $? $@
-+.ENDIF
-
- .INCLUDE : target.mk
---- instsetoo_native/util/makefile.mk.orig 2010-01-03 00:08:04.000000000 +0100
-+++ instsetoo_native/util/makefile.mk 2010-01-03 00:09:45.000000000 +0100
-@@ -72,6 +72,7 @@
-
- .INCLUDE: target.mk
-
-+.IF "$(DISABLE_PYTHON)" != "TRUE"
- LOCALPYFILES= \
- $(BIN)$/uno.py \
- $(BIN)$/unohelper.py \
-@@ -79,6 +80,7 @@
- $(BIN)$/pythonscript.py \
- $(BIN)$/officehelper.py \
- $(BIN)$/mailmerge.py
-+.ENDIF
-
- xxxx:
- echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
-@@ -365,12 +367,14 @@
- .ENDIF # "$(alllangiso)"!=""
- .ENDIF
-
-+.IF "$(DISABLE_PYTHON)" != "TRUE"
- .IF "$(LOCALPYFILES)"!=""
- $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
- .ENDIF # "$(LOCALPYFILES)"!=""
-
- $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
- @$(COPY) $< $@
-+.ENDIF # "$(DISABLE_PYTHON)" != "TRUE"
-
- $(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand$/intro.zip
- $(COPY) $< $@
diff --git a/patches/dev300/gentoo-sandbox.diff b/patches/dev300/gentoo-sandbox.diff
deleted file mode 100644
index 9249da2..0000000
--- a/patches/dev300/gentoo-sandbox.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- officecfg/util/makefile.mk
-+++ officecfg/util/makefile.mk
-@@ -41,7 +41,6 @@
-
- $(MISC)$/$(TARGET)_delzip :
- -$(RM) $(BIN)$/registry_{$(alllangiso)}.zip
-- -$(RM) $(COMMON_OUTPUT)$/bin$/registry_{$(alllangiso)}.zip
-
- $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
- cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*
-
diff --git a/patches/dev300/jvm-search-path.diff b/patches/dev300/jvm-search-path.diff
deleted file mode 100644
index 8f94971..0000000
--- a/patches/dev300/jvm-search-path.diff
+++ /dev/null
@@ -1,224 +0,0 @@
---- configure.in.orig 2009-04-06 15:15:26.000000000 +0200
-+++ configure.in 2009-04-06 15:32:04.000000000 +0200
-@@ -614,6 +614,14 @@
- plugin
- ],,)
-
-+AC_ARG_WITH(jvm-path,
-+[ --with-jvm-path Use a specific JVM search path at runtime.
-+
-+ Usage: --with-jvm-path=<absolute path to parent of jvm home>
-+
-+ e. g.: --with-jvm-path=/usr/lib/
-+ to find JRE/JDK in /usr/lib/jvm/
-+],,)
- AC_ARG_ENABLE(gcjaot,
- [ --enable-gcjaot Build with[[out]] using Ahead of Time java compilation
- support to speed up buildsi by compiling the jars also
-@@ -3172,6 +3180,26 @@
- fi
-
- dnl ===================================================================
-+dnl Check for runtime JVM search path
-+dnl ===================================================================
-+if test "$SOLAR_JAVA" != ""; then
-+ AC_MSG_CHECKING([whether to use specific JVM search path at runtime])
-+ if test -n "$with_jvm_path" && test "$with_jvm_path" != "no"; then
-+ AC_MSG_RESULT([yes])
-+ if ! test -d "$with_jvm_path"; then
-+ AC_MSG_ERROR(["$with_jvm_path" not a directory])
-+ fi
-+ if ! test -d "$with_jvm_path"jvm; then
-+ AC_MSG_ERROR(["$with_jvm_path"jvm not found, point with_jvm_path to \[/path/to/\]jvm])
-+ fi
-+ JVM_ONE_PATH_CHECK="$with_jvm_path"
-+ AC_SUBST(JVM_ONE_PATH_CHECK)
-+ else
-+ AC_MSG_RESULT([no])
-+ fi
-+fi
-+
-+dnl ===================================================================
- dnl Check for optional gcj for AOT
- dnl ===================================================================
- if test "$SOLAR_JAVA" != ""; then
---- set_soenv.in.orig 2009-04-06 15:36:07.000000000 +0200
-+++ set_soenv.in 2009-04-06 15:40:31.000000000 +0200
-@@ -1863,6 +1863,7 @@
- ToFile( "JAVACOMPILER", PathFormat("@JAVACOMPILER@"), "e" );
- ToFile( "JAVAAOTCOMPILER", PathFormat("@JAVAAOTCOMPILER@"), "e" );
- ToFile( "JAVADOC", PathFormat("@JAVADOC@"), "e" );
-+ ToFile( "JVM_ONE_PATH_CHECK", "@JVM_ONE_PATH_CHECK@", "e" );
- }
- ToFile( "SCPDEFS", '@SCPDEFS@', "e" );
- ToFile( "SOLAREXTRAINC", $SOLAREXTRAINC, "e" );
---- jvmfwk/plugins/sunmajor/pluginlib/makefile.mk.orig 2009-04-06 14:38:34.000000000 +0200
-+++ jvmfwk/plugins/sunmajor/pluginlib/makefile.mk 2009-04-06 14:40:44.000000000 +0200
-@@ -84,6 +84,10 @@
- .ENDIF # GCC
- .ENDIF #WNT
-
-+.IF "$(JVM_ONE_PATH_CHECK)" != ""
-+CFLAGS += -DJVM_ONE_PATH_CHECK=\"$(JVM_ONE_PATH_CHECK)\"
-+.ENDIF
-+
- SHL1VERSIONMAP = sunjavaplugin.map
- SHL1DEPN=
- SHL1IMPLIB= i$(UNOCOMPONENT1)
---- jvmfwk/plugins/sunmajor/pluginlib/util.hxx.orig 2009-04-06 18:12:49.000000000 +0200
-+++ jvmfwk/plugins/sunmajor/pluginlib/util.hxx 2009-04-06 18:13:37.000000000 +0200
-@@ -120,6 +120,9 @@
-
- bool getJavaProps(
- const rtl::OUString & exePath,
-+#ifdef JVM_ONE_PATH_CHECK
-+ const rtl::OUString & homePath,
-+#endif
- std::vector<std::pair<rtl::OUString, rtl::OUString> >& props,
- bool * bProcessRun);
-
---- jvmfwk/plugins/sunmajor/pluginlib/util.cxx.orig 2009-04-01 11:57:29.000000000 +0200
-+++ jvmfwk/plugins/sunmajor/pluginlib/util.cxx 2009-04-06 18:12:09.000000000 +0200
-@@ -88,12 +88,14 @@
- */
- char const *g_arCollectDirs[] = {
- "",
-+#ifndef JVM_ONE_PATH_CHECK
- "j2re/",
- "j2se/",
- "j2sdk/",
- "jdk/",
- "jre/",
- "java/",
-+#endif
- "jvm/"
- };
-
-@@ -105,6 +107,7 @@
- "",
- "System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/"
- #else
-+#ifndef JVM_ONE_PATH_CHECK
- "",
- "usr/",
- "usr/local/",
-@@ -115,6 +118,9 @@
- #endif
- "usr/lib/",
- "usr/bin/"
-+#else
-+ JVM_ONE_PATH_CHECK
-+#endif
- #endif
- };
- }
-@@ -362,6 +368,9 @@
-
-
- bool getJavaProps(const OUString & exePath,
-+#ifdef JVM_ONE_PATH_CHECK
-+ const OUString & homePath,
-+#endif
- std::vector<std::pair<rtl::OUString, rtl::OUString> >& props,
- bool * bProcessRun)
- {
-@@ -459,6 +468,15 @@
- OUString sKey = sLine.copy(0, index);
- OUString sVal = sLine.copy(index + 1);
-
-+#ifdef JVM_ONE_PATH_CHECK
-+ //replace absolute path by linux distro link
-+ OUString sHomeProperty(RTL_CONSTASCII_USTRINGPARAM("java.home"));
-+ if(sHomeProperty.equals(sKey))
-+ {
-+ sVal = homePath + OUString::createFromAscii("/jre");
-+ }
-+#endif
-+
- props.push_back(std::make_pair(sKey, sVal));
- }
-
-@@ -735,10 +753,12 @@
- createJavaInfoFromWinReg(vecInfos);
- #endif // WNT
-
-+#ifndef JVM_ONE_PATH_CHECK
- createJavaInfoFromJavaHome(vecInfos);
- //this function should be called after createJavaInfoDirScan.
- //Otherwise in SDKs Java may be started twice
- createJavaInfoFromPath(vecInfos);
-+#endif
-
- #ifdef UNX
- createJavaInfoDirScan(vecInfos);
-@@ -800,7 +820,11 @@
- if (item.getFileStatus(status) == File::E_None
- && status.getFileType() == FileStatus::Directory)
- {
-+#ifndef JVM_ONE_PATH_CHECK
- ret = sResolved;
-+#else
-+ ret = path;
-+#endif
- }
- }
- else
-@@ -829,7 +853,11 @@
- if (item.getFileStatus(status) == File::E_None
- && status.getFileType() == FileStatus::Regular)
- {
-+#ifndef JVM_ONE_PATH_CHECK
- ret = sResolved;
-+#else
-+ ret = path;
-+#endif
- }
- }
- else
-@@ -924,7 +952,11 @@
- }
-
- bool bProcessRun= false;
-- if (getJavaProps(sFilePath, props, & bProcessRun) == false)
-+ if (getJavaProps(sFilePath,
-+#ifdef JVM_ONE_PATH_CHECK
-+ sResolvedDir,
-+#endif
-+ props, & bProcessRun) == false)
- {
- //The java executable could not be run or the system properties
- //could not be retrieved. We can assume that this java is corrupt.
-@@ -943,7 +975,11 @@
- //invoked to build the path to the executable. It we start the script directy as .java_wrapper
- //then it tries to start a jdk/.../native_threads/.java_wrapper. Therefore the link, which
- //is named java, must be used to start the script.
-- getJavaProps(sFullPath, props, & bProcessRun);
-+ getJavaProps(sFullPath,
-+#ifdef JVM_ONE_PATH_CHECK
-+ sResolvedDir,
-+#endif
-+ props, & bProcessRun);
- // Either we found a working 1.3.1
- //Or the java is broken. In both cases we stop searchin under this "root" directory
- bBreak = true;
---- jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx.orig 2009-04-06 18:37:43.000000000 +0200
-+++ jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx 2009-04-06 18:38:55.000000000 +0200
-@@ -132,6 +132,7 @@
- }
- else if (!bHome && sHomeProperty.equals(i->first))
- {
-+#ifndef JVM_ONE_PATH_CHECK
- OUString fileURL;
- if (osl_getFileURLFromSystemPath(i->second.pData,& fileURL.pData) ==
- osl_File_E_None)
-@@ -145,6 +146,10 @@
- bHome = true;
- }
- }
-+#else
-+ m_sHome = i->second;
-+ bHome = true;
-+#endif
- }
- else if (!bAccess && sAccessProperty.equals(i->first))
- {
More information about the Libreoffice-commits
mailing list