Mercurial > jdk8-mips64-public > jdk / changeset
changeset
8006676: Integrate Nashorn into new build system
Mon, 28 Jan 2013 16:29:10 -0400
- author
- jlaskey
- date
- Mon, 28 Jan 2013 16:29:10 -0400
- changeset 8663
- a8bbd962f34a
- parent 6445
- e96577d82cbb
- child 8664
- 41654275896d
8006676: Integrate Nashorn into new build system
Reviewed-by: jlaskey
Contributed-by: james.laskey@oracle.com
1.1 --- a/THIRD_PARTY_README Sat Jan 26 16:57:02 2013 +0000 1.2 +++ b/THIRD_PARTY_README Mon Jan 28 16:29:10 2013 -0400 1.3 @@ -6,7 +6,7 @@ 1.4 1.5 --- begin of LICENSE --- 1.6 1.7 -Copyright (c) 2000-2011 France Tlcom 1.8 +Copyright (c) 2000-2011 France TÈlÈcom 1.9 All rights reserved. 1.10 1.11 Redistribution and use in source and binary forms, with or without 1.12 @@ -741,7 +741,7 @@ 1.13 1.14 --- begin of LICENSE --- 1.15 1.16 -Copyright ¬© 2001,2003 Keith Packard 1.17 +Copyright ¬¨¬© 2001,2003 Keith Packard 1.18 1.19 Permission to use, copy, modify, distribute, and sell this software and its 1.20 documentation for any purpose is hereby granted without fee, provided that the 1.21 @@ -1955,16 +1955,16 @@ 1.22 Unicode Terms of Use 1.23 1.24 For the general privacy policy governing access to this site, see the Unicode 1.25 -Privacy Policy. For trademark usage, see the Unicode® Consortium Name and 1.26 +Privacy Policy. For trademark usage, see the Unicode¬Æ Consortium Name and 1.27 Trademark Usage Policy. 1.28 1.29 A. Unicode Copyright. 1.30 - 1. Copyright © 1991-2011 Unicode, Inc. All rights reserved. 1.31 + 1. Copyright ¬© 1991-2011 Unicode, Inc. All rights reserved. 1.32 1.33 2. Certain documents and files on this website contain a legend indicating 1.34 that "Modification is permitted." Any person is hereby authorized, 1.35 without fee, to modify such documents and files to create derivative 1.36 - works conforming to the Unicode® Standard, subject to Terms and 1.37 + works conforming to the Unicode¬Æ Standard, subject to Terms and 1.38 Conditions herein. 1.39 1.40 3. Any person is hereby authorized, without fee, to view, use, reproduce, 1.41 @@ -2030,14 +2030,14 @@ 1.42 1.43 E.Trademarks & Logos. 1.44 1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, 1.45 - Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of 1.46 + Inc. ‚ÄúThe Unicode Consortium‚Äù and ‚ÄúUnicode, Inc.‚Äù are trade names of 1.47 Unicode, Inc. Use of the information and materials found on this 1.48 - website indicates your acknowledgement of Unicode, Inc.’s exclusive 1.49 + website indicates your acknowledgement of Unicode, Inc.‚Äôs exclusive 1.50 worldwide rights in the Unicode Word Mark, the Unicode Logo, and the 1.51 Unicode trade names. 1.52 1.53 - 2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark 1.54 - Policy”) are incorporated herein by reference and you agree to abide by 1.55 + 2. The Unicode Consortium Name and Trademark Usage Policy (‚ÄúTrademark 1.56 + Policy‚Äù) are incorporated herein by reference and you agree to abide by 1.57 the provisions of the Trademark Policy, which may be changed from time 1.58 to time in the sole discretion of Unicode, Inc. 1.59 1.60 @@ -2060,12 +2060,12 @@ 1.61 1.62 2. Modification by Unicode. Unicode shall have the right to modify this 1.63 Agreement at any time by posting it to this site. The user may not 1.64 - assign any part of this Agreement without Unicode’s prior written 1.65 + assign any part of this Agreement without Unicode‚Äôs prior written 1.66 consent. 1.67 1.68 3. Taxes. The user agrees to pay any taxes arising from access to this 1.69 website or use of the information herein, except for those based on 1.70 - Unicode’s net income. 1.71 + Unicode‚Äôs net income. 1.72 1.73 4. Severability. If any provision of this Agreement is declared invalid or 1.74 unenforceable, the remaining provisions of this Agreement shall remain 1.75 @@ -2094,7 +2094,7 @@ 1.76 1.77 COPYRIGHT AND PERMISSION NOTICE 1.78 1.79 -Copyright © 1991-2011 Unicode, Inc. All rights reserved. Distributed under the 1.80 +Copyright ¬© 1991-2011 Unicode, Inc. All rights reserved. Distributed under the 1.81 Terms of Use in http://www.unicode.org/copyright.html. 1.82 1.83 Permission is hereby granted, free of charge, to any person obtaining a copy
2.1 --- a/make/launchers/Makefile Sat Jan 26 16:57:02 2013 +0000 2.2 +++ b/make/launchers/Makefile Mon Jan 28 16:29:10 2013 -0400 2.3 @@ -77,6 +77,10 @@ 2.4 -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, ) 2.5 $(call make-launcher, jps, sun.tools.jps.Jps, , ) 2.6 $(call make-launcher, jrunscript, com.sun.tools.script.shell.Main, , ) 2.7 +$(call make-launcher, jjs, jdk.nashorn.tools.Shell, \ 2.8 + -J-XX:-TieredCompilation \ 2.9 + -J-Xms2G \ 2.10 + -J-Xmx2G, ) 2.11 $(call make-launcher, jsadebugd, sun.jvm.hotspot.jdi.SADebugServer, , ) 2.12 $(call make-launcher, jstack, sun.tools.jstack.JStack, \ 2.13 -J-Dsun.jvm.hotspot.debugger.useProcDebugger \
3.1 --- a/makefiles/CompileLaunchers.gmk Sat Jan 26 16:57:02 2013 +0000 3.2 +++ b/makefiles/CompileLaunchers.gmk Mon Jan 28 16:29:10 2013 -0400 3.3 @@ -311,6 +311,11 @@ 3.4 $(eval $(call SetupLauncher,jrunscript,\ 3.5 -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.script.shell.Main"$(COMMA) }')) 3.6 3.7 +$(eval $(call SetupLauncher,jjs,\ 3.8 + -DJAVA_ARGS='{ "-J-XX:-TieredCompilation"$(COMMA) \ 3.9 + "-J-Xms2G"$(COMMA) "-J-Xmx2G"$(COMMA) \ 3.10 + "jdk.nashorn.tools.Shell"$(COMMA) }')) 3.11 + 3.12 $(eval $(call SetupLauncher,jsadebugd,\ 3.13 -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.jdi.SADebugServer"$(COMMA) }' \ 3.14 -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
4.1 --- a/makefiles/CreateJars.gmk Sat Jan 26 16:57:02 2013 +0000 4.2 +++ b/makefiles/CreateJars.gmk Mon Jan 28 16:29:10 2013 -0400 4.3 @@ -1046,6 +1046,14 @@ 4.4 4.5 ########################################################################################## 4.6 4.7 +# Import nashorn.jar from nashorn dist dir. 4.8 +$(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar: $(NASHORN_DIST)/nashorn.jar 4.9 + $(install-file) 4.10 + 4.11 +JARS += $(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar 4.12 + 4.13 +########################################################################################## 4.14 + 4.15 -include $(CUSTOM_MAKE_DIR)/CreateJars.gmk 4.16 4.17 ##########################################################################################
5.1 --- a/test/tools/launcher/VersionCheck.java Sat Jan 26 16:57:02 2013 +0000 5.2 +++ b/test/tools/launcher/VersionCheck.java Mon Jan 28 16:29:10 2013 -0400 5.3 @@ -73,6 +73,7 @@ 5.4 "jmap", 5.5 "jps", 5.6 "jrunscript", 5.7 + "jjs", 5.8 "jsadebugd", 5.9 "jstack", 5.10 "jstat",
