From b12b88e2d9e3bfe8f6085ee583658c7e71018f16 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 21 Jan 2009 17:47:03 +0000
Subject: CWS-TOOLING: integrate CWS configuretoplevel 2009-01-19 15:47:39
 +0100 rene  r266508 : CWS-TOOLING: rebase CWS configuretoplevel to
 trunk@266428 (milestone: DEV300:m39) 2009-01-18 00:35:31 +0100 rene  r266462
 : #i10000# Mac OS X "of course" has other paths... 2009-01-16 13:24:23 +0100
 rene  r266415 : make OS2 use STLport... 2009-01-15 22:08:38 +0100 rene 
 r266393 : STLport for FreeBSD 2009-01-15 01:23:51 +0100 rene  r266333 :
 #i98048# harmonize STL default; default to *NOT* use STLport 2009-01-09
 22:44:43 +0100 rene  r266120 : #i97428# try to find out XLIB via pkg-config
 2009-01-09 22:41:18 +0100 rene  r266119 : #i97827# fail when we don't find
 make 2008-12-27 01:19:34 +0100 rene  r265812 : add make (dis)clean; force
 /bin/sh as we source *Enc.Set.sh 2008-12-27 01:16:31 +0100 rene  r265811 :
 fix makefile.rc for config.*/config_office move 2008-12-26 22:37:54 +0100
 rene  r265810 : #i91641# in some cases, we also need the -Xbootclasspath at
 the second javac call 2008-12-26 17:55:11 +0100 rene  r265806 : actually
 commit Makefile.in 2008-12-25 19:24:24 +0100 rene  r265803 : CWS-TOOLING:
 rebase CWS configuretoplevel to trunk@265758 (milestone: DEV300:m38)
 2008-12-10 22:51:06 +0100 rene  r265232 : #i96912# revert, cws swffixes02 has
 the right fix 2008-12-08 18:47:10 +0100 rene  r265014 : xulrunner has no
 /plugin or /nspr 2008-12-08 17:51:28 +0100 rene  r265013 : i96912# fix
 --with-system-mozilla 2008-12-05 13:05:55 +0100 rene  r264903 : #i95339#
 2008-12-04 17:53:53 +0100 rene  r264865 : fix merge error #i80238# add help
 for --with-epm 2008-12-04 17:44:28 +0100 rene  r264864 : #i91641# fix build
 with JDKs already including a version of rhino which conflicts with our
 ancient one 2008-12-04 17:40:48 +0100 rene  r264863 : i93429# check for
 sanity for expand.exe 2008-12-04 17:34:20 +0100 rene  r264862 : config_office
 changes from m33 to m37 2008-12-04 17:28:55 +0100 rene  r264861 :
 CWS-TOOLING: rebase CWS configuretoplevel to trunk@264807 (milestone:
 DEV300:m37) 2008-12-04 16:49:03 +0100 rene  r264856 : fix cws. part 5
 2008-12-04 16:45:06 +0100 rene  r264855 : fix cws, part 4 2008-12-04 16:01:49
 +0100 rene  r264850 : fix cws, part 3 2008-12-04 15:14:12 +0100 rene  r264848
 : fix cws, part 2

---
 rhino/rhino1_5R5.patch | 56 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 12 deletions(-)

(limited to 'rhino')

diff --git a/rhino/rhino1_5R5.patch b/rhino/rhino1_5R5.patch
index 98e6e10b9508..1c8fb2385705 100644
--- a/rhino/rhino1_5R5.patch
+++ b/rhino/rhino1_5R5.patch
@@ -106,9 +106,34 @@
 +        }
 +    }
  }
---- misc/rhino1_5R5/toolsrc/build.xml	Thu Mar 25 21:54:34 2004
-+++ misc/build/rhino1_5R5/toolsrc/build.xml	Fri Mar 28 17:24:23 2008
-@@ -20,46 +20,10 @@
+--- misc/rhino1_5R5/toolsrc/build.xml	2004-03-25 21:54:34.000000000 +0100
++++ misc/build/rhino1_5R5/toolsrc/build.xml	2009-01-17 20:46:44.000000000 +0100
+@@ -6,6 +6,24 @@
+ -->
+ <project name="toolsrc" default="compile" basedir=".">
+ 
++  <condition property="boot_refID" value="macPath" else="nonMacPath">
++    <and>
++      <os family="mac"/>
++      <os family="unix"/>
++    </and>
++  </condition>
++  <path id="macPath" location="${java.home}/../Classes/classes.jar"/>
++  <!-- rhino.jar from OpenJDK breaks build -->
++  <path id="nonMacPath">
++    <fileset dir="${java.home}/">
++       <include name="jre/lib/*.jar"/>
++       <include name="lib/*.jar"/>
++       <exclude name="jre/lib/rhino.jar"/>
++       <exclude name="lib/rhino.jar"/>
++     </fileset>
++  </path>
++  <path id="my.bootstrap.classpath" refID="${boot_refID}"/>
++
+   <target name="properties">
+     <property name="nest" value=".."/>
+     <property name="build.dir" value="./build"/>
+@@ -20,46 +38,10 @@
      <!-- Download source from Sun's site, unzip it, remove
           the files we don't need, and change the package
      -->
@@ -156,8 +181,16 @@
    </target>
  
    <target name="compile" depends="properties,get-swing-ex">
---- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java	Thu Mar 25 21:54:34 2004
-+++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java	Fri Mar 28 17:24:23 2008
+@@ -68,6 +50,7 @@
+            includes="org/**/*.java"
+            deprecation="on"
+            debug="${debug}">
++      <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
+     </javac>
+     <copy todir="${nest}/${classes}">
+       <fileset dir="." includes="org/**/*.properties" />
+--- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java	2004-03-25 21:54:34.000000000 +0100
++++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/Main.java	2009-01-17 20:44:22.000000000 +0100
 @@ -470,15 +470,21 @@
          case KeyEvent.VK_BACK_SPACE:
          case KeyEvent.VK_ENTER:
@@ -845,12 +878,10 @@
      public static void main(String[] args) {
          try {
              mainThread = Thread.currentThread();
-@@ -3633,6 +3930,163 @@
-         } catch (Exception exc) {
-             exc.printStackTrace();
+@@ -3635,5 +3932,162 @@
          }
-+    }
-+
+     }
+ 
 +    // patched Office specific interface
 + 
 +    OfficeScriptInfo officeScripts = new OfficeScriptInfo();
@@ -1006,9 +1037,10 @@
 +        }
 +        FileWindow w = (FileWindow)getFileWindow( key );
 +        return w.getText();
-     }
- 
++    }
++
  }
+ 
 --- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java	Fri Mar 28 17:25:34 2008
 +++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java	Fri Mar 28 17:24:59 2008
 @@ -1 +1,133 @@
-- 
cgit