Skip to content

Commit d1e738d

Browse files
iamstolisiamstolis
committed
[GR-23997] Backport of missing changes into 22.2.0.
PullRequest: js/2494
2 parents efa926d + 891ef75 commit d1e738d

File tree

28 files changed

+1246
-33
lines changed

28 files changed

+1246
-33
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ See [version roadmap](https://www.graalvm.org/release-notes/version-roadmap/) fo
77

88
## Version 22.2.0
99
* GraalVM JavaScript is now an installable component of GraalVM. It can be installed with `gu install js`.
10+
* Enabled option `js.foreign-object-prototype` by default. Polyglot Interop objects now get a fitting JavaScript prototype assigned unless explicitly turned off using this flag.
11+
* Added intermediate prototype for foreign objects to simplify adapting functionality.
12+
* Removed deprecated experimental option `experimental-foreign-object-prototype`.
1013
* Removed experimental option `commonjs-global-properties`. The same functionality can be achieved in user code with a direct call to `require()` after context creation.
1114
* Added an experimental option `--js.zone-rules-based-time-zones` that allows to use timezone-related data from `ZoneRulesProvider` (instead of ICU4J data files).
15+
* Temporal objects can be converted to compatible Java objects when possible, using the `Value` API's methods like `asDate()`.
16+
1217

1318
## Version 22.1.0
1419
* Updated Node.js to version 16.14.2.

‎common.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@
134134
"common": {},
135135
"linux": {
136136
"packages": {
137-
"binutils": "==2.23.2",
138-
"gcc": "==8.3.0",
137+
"00:devtoolset": "==7",
139138
"cmake": "==3.15.2"
140139
}
141140
},
@@ -163,14 +162,14 @@
163162
},
164163
"linux_amd64": {
165164
"packages": {
166-
"devtoolset": "==7",
167-
"binutils": ">=2.34",
165+
"00:devtoolset": "==7",
166+
"01:binutils": ">=2.34",
168167
"ruby": ">=2.1.0"
169168
}
170169
},
171170
"linux_aarch64": {
172171
"packages": {
173-
"devtoolset": "==7",
172+
"00:devtoolset": "==7",
174173
"ruby": ">=2.1.0"
175174
}
176175
},

‎graal-js/LICENSE_GRAALJS‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
2+
Graal.JS
3+
4+
Copyright (c) 2010, 2022, Oracle and/or its affiliates.
5+
6+
The Universal Permissive License (UPL), Version 1.0
7+
8+
Subject to the condition set forth below, permission is hereby
9+
granted to any person obtaining a copy of this software, associated
10+
documentation and/or data (collectively the "Software"), free of charge and
11+
under any and all copyright rights in the Software, and any and all patent
12+
rights owned or freely licensable by each licensor hereunder covering either
13+
(i) the unmodified Software as contributed to or provided by such licensor, or
14+
(ii) the Larger Works (as defined below), to deal in both
15+
16+
17+
18+
(a) the Software, and
19+
20+
(b) any piece of software and/or hardware listed in the lrgrwrks.txt
21+
file if one is included with the Software (each a “Larger Work” to which
22+
the Software is contributed by such licensors),
23+
24+
without restriction, including without limitation the rights to
25+
copy, create derivative works of, display, perform, and distribute the Software
26+
and make, use, sell, offer for sale, import, export, have made, and have sold
27+
the Software and the Larger Work(s), and to sublicense the foregoing rights on
28+
either these or other terms.
29+
30+
This license is subject to the following condition:
31+
32+
The above copyright notice and either this complete permission
33+
notice or at a minimum a reference to the UPL must be included in all copies or
34+
substantial portions of the Software.
35+
36+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
37+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
38+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
39+
EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
40+
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
41+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
42+
DEALINGS IN THE SOFTWARE.
43+
44+
===========================================================================
45+
46+
WRITTEN OFFER FOR SOURCE CODE
47+
For any software that you receive from Oracle in binary form which is licensed
48+
under an open source license that gives you the right to receive the source
49+
code for that binary, you can obtain a copy of the applicable source code by
50+
visiting http://www.oracle.com/goto/opensourcecode. If the source code for the
51+
binary was not provided to you with the binary, you can also receive a copy of
52+
the source code on physical media by submitting a written request to the
53+
address listed below or by sending an email to Oracle using the following link:
54+
http://www.oracle.com/goto/opensourcecode/request.
55+
56+
Oracle America, Inc.
57+
Attn: Senior Vice President
58+
Development and Engineering Legal
59+
500 Oracle Parkway, 10th Floor
60+
Redwood Shores, CA 94065
61+
62+
Your request should include:
63+
• The name of the binary for which you are requesting the source code
64+
• The name and version number of the Oracle product containing the binary
65+
• The date you received the Oracle product
66+
• Your name
67+
• Your company name (if applicable)
68+
• Your return mailing address and email, and
69+
• A telephone number in the event we need to reach you.
70+
71+
We may charge you a fee to cover the cost of physical media and processing.
72+
Your request must be sent
73+
a. within three (3) years of the date you received the Oracle product that
74+
included the binary that is the subject of your request, or
75+
b. in the case of code licensed under the GPL v3 for as long as Oracle
76+
offers spare parts or customer support for that product model.
77+
78+
===========================================================================

‎graal-js/THIRD_PARTY_LICENSE_GRAALJS.txt‎

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
The following software (or certain identified files distributed with the
2+
software) may be included in this product.
3+
4+
---------------------------------------------------
5+
DToA
6+
---------------------------------------------------
7+
8+
/****************************************************************
9+
*
10+
* The author of this software is David M. Gay.
11+
*
12+
* Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
13+
*
14+
* Permission to use, copy, modify, and distribute this software for any
15+
* purpose without fee is hereby granted, provided that this entire notice
16+
* is included in all copies of any software which is or includes a copy
17+
* or modification of this software and in all copies of the supporting
18+
* documentation for such software.
19+
*
20+
* THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
21+
* WARRANTY. IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
22+
* REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
23+
* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
24+
*
25+
***************************************************************/
26+
27+
28+
---------------------------------------------------
29+
FastDtoa, CachedPowers, DiyFp, DoubleHelper
30+
---------------------------------------------------
31+
32+
// Copyright 2010 the V8 project authors. All rights reserved.
33+
// Redistribution and use in source and binary forms, with or without
34+
// modification, are permitted provided that the following conditions are
35+
// met:
36+
//
37+
// * Redistributions of source code must retain the above copyright
38+
// notice, this list of conditions and the following disclaimer.
39+
// * Redistributions in binary form must reproduce the above
40+
// copyright notice, this list of conditions and the following
41+
// disclaimer in the documentation and/or other materials provided
42+
// with the distribution.
43+
// * Neither the name of Google Inc. nor the names of its
44+
// contributors may be used to endorse or promote products derived
45+
// from this software without specific prior written permission.
46+
//
47+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
48+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
49+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
50+
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
51+
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52+
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53+
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
54+
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
55+
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
56+
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
57+
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
58+
59+
// Ported to Java from Mozilla's version of V8-dtoa by Hannes Wallnoefer.
60+
// The original revision was 67d1049b0bf9 from the mozilla-central tree.
61+
62+
63+
---------------------------------------------------
64+
FastDtoaBuilder
65+
---------------------------------------------------
66+
67+
/*
68+
* This Source Code Form is subject to the terms of the Mozilla Public
69+
* License, v. 2.0. If a copy of the MPL was not distributed with this
70+
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
71+
*/
72+
73+
---------------------------------------------------
74+
ICU4J
75+
---------------------------------------------------
76+
// © 2016 and later: Unicode, Inc. and others.
77+
// License & terms of use: http://www.unicode.org/copyright.html#License
78+
/*
79+
*******************************************************************************
80+
* Copyright (C) 1996-2015, International Business Machines Corporation and
81+
* others. All Rights Reserved.
82+
*******************************************************************************
83+
*/
84+
85+
86+
---------------------------------------------------
87+
UNICODE
88+
---------------------------------------------------
89+
90+
UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
91+
92+
See Terms of Use <https://www.unicode.org/copyright.html>
93+
for definitions of Unicode Inc.’s Data Files and Software.
94+
95+
NOTICE TO USER: Carefully read the following legal agreement.
96+
BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
97+
DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
98+
YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
99+
TERMS AND CONDITIONS OF THIS AGREEMENT.
100+
IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
101+
THE DATA FILES OR SOFTWARE.
102+
103+
COPYRIGHT AND PERMISSION NOTICE
104+
105+
Copyright © 1991-2022 Unicode, Inc. All rights reserved.
106+
Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
107+
108+
Permission is hereby granted, free of charge, to any person obtaining
109+
a copy of the Unicode data files and any associated documentation
110+
(the "Data Files") or Unicode software and any associated documentation
111+
(the "Software") to deal in the Data Files or Software
112+
without restriction, including without limitation the rights to use,
113+
copy, modify, merge, publish, distribute, and/or sell copies of
114+
the Data Files or Software, and to permit persons to whom the Data Files
115+
or Software are furnished to do so, provided that either
116+
(a) this copyright and permission notice appear with all copies
117+
of the Data Files or Software, or
118+
(b) this copyright and permission notice appear in associated
119+
Documentation.
120+
121+
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
122+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
123+
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
124+
NONINFRINGEMENT OF THIRD PARTY RIGHTS.
125+
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
126+
NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
127+
DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
128+
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
129+
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
130+
PERFORMANCE OF THE DATA FILES OR SOFTWARE.
131+
132+
Except as contained in this notice, the name of a copyright holder
133+
shall not be used in advertising or otherwise to promote the sale,
134+
use or other dealings in these Data Files or Software without prior
135+
written authorization of the copyright holder.
136+
137+
---------------------------------------------------
138+
ASM
139+
---------------------------------------------------
140+
141+
ASM is released under the following 3-Clause BSD License:
142+
143+
ASM: a very small and fast Java bytecode manipulation framework
144+
Copyright (c) 2000-2011 INRIA, France Telecom
145+
All rights reserved.
146+
147+
Redistribution and use in source and binary forms, with or without
148+
modification, are permitted provided that the following conditions
149+
are met:
150+
1. Redistributions of source code must retain the above copyright
151+
notice, this list of conditions and the following disclaimer.
152+
2. Redistributions in binary form must reproduce the above copyright
153+
notice, this list of conditions and the following disclaimer in the
154+
documentation and/or other materials provided with the distribution.
155+
3. Neither the name of the copyright holders nor the names of its
156+
contributors may be used to endorse or promote products derived from
157+
this software without specific prior written permission.
158+
159+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
160+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
161+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
162+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
163+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
164+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
165+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
166+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
167+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
168+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
169+
THE POSSIBILITY OF SUCH DAMAGE.
170+

‎graal-js/mx.graal-js/mx_graal_js.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,8 @@ def is_included(path):
346346
standalone_dependencies={
347347
'GraalVM license files': ('', ['GRAALVM-README.md']),
348348
},
349-
license_files=[],
350-
third_party_license_files=[],
349+
license_files=['LICENSE_GRAALJS.txt'],
350+
third_party_license_files=['THIRD_PARTY_LICENSE_GRAALJS.txt'],
351351
dependencies=[
352352
'Truffle',
353353
'TRegex',

‎graal-js/mx.graal-js/suite.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{
2525
"name" : "regex",
2626
"subdir" : True,
27-
"version" : "043078c54f480a97e52de5e2fa2ed92be216fff6",
27+
"version" : "df6eaf868a70a24c047ac7e677ffdb7b460450f4",
2828
"urls" : [
2929
{"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
3030
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -555,6 +555,8 @@
555555
"./": [
556556
"file:README.md",
557557
],
558+
"LICENSE_GRAALJS.txt" : "file:LICENSE_GRAALJS",
559+
"THIRD_PARTY_LICENSE_GRAALJS.txt": "file:THIRD_PARTY_LICENSE_GRAALJS.txt",
558560
},
559561
},
560562

0 commit comments

Comments
 (0)