[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Fridrich Strba]

 patches/dev300/apply                |    4 ++++
 patches/dev300/oowintool-java6.diff |   10 ++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit f81839a844ee95422df20b47639dc1348ad48caf
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Thu Jan 28 13:54:49 2010 +0100

    Allow oowintool detect the java 1.6.x too
    
    * patches/dev300/apply:
    * patches/dev300/oowintool-java6.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ab17abc..ac4784e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3512,3 +3512,7 @@ valgrind-fixes.diff, thorsten
 [ BuildBits == ooo320-m11 ]
 connectivity-build-fix.diff, i#107957, fridrich
 
+[ BuildBits ]
+# Allow oowintool to detect java sdk 1.6.x
+oowintool-java6.diff, fridrich
+
diff --git a/patches/dev300/oowintool-java6.diff b/patches/dev300/oowintool-java6.diff
new file mode 100644
index 0000000..3798336
--- /dev/null
+++ b/patches/dev300/oowintool-java6.diff
@@ -0,0 +1,10 @@
+--- oowintool	2009-10-07 15:06:49.000000000 +0200
++++ oowintool	2010-01-28 13:47:46.000000000 +0100
+@@ -265,6 +265,7 @@
+ {
+     my $dir =
+ 	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.5/JavaHome") ||
++	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.6/JavaHome") ||
+ 	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome") ||
+ 	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.3/JavaHome");
+     print cygpath($dir, 'w', $output_format);