incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1222617 - in /incubator/ooo/trunk/main: rhino/ rhino/prj/ scripting/java/com/sun/star/script/framework/provider/javascript/
Date Fri, 23 Dec 2011 09:25:49 GMT
Author: af
Date: Fri Dec 23 09:25:48 2011
New Revision: 1222617

URL: http://svn.apache.org/viewvc?rev=1222617&view=rev
Log:
118623: Update of rhino from 1.5R5 to 1.7R3.
        Author: Tsutomu Uchino

Modified:
    incubator/ooo/trunk/main/rhino/README
    incubator/ooo/trunk/main/rhino/makefile.mk
    incubator/ooo/trunk/main/rhino/prj/d.lst
    incubator/ooo/trunk/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
    incubator/ooo/trunk/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java

Modified: incubator/ooo/trunk/main/rhino/README
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/rhino/README?rev=1222617&r1=1222616&r2=1222617&view=diff
==============================================================================
--- incubator/ooo/trunk/main/rhino/README (original)
+++ incubator/ooo/trunk/main/rhino/README Fri Dec 23 09:25:48 2011
@@ -6,7 +6,6 @@ In addition, to support the debugging of
 documents, we have modified the Java source file Main.java.
 
 The Rhino source tarball is unpacked and patched with the modified code. The
-Rhino Jar file (js.jar) is then built (download/swingExSrc.zip is unpacked and
-built as part of this procesS) and delivered to the solver. The file
-rhino1_5R5.patch contains the changes made in order to build Rhino. The patch
+Rhino Jar file (js.jar) is then built and delivered to the solver. The file
+rhino1_7R3.patch contains the changes made in order to build Rhino. The patch
 was generated using the command: diff -wurN

Modified: incubator/ooo/trunk/main/rhino/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/rhino/makefile.mk?rev=1222617&r1=1222616&r2=1222617&view=diff
==============================================================================
--- incubator/ooo/trunk/main/rhino/makefile.mk (original)
+++ incubator/ooo/trunk/main/rhino/makefile.mk Fri Dec 23 09:25:48 2011
@@ -48,23 +48,21 @@ all:
 
 #.IF "$(DISABLE_RHINO)" == ""
 
-TARFILE_NAME=rhino1_5R5
-TARFILE_MD5=798b2ffdc8bcfe7bca2cf92b62caf685
-TARFILE_ROOTDIR=rhino1_5R5
+TARFILE_NAME=rhino1_7R3
+TARFILE_MD5=99d94103662a8d0b571e247a77432ac5
+TARFILE_ROOTDIR=rhino1_7R3
 
 ADDITIONAL_FILES= \
 	toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java
 
-PATCH_FILES=rhino1_5R5.patch \
-	rhino1_5R5-find_swing.patch \
-    rhino1_5R5-updateToolTip.patch
+PATCH_FILES=rhino1_7R3.patch
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dno-xmlbeans=true
jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" jar
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dno-xmlbeans=true jar
 .ENDIF
 
 # --- Targets ------------------------------------------------------

Modified: incubator/ooo/trunk/main/rhino/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/rhino/prj/d.lst?rev=1222617&r1=1222616&r2=1222617&view=diff
==============================================================================
--- incubator/ooo/trunk/main/rhino/prj/d.lst (original)
+++ incubator/ooo/trunk/main/rhino/prj/d.lst Fri Dec 23 09:25:48 2011
@@ -1 +1 @@
-..\%__SRC%\misc\build\rhino1_5R5\build\rhino1_5R5\js.jar %_DEST%\bin%_EXT%\js.jar
+..\%__SRC%\misc\build\rhino1_7R3\build\rhino1_7R3\js.jar %_DEST%\bin%_EXT%\js.jar

Modified: incubator/ooo/trunk/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java?rev=1222617&r1=1222616&r2=1222617&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
(original)
+++ incubator/ooo/trunk/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
Fri Dec 23 09:25:48 2011
@@ -261,6 +261,11 @@ public class ScriptEditorForJavaScript i
                 }
                 
                 final Main sdb = new Main("Rhino JavaScript Debugger");
+                org.mozilla.javascript.tools.shell.ShellContextFactory contextFactory = 
+                    new org.mozilla.javascript.tools.shell.ShellContextFactory();
+                sdb.attachTo(contextFactory);
+                contextFactory.setLanguageVersion(Context.VERSION_1_8);
+                contextFactory.setOptimizationLevel(9);
                 sdb.pack();
                 sdb.setSize(640, 640);
                 sdb.setVisible(true);
@@ -271,12 +276,14 @@ public class ScriptEditorForJavaScript i
                         shutdown();
                     }
                 });
+                /*
                 Context.addContextListener(sdb);
                 sdb.setScopeProvider(new ScopeProvider() {
                     public Scriptable getScope() {
                         return org.mozilla.javascript.tools.shell.Main.getScope();
                     }
                 });
+                */
                 sdb.addWindowListener( new WindowAdapter() {
                     public void windowClosing(WindowEvent e) {
                         shutdown();

Modified: incubator/ooo/trunk/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java?rev=1222617&r1=1222616&r2=1222617&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
(original)
+++ incubator/ooo/trunk/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
Fri Dec 23 09:25:48 2011
@@ -264,6 +264,8 @@ class ScriptImpl implements XScript
 
                 // Initialize a Rhino Context object
                 ctxt = Context.enter();
+                ctxt.setLanguageVersion(Context.VERSION_1_8);
+                ctxt.setOptimizationLevel(9);
 
                 /* The ImporterTopLevel ensures that importClass and
                    importPackage statements work in Javascript scripts
@@ -289,14 +291,14 @@ class ScriptImpl implements XScript
             catch (JavaScriptException jse) {
                 LogUtils.DEBUG( "Caught JavaScriptException exception for JavaScript type
= " + jse.getClass() );
                 String message = jse.getMessage();
-                //int lineNo = jse.getLineNumber();
+                int lineNo = jse.lineNumber();
                 Object wrap = jse.getValue();
                 LogUtils.DEBUG( "\t message  " + message );
                 LogUtils.DEBUG( "\t wrapped type " + wrap.getClass() );
                 LogUtils.DEBUG( "\t wrapped toString  " + wrap.toString() );
                 ScriptExceptionRaisedException se = new 
                     ScriptExceptionRaisedException( message );
-                se.lineNum = -1;
+                se.lineNum = lineNo;
                 se.language = "JavaScript";
                 se.scriptName = metaData.getLanguageName();
                 se.exceptionType = wrap.getClass().getName();



Mime
View raw message