Skip to content

Commit

Permalink
[NETBEANS-1074] Module Review libs.nashorn (apache#738)
Browse files Browse the repository at this point in the history
[NETBEANS-1074] Module Review libs.nashorn
  • Loading branch information
sdedic authored Aug 23, 2018
1 parent 5ee0d11 commit 84b1d33
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 9 deletions.
18 changes: 17 additions & 1 deletion libs.nashorn/external/binaries-list
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
7CA13589F586F659BB0E1561719A91CA47BF1897 com.oracle.js.parser.jar
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
7CA13589F586F659BB0E1561719A91CA47BF1897 com.oracle.js.parser-ba7a8bc42268.jar
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ Name: com.oracle.js.parser.jar
Version: ba7a8bc42268
Description: An ECMAScript 6 (ECMAScript 2015) compliant parser for JavaScript source code. Based on the parser of Project Nashorn in OpenJDK (http://openjdk.java.net/projects/nashorn/).
License: GPL-2-CP
Source: http://hg.openjdk.java.net/graal/graal-js-parser
Origin: http://hg.openjdk.java.net/graal/graal-js-parser
Type: compile-time
Comment: NetBeans JS support will be broken unless Nashorn is compatible-licensed, or a download is provided similar to nb-javac. See NETBEANS-1159, NETBEANS-1160.

The GNU General Public License (GPL)
Version 2, June 1991

Copyright (C) 1989, 1991 Free Software Foundation, Inc.
Copyright 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim
copies of this license document, but changing it is not
Expand Down Expand Up @@ -405,16 +407,16 @@ Public License instead of this License.

Certain source files distributed by Sun Microsystems, Inc.
are subject to the following clarification and special
exception to the GPL Version 2, but only where Sun has expressly
exception to the GPL, but only where Sun has expressly
included in the particular source file's header the words
"Sun designates this particular file as subject to the
"Classpath" exception as provided by Sun in the License file
"Classpath" exception as provided by Sun in the LICENSE file
that accompanied this code."

Linking this library statically or dynamically with other
modules is making a combined work based on this library.
Thus, the terms and conditions of the GNU General Public
License Version 2 cover the whole combination.
License cover the whole combination.

As a special exception, the copyright holders of this
library give you permission to link this library with
Expand All @@ -428,4 +430,4 @@ not derived from or based on this library. If you modify
this library, you may extend this exception to your version
of the library, but you are not obligated to do so. If you
do not wish to do so, delete this exception statement from
your version.
your version.
3 changes: 2 additions & 1 deletion libs.nashorn/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
is.autoload=true
release.external/com.oracle.js.parser.jar=modules/ext/com.oracle.js.parser.jar
# Temporary solution, see NETBEANS-1159, NETBEANS-1160.
release.external/com.oracle.js.parser-ba7a8bc42268.jar=modules/ext/com.oracle.js.parser.jar
5 changes: 4 additions & 1 deletion libs.nashorn/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@
<public-packages>
<subpackages>com.oracle.js.parser</subpackages>
</public-packages>
<!--
Temporary solution, see NETBEANS-1159, NETBEANS-1160.
-->
<class-path-extension>
<runtime-relative-path>ext/com.oracle.js.parser.jar</runtime-relative-path>
<binary-origin>external/com.oracle.js.parser.jar</binary-origin>
<binary-origin>external/com.oracle.js.parser-ba7a8bc42268.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down

0 comments on commit 84b1d33

Please sign in to comment.