changeset 39789:297cda6b049d

8160953: Update build-nagen-eclipse task to work with JDK 9 Reviewed-by: lagergren, sundar
author attila
date Tue, 19 Jul 2016 13:12:50 +0200
parents 5bf88dce615f
children 079ffba6e096
files nashorn/make/build-nasgen.xml nashorn/make/build.xml
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/nashorn/make/build-nasgen.xml	Wed Jul 05 21:58:29 2017 +0200
+++ b/nashorn/make/build-nasgen.xml	Tue Jul 19 13:12:50 2016 +0200
@@ -43,14 +43,14 @@
         </java>
     </target>
 
-    <target name="run-nasgen-eclipse">
+    <target name="run-nasgen-eclipse" depends="load-properties">
         <mkdir dir="${basedir}/build/eclipse/.nasgentmp"/>
 
         <java classname="jdk.nashorn.internal.tools.nasgen.Main" fork="true" failonerror="true">
             <classpath>
                 <pathelement location="${basedir}/buildtools/nasgen/dist/nasgen.jar"/>
             </classpath>
-            <jvmarg value="-Xbootclasspath/p:${basedir}/build/eclipse"/>
+            <jvmarg line="${nasgen.module.imports}"/>
             <arg value="${basedir}/build/eclipse"/>
             <arg value="jdk.nashorn.internal.objects"/>
             <arg value="${basedir}/build/eclipse/.nasgentmp"/>
--- a/nashorn/make/build.xml	Wed Jul 05 21:58:29 2017 +0200
+++ b/nashorn/make/build.xml	Tue Jul 19 13:12:50 2016 +0200
@@ -27,11 +27,14 @@
   <import file="build-nasgen.xml"/>
   <import file="code_coverage.xml"/>
 
-  <target name="init-conditions">
+  <target name="load-properties">
     <!-- loading locally defined resources and properties. NB they owerwrite default ones defined later -->
     <property file="${user.home}/.nashorn.project.local.properties"/>
 
     <loadproperties srcFile="make/project.properties"/>
+  </target>
+
+  <target name="init-conditions" depends="load-properties">
     <path id="nashorn.jar.path">
          <pathelement location="${nashorn.jar}"/>
     </path>