Accepting request 100421 from Java:packages
- license update: MPL-1.1 or GPL-2.0+ the code is dual licensed under a choice of MPL-1.1 or GPL-2.0+ - update to rhino 1_7R3 (bugfix release) - fix bnc#739502 - rhino-dojo.patch adds Sun proprietary code to rhino 1.7 OBS-URL: https://build.opensuse.org/request/show/100421 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rhino?expand=0&rev=17
This commit is contained in:
commit
e696f6931a
@ -1,7 +1,7 @@
|
|||||||
Index: src/org/mozilla/javascript/FieldAndMethods.java
|
Index: src/org/mozilla/javascript/FieldAndMethods.java
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||||
+++ src/org/mozilla/javascript/FieldAndMethods.java 2009-11-16 15:56:53.786561141 +0100
|
+++ src/org/mozilla/javascript/FieldAndMethods.java 2012-01-13 11:42:37.110099483 +0100
|
||||||
@@ -0,0 +1,84 @@
|
@@ -0,0 +1,84 @@
|
||||||
+/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
+/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||||
+ *
|
+ *
|
||||||
@ -89,9 +89,9 @@ Index: src/org/mozilla/javascript/FieldAndMethods.java
|
|||||||
+}
|
+}
|
||||||
Index: src/org/mozilla/javascript/JavaMembers.java
|
Index: src/org/mozilla/javascript/JavaMembers.java
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/org/mozilla/javascript/JavaMembers.java.orig 2009-11-16 15:55:49.870562134 +0100
|
--- src/org/mozilla/javascript/JavaMembers.java.orig 2011-05-09 20:04:34.000000000 +0200
|
||||||
+++ src/org/mozilla/javascript/JavaMembers.java 2009-11-16 15:56:53.786561141 +0100
|
+++ src/org/mozilla/javascript/JavaMembers.java 2012-01-13 11:42:37.117099728 +0100
|
||||||
@@ -893,41 +893,3 @@
|
@@ -909,41 +909,3 @@
|
||||||
MemberBox setter;
|
MemberBox setter;
|
||||||
NativeJavaMethod setters;
|
NativeJavaMethod setters;
|
||||||
}
|
}
|
||||||
|
11
rhino-1.7R3-crosslink.patch
Normal file
11
rhino-1.7R3-crosslink.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -up rhino1_7R3/build.xml~ rhino1_7R3/build.xml
|
||||||
|
--- rhino1_7R3/build.xml~ 2011-05-09 20:04:38.000000000 +0300
|
||||||
|
+++ rhino1_7R3/build.xml 2011-10-16 00:11:22.625045037 +0300
|
||||||
|
@@ -220,6 +220,7 @@
|
||||||
|
destdir="${dist.dir}/javadoc"
|
||||||
|
version="true"
|
||||||
|
author="true"
|
||||||
|
+ link="/usr/share/javadoc/java"
|
||||||
|
windowtitle="${Name}" />
|
||||||
|
</target>
|
||||||
|
|
39
rhino-addOrbitManifest.patch
Normal file
39
rhino-addOrbitManifest.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
diff -up rhino1_7R3/src/manifest.fixManifest rhino1_7R3/src/manifest
|
||||||
|
--- rhino1_7R3/src/manifest.fixManifest 2011-05-09 20:04:34.000000000 +0200
|
||||||
|
+++ rhino1_7R3/src/manifest 2011-09-14 17:46:28.331978606 +0200
|
||||||
|
@@ -1,6 +1,31 @@
|
||||||
|
Manifest-Version: 1.0
|
||||||
|
Main-Class: org.mozilla.javascript.tools.shell.Main
|
||||||
|
-Implementation-Version: 1.7R2
|
||||||
|
-Implementation-Title: Mozilla Rhino 1.7R2
|
||||||
|
+Implementation-Version: 1.7R3
|
||||||
|
+Implementation-Title: Mozilla Rhino 1.7R3
|
||||||
|
Implementation-Vendor: Mozilla Foundation
|
||||||
|
-Implementation-URL: http://www.mozilla.org/rhino
|
||||||
|
\ Chybí znak konce řádku na konci souboru
|
||||||
|
+Implementation-URL: http://www.mozilla.org/rhino
|
||||||
|
+Bundle-Vendor: %Bundle-Vendor.0
|
||||||
|
+Bundle-Localization: plugin
|
||||||
|
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||||
|
+Bundle-Name: %Bundle-Name.0
|
||||||
|
+Bundle-SymbolicName: org.mozilla.javascript
|
||||||
|
+Bundle-Version: 1.7.2.v201005080400
|
||||||
|
+Export-Package: org.mozilla.classfile,org.mozilla.javascript,org.mozil
|
||||||
|
+ la.javascript.debug,org.mozilla.javascript.jdk13,org.mozilla.javascri
|
||||||
|
+ pt.jdk15,org.mozilla.javascript.optimizer,org.mozilla.javascript.rege
|
||||||
|
+ xp,org.mozilla.javascript.serialize,org.mozilla.javascript.tools,org.
|
||||||
|
+ mozilla.javascript.tools.debugger,org.mozilla.javascript.tools.debugg
|
||||||
|
+ er.treetable,org.mozilla.javascript.tools.idswitch,org.mozilla.javasc
|
||||||
|
+ ript.tools.jsc,org.mozilla.javascript.tools.shell,org.mozilla.javascr
|
||||||
|
+ ipt.xml,org.mozilla.javascript.xml.impl.xmlbeans,org.mozilla.javascri
|
||||||
|
+ pt.xmlimpl
|
||||||
|
+Bundle-ManifestVersion: 2
|
||||||
|
+Import-Package: javax.swing;resolution:=optional,javax.swing.border;re
|
||||||
|
+ solution:=optional,javax.swing.event;resolution:=optional,javax.swing
|
||||||
|
+ .filechooser;resolution:=optional,javax.swing.table;resolution:=optio
|
||||||
|
+ nal,javax.swing.text;resolution:=optional,javax.swing.tree;resolution
|
||||||
|
+ :=optional,javax.xml.namespace;resolution:=optional,javax.xml.parsers
|
||||||
|
+ ;resolution:=optional,javax.xml.transform;resolution:=optional,javax.
|
||||||
|
+ xml.transform.dom;resolution:=optional,javax.xml.transform.stream;res
|
||||||
|
+ olution:=optional,org.w3c.dom;resolution:=optional,org.xml.sax;resolu
|
||||||
|
+ tion:=optional
|
@ -1,7 +1,7 @@
|
|||||||
Index: examples/Matrix.java
|
Index: examples/Matrix.java
|
||||||
===================================================================
|
===================================================================
|
||||||
--- examples/Matrix.java.orig 2009-11-16 15:55:50.618560322 +0100
|
--- examples/Matrix.java.orig 2011-05-09 20:04:38.000000000 +0200
|
||||||
+++ examples/Matrix.java 2009-11-16 15:56:33.046061289 +0100
|
+++ examples/Matrix.java 2012-01-13 11:31:47.275360948 +0100
|
||||||
@@ -249,7 +249,7 @@
|
@@ -249,7 +249,7 @@
|
||||||
* Use the convenience method from Context that takes care of calling
|
* Use the convenience method from Context that takes care of calling
|
||||||
* toString, etc.
|
* toString, etc.
|
||||||
@ -13,8 +13,8 @@ Index: examples/Matrix.java
|
|||||||
|
|
||||||
Index: examples/PrimitiveWrapFactory.java
|
Index: examples/PrimitiveWrapFactory.java
|
||||||
===================================================================
|
===================================================================
|
||||||
--- examples/PrimitiveWrapFactory.java.orig 2009-11-16 15:55:50.618560322 +0100
|
--- examples/PrimitiveWrapFactory.java.orig 2011-05-09 20:04:38.000000000 +0200
|
||||||
+++ examples/PrimitiveWrapFactory.java 2009-11-16 15:56:33.046061289 +0100
|
+++ examples/PrimitiveWrapFactory.java 2012-01-13 11:31:47.276360983 +0100
|
||||||
@@ -57,7 +57,7 @@
|
@@ -57,7 +57,7 @@
|
||||||
public class PrimitiveWrapFactory extends WrapFactory {
|
public class PrimitiveWrapFactory extends WrapFactory {
|
||||||
@Override
|
@Override
|
||||||
@ -26,8 +26,8 @@ Index: examples/PrimitiveWrapFactory.java
|
|||||||
obj instanceof Boolean)
|
obj instanceof Boolean)
|
||||||
Index: src/org/mozilla/javascript/WrapFactory.java
|
Index: src/org/mozilla/javascript/WrapFactory.java
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/org/mozilla/javascript/WrapFactory.java.orig 2009-11-16 15:55:50.618560322 +0100
|
--- src/org/mozilla/javascript/WrapFactory.java.orig 2011-05-09 20:04:34.000000000 +0200
|
||||||
+++ src/org/mozilla/javascript/WrapFactory.java 2009-11-16 15:56:33.082060680 +0100
|
+++ src/org/mozilla/javascript/WrapFactory.java 2012-01-13 11:31:47.277361018 +0100
|
||||||
@@ -75,7 +75,7 @@
|
@@ -75,7 +75,7 @@
|
||||||
* @return the wrapped value.
|
* @return the wrapped value.
|
||||||
*/
|
*/
|
||||||
@ -39,8 +39,8 @@ Index: src/org/mozilla/javascript/WrapFactory.java
|
|||||||
|| obj instanceof Scriptable)
|
|| obj instanceof Scriptable)
|
||||||
Index: toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
|
Index: toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
|
||||||
===================================================================
|
===================================================================
|
||||||
--- toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java.orig 2009-11-16 15:55:50.622561663 +0100
|
--- toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java.orig 2011-05-09 20:04:36.000000000 +0200
|
||||||
+++ toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2009-11-16 15:56:33.106060535 +0100
|
+++ toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2012-01-13 11:31:47.278361053 +0100
|
||||||
@@ -67,7 +67,7 @@
|
@@ -67,7 +67,7 @@
|
||||||
return super.defineClass(name, data, 0, data.length, domain);
|
return super.defineClass(name, data, 0, data.length, domain);
|
||||||
}
|
}
|
||||||
@ -52,9 +52,9 @@ Index: toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
|
|||||||
}
|
}
|
||||||
Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
|
Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
|
||||||
===================================================================
|
===================================================================
|
||||||
--- xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java.orig 2009-11-16 15:55:50.622561663 +0100
|
--- xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java.orig 2011-05-09 20:04:38.000000000 +0200
|
||||||
+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java 2009-11-16 15:56:33.130060740 +0100
|
+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java 2012-01-13 11:31:47.282361193 +0100
|
||||||
@@ -115,7 +115,7 @@
|
@@ -120,7 +120,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -65,9 +65,9 @@ Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
|
|||||||
|
|
||||||
Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
|
Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
|
||||||
===================================================================
|
===================================================================
|
||||||
--- xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java.orig 2009-11-16 15:55:50.622561663 +0100
|
--- xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java.orig 2011-05-09 20:04:38.000000000 +0200
|
||||||
+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java 2009-11-16 15:56:33.182060668 +0100
|
+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java 2012-01-13 11:31:47.284361263 +0100
|
||||||
@@ -145,7 +145,7 @@
|
@@ -150,7 +150,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -78,8 +78,8 @@ Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
|
|||||||
|
|
||||||
Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
|
Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
|
||||||
===================================================================
|
===================================================================
|
||||||
--- xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java.orig 2009-11-16 15:55:50.622561663 +0100
|
--- xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java.orig 2011-05-09 20:04:38.000000000 +0200
|
||||||
+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java 2009-11-16 15:56:33.206060612 +0100
|
+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java 2012-01-13 11:31:47.285361298 +0100
|
||||||
@@ -165,7 +165,7 @@
|
@@ -165,7 +165,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -89,24 +89,3 @@ Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
|
|||||||
return this.toString();
|
return this.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
Index: toolsrc/org/mozilla/javascript/tools/shell/Main.java
|
|
||||||
===================================================================
|
|
||||||
--- toolsrc/org/mozilla/javascript/tools/shell/Main.java.orig 2009-11-16 15:55:50.622561663 +0100
|
|
||||||
+++ toolsrc/org/mozilla/javascript/tools/shell/Main.java 2009-11-16 15:56:33.234061036 +0100
|
|
||||||
@@ -43,6 +43,8 @@
|
|
||||||
package org.mozilla.javascript.tools.shell;
|
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
+import java.io.BufferedWriter;
|
|
||||||
+import java.io.FileWriter;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
@@ -64,6 +66,7 @@
|
|
||||||
import org.mozilla.javascript.Scriptable;
|
|
||||||
import org.mozilla.javascript.ScriptableObject;
|
|
||||||
import org.mozilla.javascript.SecurityController;
|
|
||||||
+import org.mozilla.javascript.WrappedException;
|
|
||||||
import org.mozilla.javascript.tools.SourceReader;
|
|
||||||
import org.mozilla.javascript.tools.ToolErrorReporter;
|
|
||||||
|
|
||||||
|
@ -1,101 +0,0 @@
|
|||||||
Index: toolsrc/org/mozilla/javascript/tools/shell/ShellLine.java
|
|
||||||
===================================================================
|
|
||||||
--- toolsrc/org/mozilla/javascript/tools/shell/ShellLine.java.orig 2009-11-16 15:55:50.086562039 +0100
|
|
||||||
+++ toolsrc/org/mozilla/javascript/tools/shell/ShellLine.java 2009-11-16 15:56:47.018560292 +0100
|
|
||||||
@@ -40,12 +40,17 @@
|
|
||||||
package org.mozilla.javascript.tools.shell;
|
|
||||||
|
|
||||||
import java.io.InputStream;
|
|
||||||
+import java.io.IOException;
|
|
||||||
import java.util.List;
|
|
||||||
import java.lang.reflect.Constructor;
|
|
||||||
import java.lang.reflect.Method;
|
|
||||||
import java.lang.reflect.Proxy;
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
|
|
||||||
+import jline.ConsoleReader;
|
|
||||||
+import jline.Completor;
|
|
||||||
+import jline.ConsoleReaderInputStream;
|
|
||||||
+
|
|
||||||
import org.mozilla.javascript.Kit;
|
|
||||||
import org.mozilla.javascript.Scriptable;
|
|
||||||
import org.mozilla.javascript.ScriptableObject;
|
|
||||||
@@ -59,39 +64,13 @@
|
|
||||||
public class ShellLine {
|
|
||||||
|
|
||||||
public static InputStream getStream(Scriptable scope) {
|
|
||||||
- // We don't want a compile-time dependency on the JLine jar, so use
|
|
||||||
- // reflection to load and reference the JLine classes.
|
|
||||||
- ClassLoader classLoader = ShellLine.class.getClassLoader();
|
|
||||||
- Class<?> readerClass = Kit.classOrNull(classLoader, "jline.ConsoleReader");
|
|
||||||
- if (readerClass == null)
|
|
||||||
- return null;
|
|
||||||
try {
|
|
||||||
- // ConsoleReader reader = new ConsoleReader();
|
|
||||||
- Constructor<?> c = readerClass.getConstructor();
|
|
||||||
- Object reader = c.newInstance();
|
|
||||||
-
|
|
||||||
- // reader.setBellEnabled(false);
|
|
||||||
- Method m = readerClass.getMethod("setBellEnabled", Boolean.TYPE);
|
|
||||||
- m.invoke(reader, Boolean.FALSE);
|
|
||||||
-
|
|
||||||
- // reader.addCompletor(new FlexibleCompletor(prefixes));
|
|
||||||
- Class<?> completorClass = Kit.classOrNull(classLoader,
|
|
||||||
- "jline.Completor");
|
|
||||||
- m = readerClass.getMethod("addCompletor", completorClass);
|
|
||||||
- Object completor = Proxy.newProxyInstance(classLoader,
|
|
||||||
- new Class[] { completorClass },
|
|
||||||
- new FlexibleCompletor(completorClass, scope));
|
|
||||||
- m.invoke(reader, completor);
|
|
||||||
-
|
|
||||||
- // return new ConsoleReaderInputStream(reader);
|
|
||||||
- Class<?> inputStreamClass = Kit.classOrNull(classLoader,
|
|
||||||
- "jline.ConsoleReaderInputStream");
|
|
||||||
- c = inputStreamClass.getConstructor(readerClass);
|
|
||||||
- return (InputStream) c.newInstance(reader);
|
|
||||||
+ ConsoleReader reader = new ConsoleReader();
|
|
||||||
+ reader.setBellEnabled(false);
|
|
||||||
+ reader.addCompletor(new FlexibleCompletor(scope));
|
|
||||||
+ return new ConsoleReaderInputStream(reader);
|
|
||||||
+ } catch (IOException e) {
|
|
||||||
} catch (NoSuchMethodException e) {
|
|
||||||
- } catch (InstantiationException e) {
|
|
||||||
- } catch (IllegalAccessException e) {
|
|
||||||
- } catch (InvocationTargetException e) {
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
@@ -102,29 +81,17 @@
|
|
||||||
* complete on a line that it can fully recognize (only composed of
|
|
||||||
* completed strings). This one completes whatever came before.
|
|
||||||
*/
|
|
||||||
-class FlexibleCompletor implements java.lang.reflect.InvocationHandler {
|
|
||||||
- private Method completeMethod;
|
|
||||||
+class FlexibleCompletor implements Completor {
|
|
||||||
private Scriptable global;
|
|
||||||
|
|
||||||
- FlexibleCompletor(Class<?> completorClass, Scriptable global)
|
|
||||||
+ FlexibleCompletor(Scriptable global)
|
|
||||||
throws NoSuchMethodException
|
|
||||||
{
|
|
||||||
this.global = global;
|
|
||||||
- this.completeMethod = completorClass.getMethod("complete", String.class,
|
|
||||||
- Integer.TYPE, List.class);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- @SuppressWarnings({"unchecked"})
|
|
||||||
- public Object invoke(Object proxy, Method method, Object[] args) {
|
|
||||||
- if (method.equals(this.completeMethod)) {
|
|
||||||
- int result = complete((String)args[0], ((Integer) args[1]).intValue(),
|
|
||||||
- (List<String>) args[2]);
|
|
||||||
- return Integer.valueOf(result);
|
|
||||||
- }
|
|
||||||
- throw new NoSuchMethodError(method.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
- public int complete(String buffer, int cursor, List<String> candidates) {
|
|
||||||
+ @SuppressWarnings({"unchecked"})
|
|
||||||
+ public int complete(String buffer, int cursor, List candidates) {
|
|
||||||
// Starting from "cursor" at the end of the buffer, look backward
|
|
||||||
// and collect a list of identifiers separated by (possibly zero)
|
|
||||||
// dots. Then look up each identifier in turn until getting to the
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:afe2824349af04ed9b36787e3c2f35e57f09d0bab82b2ad632887c90a9711dd9
|
|
||||||
size 219739
|
|
1729
rhino-dojo.patch
1729
rhino-dojo.patch
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 17 12:56:04 UTC 2012 - cfarrell@suse.com
|
||||||
|
|
||||||
|
- license update: MPL-1.1 or GPL-2.0+
|
||||||
|
the code is dual licensed under a choice of MPL-1.1 or GPL-2.0+
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jan 16 15:47:09 UTC 2012 - mvyskocil@suse.cz
|
||||||
|
|
||||||
|
- update to rhino 1_7R3 (bugfix release)
|
||||||
|
- fix bnc#739502 - rhino-dojo.patch adds Sun proprietary code to rhino 1.7
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 15 13:50:34 UTC 2011 - coolo@suse.com
|
||||||
|
|
||||||
|
- fix license to be in spdx.org format
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 14 12:43:48 UTC 2011 - mvyskocil@suse.cz
|
Mon Mar 14 12:43:48 UTC 2011 - mvyskocil@suse.cz
|
||||||
|
|
||||||
|
167
rhino.spec
167
rhino.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package rhino
|
# spec file for package rhino
|
||||||
#
|
#
|
||||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# Copyright (c) 2000-2009, JPackage Project
|
# Copyright (c) 2000-2009, JPackage Project
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
@ -19,19 +19,21 @@
|
|||||||
|
|
||||||
|
|
||||||
%define section free
|
%define section free
|
||||||
%define cvs_version 1_7R2
|
%define cvs_version 1_7R3
|
||||||
%define archive_version 1_7R2
|
|
||||||
|
|
||||||
Name: rhino
|
Name: rhino
|
||||||
Version: 1.7
|
Version: 1.7R3
|
||||||
Release: 20
|
Release: 1
|
||||||
Summary: JavaScript for Java
|
Summary: JavaScript for Java
|
||||||
License: MPL ..
|
License: MPL-1.1 or GPL-2.0+
|
||||||
# wget ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{archive_version}.zip
|
Group: Development/Libraries/Java
|
||||||
# unzip -q rhino%{archive_version}.zip
|
Url: http://www.mozilla.org/rhino/
|
||||||
# find rhino%{archive_version}/ -name '*jar' | xargs rm -rf
|
|
||||||
# tar -cjf rhino%{archive_version}.tar.bz2 rhino%{archive_version}/
|
# wget ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino%{cvs_version}.zip
|
||||||
Source0: rhino%{archive_version}.tar.bz2
|
# unzip -q rhino%{cvs_version}.zip
|
||||||
|
# find rhino%{cvs_version}/ -name '*jar' | xargs rm -rf
|
||||||
|
# tar -czf rhino%{cvs_version}-suse.tar.gz rhino%{cvs_version}/
|
||||||
|
Source0: rhino%{cvs_version}-suse.tar.gz
|
||||||
Source2: rhino.script
|
Source2: rhino.script
|
||||||
Source3: rhino-debugger.script
|
Source3: rhino-debugger.script
|
||||||
Source4: rhino-idswitch.script
|
Source4: rhino-idswitch.script
|
||||||
@ -39,36 +41,34 @@ Source5: rhino-jsc.script
|
|||||||
Source6: rhino-js.pom
|
Source6: rhino-js.pom
|
||||||
Source7: rhino.pom
|
Source7: rhino.pom
|
||||||
Source8: rhino-component-info.xml
|
Source8: rhino-component-info.xml
|
||||||
# export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/www
|
|
||||||
# vs -z3 co mozilla-org/html/rhino
|
|
||||||
# cd mozilla-org/html/
|
|
||||||
# rm -r rhino/apidocs # the javadoc is in different directory
|
|
||||||
# tar -cjf rhino-docs.tar.bz2 rhino
|
|
||||||
Source100: rhino-docs.tar.bz2
|
|
||||||
Patch0: rhino-build.patch
|
Patch0: rhino-build.patch
|
||||||
Patch1: rhino-dojo.patch
|
# Add OSGi metadata from Eclipse Orbit project
|
||||||
Patch2: rhino-class-loader.patch
|
# Rip out of MANIFEST.MF included in this JAR:
|
||||||
|
# http://www.eclipse.org/downloads/download.php?r=1&file=/tools/orbit/downloads/drops/R20110523182458/repository/plugins/org.mozilla.javascript_1.7.2.v201005080400.jar
|
||||||
|
Patch1: %{name}-addOrbitManifest.patch
|
||||||
|
Patch2: %{name}-1.7R3-crosslink.patch
|
||||||
Patch3: rhino-288467.patch
|
Patch3: rhino-288467.patch
|
||||||
#PATCH-FIX-OPENSUSE: allow build under gcj
|
#PATCH-FIX-OPENSUSE: allow build under gcj
|
||||||
Patch100: rhino-1.7-gcj.patch
|
Patch100: rhino-1.7-gcj.patch
|
||||||
Url: http://www.mozilla.org/rhino/
|
|
||||||
Group: Development/Libraries/Java
|
|
||||||
Requires: jline
|
|
||||||
Requires: bea-stax-api
|
|
||||||
Requires: xmlbeans
|
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: jpackage-utils
|
|
||||||
BuildRequires: jline
|
|
||||||
BuildRequires: bea-stax-api
|
BuildRequires: bea-stax-api
|
||||||
BuildRequires: xmlbeans-mini
|
BuildRequires: jline
|
||||||
BuildRequires: unzip
|
BuildRequires: jpackage-utils
|
||||||
BuildRequires: xerces-j2-bootstrap
|
BuildRequires: xerces-j2-bootstrap
|
||||||
|
BuildRequires: xmlbeans-mini
|
||||||
|
BuildRequires: java-1_5_0-gcj-compat-devel
|
||||||
#!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver
|
#!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver
|
||||||
#!BuildIgnore: antlr antlr-java
|
#!BuildIgnore: antlr antlr-java
|
||||||
#!BuildIgnore: xml-commons-jaxp-1.3-apis
|
#!BuildIgnore: xml-commons-jaxp-1.3-apis
|
||||||
BuildArch: noarch
|
|
||||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
|
||||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
|
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
|
||||||
|
|
||||||
|
Requires: jline
|
||||||
|
Requires: bea-stax-api
|
||||||
|
Requires: xmlbeans
|
||||||
|
|
||||||
|
BuildArch: noarch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -76,57 +76,42 @@ Rhino is an open-source implementation of JavaScript written entirely
|
|||||||
in Java. It is typically embedded into Java applications to provide
|
in Java. It is typically embedded into Java applications to provide
|
||||||
scripting to end users.
|
scripting to end users.
|
||||||
|
|
||||||
This version contains Dojo's JavaScript compression patch.
|
|
||||||
|
|
||||||
%package demo
|
%package demo
|
||||||
License: MPL ..
|
|
||||||
Summary: JavaScript for Java
|
Summary: JavaScript for Java
|
||||||
Group: Development/Libraries/Java
|
|
||||||
|
|
||||||
%description demo
|
%description demo
|
||||||
Rhino is an open-source implementation of JavaScript written entirely
|
Rhino is an open-source implementation of JavaScript written entirely
|
||||||
in Java. It is typically embedded into Java applications to provide
|
in Java. It is typically embedded into Java applications to provide
|
||||||
scripting to end users.
|
scripting to end users.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%package manual
|
|
||||||
License: MPL ..
|
|
||||||
Summary: JavaScript for Java
|
|
||||||
Group: Development/Libraries/Java
|
|
||||||
|
|
||||||
%description manual
|
|
||||||
Rhino is an open-source implementation of JavaScript written entirely
|
|
||||||
in Java. It is typically embedded into Java applications to provide
|
|
||||||
scripting to end users.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%package javadoc
|
%package javadoc
|
||||||
License: MPL ..
|
|
||||||
Summary: JavaScript for Java
|
Summary: JavaScript for Java
|
||||||
Group: Development/Libraries/Java
|
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
Rhino is an open-source implementation of JavaScript written entirely
|
Rhino is an open-source implementation of JavaScript written entirely
|
||||||
in Java. It is typically embedded into Java applications to provide
|
in Java. It is typically embedded into Java applications to provide
|
||||||
scripting to end users.
|
scripting to end users.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}%{cvs_version} -a 100
|
# % setup -q -n %{name}%{cvs_version} -a 100
|
||||||
%patch0 -p0 -b .sav0
|
%setup -q -n %{name}%{cvs_version}
|
||||||
%patch1 -p0 -b .sav1
|
|
||||||
%patch2 -p0 -b .sav2
|
|
||||||
%patch3 -p0 -b .sav3
|
|
||||||
%patch100 -p0 -b .sav0
|
|
||||||
# Fix build
|
# Fix build
|
||||||
%{__perl} -pi -e 's|.*<get.*src=.*>\n||' build.xml testsrc/build.xml toolsrc/org/mozilla/javascript/tools/debugger/build.xml xmlimplsrc/build.xml
|
sed -i -e '/.*<get.*src=.*>$/d' build.xml testsrc/build.xml \
|
||||||
|
toolsrc/org/mozilla/javascript/tools/debugger/build.xml xmlimplsrc/build.xml
|
||||||
|
|
||||||
# Fix manifest
|
# Fix manifest
|
||||||
%{__perl} -pi -e 's|^Class-Path:.*\n||g' src/manifest
|
sed -i -e '/^Class-Path:.*$/d' src/manifest
|
||||||
|
|
||||||
# Add jpp release info to version
|
# Add jpp release info to version
|
||||||
%{__perl} -pi -e 's|^implementation.version: Rhino .* release .* \${implementation.date}|implementation.version: Rhino %{version} release %{release} \${implementation.date}|' build.properties
|
sed -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date}|implementation.version: Rhino %{version} release %{release} \${implementation.date}|' build.properties
|
||||||
|
|
||||||
|
%setup -q -n %{name}%{cvs_version}
|
||||||
|
%patch0 -p0 -b .build
|
||||||
|
%patch1 -p1 -b .fixManifest
|
||||||
|
%patch2 -p1 -b .crosslink
|
||||||
|
%patch3 -p0 -b .sav3
|
||||||
|
%patch100 -p0 -b .gjc
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CLASSPATH=$(build-classpath jline)
|
export CLASSPATH=$(build-classpath jline)
|
||||||
@ -135,43 +120,42 @@ export OPT_JAR_LIST=:
|
|||||||
-Dxbean.jar=$(build-classpath xmlbeans/xbean) \
|
-Dxbean.jar=$(build-classpath xmlbeans/xbean) \
|
||||||
-Djsr173.jar=$(build-classpath bea-stax-api) \
|
-Djsr173.jar=$(build-classpath bea-stax-api) \
|
||||||
deepclean jar copy-all javadoc
|
deepclean jar copy-all javadoc
|
||||||
# % if 0
|
|
||||||
pushd examples
|
pushd examples
|
||||||
export CLASSPATH=../build/%{name}%{archive_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
|
export CLASSPATH=../build/%{name}%{cvs_version}/js.jar:$(build-classpath xmlbeans/xbean 2>/dev/null)
|
||||||
javac -C *.java
|
javac -C *.java
|
||||||
jar cvf ../build/%{name}%{archive_version}/%{name}-examples-%{version}.jar *.class
|
jar cvf ../build/%{name}%{cvs_version}/%{name}-examples.jar *.class
|
||||||
popd
|
popd
|
||||||
# % endif
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
||||||
# jars
|
# jars
|
||||||
%{__mkdir_p} %{buildroot}%{_javadir}
|
mkdir -p %{buildroot}%{_javadir}
|
||||||
%{__cp} -a build/%{name}%{archive_version}/js.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
|
cp -a build/%{name}%{cvs_version}/js.jar %{buildroot}%{_javadir}
|
||||||
# % if 0
|
ln -s js.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||||
%{__cp} -a build/%{name}%{archive_version}/%{name}-examples-%{version}.jar %{buildroot}%{_javadir}/%{name}-examples-%{version}.jar
|
|
||||||
# % endif
|
# javadoc
|
||||||
(cd %{buildroot}%{_javadir} && %{__ln_s} %{name}-%{version}.jar js-%{version}.jar)
|
mkdir -p %{buildroot}%{_javadocdir}/%{name}
|
||||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} `echo $jar| %{__sed} "s|-%{version}||g"`; done)
|
cp -a javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
|
||||||
|
# scripts
|
||||||
|
mkdir -p %{buildroot}%{_bindir}
|
||||||
|
install -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
|
||||||
|
install -m 0755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}-debugger
|
||||||
|
install -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/%{name}-idswitch
|
||||||
|
install -m 0755 %{SOURCE5} %{buildroot}%{_bindir}/%{name}-jsc
|
||||||
|
|
||||||
|
# examples
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/%{name}
|
||||||
|
cp -a examples/* %{buildroot}%{_datadir}/%{name}
|
||||||
|
cp -a build/%{name}%{cvs_version}/%{name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar
|
||||||
|
|
||||||
# poms
|
# poms
|
||||||
%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
|
mkdir -p %{buildroot}%{_datadir}/maven2/poms
|
||||||
%{__cp} -a %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-js.pom
|
cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-js.pom
|
||||||
%{__cp} -a %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
|
cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
|
||||||
%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
|
%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
|
||||||
%add_to_maven_depmap %{name} js %{version} JPP js
|
%add_to_maven_depmap %{name} js %{version} JPP js
|
||||||
# javadoc
|
|
||||||
%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
|
|
||||||
%{__cp} -a javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
|
|
||||||
%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
|
|
||||||
%{_bindir}/find %{buildroot}%{_javadocdir}/%{name}-%{version} -type f -name '*.html' | %{_bindir}/xargs %{__perl} -pi -e 's/\r$//g'
|
|
||||||
# scripts
|
|
||||||
%{__mkdir_p} %{buildroot}%{_bindir}
|
|
||||||
%{__install} -p -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
|
|
||||||
%{__install} -p -m 0755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}-debugger
|
|
||||||
%{__install} -p -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/%{name}-idswitch
|
|
||||||
%{__install} -p -m 0755 %{SOURCE5} %{buildroot}%{_bindir}/%{name}-jsc
|
|
||||||
# examples
|
|
||||||
%{__mkdir_p} %{buildroot}%{_datadir}/%{name}
|
|
||||||
%{__cp} -a examples/* %{buildroot}%{_datadir}/%{name}
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
%{__rm} -rf %{buildroot}
|
%{__rm} -rf %{buildroot}
|
||||||
@ -191,13 +175,8 @@ popd
|
|||||||
%defattr(0644,root,root,0755)
|
%defattr(0644,root,root,0755)
|
||||||
%{_datadir}/%{name}
|
%{_datadir}/%{name}
|
||||||
|
|
||||||
%files manual
|
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%doc %{name}/*
|
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%defattr(0644,root,root,0755)
|
%defattr(0644,root,root,0755)
|
||||||
%{_javadocdir}/%{name}-%{version}
|
|
||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:57b2d633bcc30d30ac3d761e75283d3d6bc850ca40f078a57ed73780000fc29f
|
|
||||||
size 562942
|
|
3
rhino1_7R3-suse.tar.gz
Normal file
3
rhino1_7R3-suse.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2b4fd3070d9e3018aaf4b4047de252362efde5efc592f9f18c515c572979eae3
|
||||||
|
size 1544431
|
Loading…
x
Reference in New Issue
Block a user