[ooo-build-commit] Branch 'ooo/master' - 2 commits - cli_ure/version jvmfwk/plugins unoil/climaker
Jan Holesovsky
kendy at kemper.freedesktop.org
Sat Jun 13 19:10:29 PDT 2009
cli_ure/version/version.txt | 24 +++++++++++------------
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2 -
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 15 +++++++++++---
unoil/climaker/version.txt | 6 ++---
4 files changed, 28 insertions(+), 19 deletions(-)
New commits:
commit 10f78f8679257439a39de67a2f959926287b9ca1
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Jun 12 20:38:47 2009 +0000
CWS-TOOLING: integrate CWS ooo31osol_DEV300
2009-05-14 15:49:09 +0200 ihi r271896 : #i101913# added missing solaris entries
2009-05-14 12:36:19 +0200 ihi r271885 : #i101913# ARCH -> all
2009-05-13 11:14:52 +0200 jl r271846 : #i101457# Do not search for Java every time OOo starts
2009-05-13 08:49:28 +0200 jl r271838 : #tr6585548# Redone last change. On Solaris we do not scan the directories anymore and instead just ckeck /usr/jdk/latest
2009-05-12 17:10:03 +0200 jl r271828 : #i64357# We scan on Unix only for a java in different folders if we haven't found one by looking into JAVA_HOME or PATH
2009-05-12 13:17:04 +0200 releng r271819 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
2009-05-12 13:08:28 +0200 is r271816 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 2871541..5c2fff1 100755
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -106,7 +106,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
errcode = jfw_existJRE(pInfo, &bExist);
if (errcode == JFW_E_NONE)
{
- if (false == findAndSelect(&pInfo))
+ if (!bExist && !findAndSelect(&pInfo))
return -1;
}
else
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 9963900..2bf20dd 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -740,9 +740,8 @@ vector<Reference<VendorBase> > getAllJREInfos()
//Otherwise in SDKs Java may be started twice
createJavaInfoFromPath(vecInfos);
-#ifdef UNX
createJavaInfoDirScan(vecInfos);
-#endif
+
bubbleSortVersion(vecInfos);
return vecInfos;
}
@@ -1114,6 +1113,15 @@ bool makeDriveLetterSame(OUString * fileURL)
}
#ifdef UNX
+#ifdef SOLARIS
+
+void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
+{
+ JFW_TRACE2(OUSTR("\n[Java framework] Checking \"/usr/jdk/latest\"\n"));
+ getJREInfoByPath(OUSTR("file:////usr/jdk/latest"), vecInfos);
+}
+
+#else
void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
{
OUString excMessage = OUSTR("[Java framework] sunjavaplugin: "
@@ -1236,5 +1244,6 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
}
}
}
-#endif
+#endif // ifdef SOLARIS
+#endif // ifdef UNX
}
commit e959c8bc9999944a1fa71d31957e9047c32b5945
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Jun 12 19:50:49 2009 +0000
CWS-TOOLING: integrate CWS jl126_DEV300
2009-05-29 11:45:28 +0200 jl r272444 : #i102355# new assembly versions
2009-05-29 11:14:35 +0200 jl r272441 : #i102355# new assembly versions
2009-05-29 11:08:25 +0200 jl r272439 : #i102355# test lib for 3.1 version
2009-05-29 08:43:22 +0200 jl r272432 : CWS-TOOLING: rebase CWS jl126 to branches/OOO310 at 272261 (milestone: OOO310:m12)
2009-04-30 21:12:02 +0200 jl r271426 : CWS-TOOLING: rebase CWS jl126 to branches/OOO310 at 271208 (milestone: OOO310:m11)
diff --git a/cli_ure/version/version.txt b/cli_ure/version/version.txt
index a5b40dd..d6115b8 100644
--- a/cli_ure/version/version.txt
+++ b/cli_ure/version/version.txt
@@ -29,23 +29,23 @@
#
#*************************************************************************
-CLI_URETYPES_NEW_VERSION=1.0.2.0
-CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.1.0
-CLI_URETYPES_POLICY_VERSION=2.0.0.0
+CLI_URETYPES_NEW_VERSION=1.0.3.0
+CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.2.0
+CLI_URETYPES_POLICY_VERSION=3.0.0.0
CLI_URETYPES_POLICY_ASSEMBLY=policy.1.0.cli_uretypes
-CLI_BASETYPES_NEW_VERSION=1.0.13.0
-CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.12.0
-CLI_BASETYPES_POLICY_VERSION=13.0.0.0
+CLI_BASETYPES_NEW_VERSION=1.0.14.0
+CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.13.0
+CLI_BASETYPES_POLICY_VERSION=14.0.0.0
CLI_BASETYPES_POLICY_ASSEMBLY=policy.1.0.cli_basetypes
-CLI_URE_NEW_VERSION=1.0.16.0
-CLI_URE_OLD_VERSION=1.0.0.0-1.0.15.0
-CLI_URE_POLICY_VERSION=16.0.0.0
+CLI_URE_NEW_VERSION=1.0.17.0
+CLI_URE_OLD_VERSION=1.0.0.0-1.0.16.0
+CLI_URE_POLICY_VERSION=17.0.0.0
CLI_URE_POLICY_ASSEMBLY=policy.1.0.cli_ure
-CLI_CPPUHELPER_NEW_VERSION=1.0.16.0
-CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.15.0
-CLI_CPPUHELPER_POLICY_VERSION=16.0.0.0
+CLI_CPPUHELPER_NEW_VERSION=1.0.17.0
+CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.16.0
+CLI_CPPUHELPER_POLICY_VERSION=17.0.0.0
CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper
diff --git a/unoil/climaker/version.txt b/unoil/climaker/version.txt
index bdab589..867c3d4 100644
--- a/unoil/climaker/version.txt
+++ b/unoil/climaker/version.txt
@@ -29,8 +29,8 @@
#
#*************************************************************************
-CLI_OOOTYPES_NEW_VERSION=1.0.2.0
-CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.1.0
-CLI_OOOTYPES_POLICY_VERSION=2.0.0.0
+CLI_OOOTYPES_NEW_VERSION=1.0.3.0
+CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.2.0
+CLI_OOOTYPES_POLICY_VERSION=3.0.0.0
CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes
More information about the ooo-build-commit
mailing list