Mercurial > hg > openjdk > jdk8 > nashorn
changeset 391:5f9abeb0bb50
8019580: Build Script Change for Nashorn promotion testing
Reviewed-by: jlaskey
Contributed-by: eugene.drobitko@oracle.com
| author | jlaskey |
|---|---|
| date | Tue, 02 Jul 2013 07:45:16 -0300 |
| parents | 9165138b427c |
| children | a7b82e333c31 |
| files | make/build.xml |
| diffstat | 1 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/make/build.xml Mon Jul 01 23:36:40 2013 +0530 +++ b/make/build.xml Tue Jul 02 07:45:16 2013 -0300 @@ -124,7 +124,7 @@ <echo message="release=${nashorn.version}" file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties" append="true"/> </target> - <target name="jar" depends="compile, run-nasgen, generate-cc-template" description="Creates nashorn.jar"> + <target name="jar" depends="compile, run-nasgen, generate-cc-template" description="Creates nashorn.jar" unless="compile.suppress.jar"> <jar jarfile="${dist.jar}" manifest="${meta.inf.dir}/MANIFEST.MF" index="true" filesetmanifest="merge"> <fileset dir="${build.classes.dir}"/> <manifest> @@ -139,7 +139,13 @@ </manifest> </jar> </target> - + + <target name="use-promoted-nashorn" depends="init"> + <delete file="${dist.dir}/nashorn.jar"/> + <copy file="${java.home}/lib/ext/nashorn.jar" todir="${dist.dir}"/> + <property name="compile.suppress.jar" value="defined"/> + </target> + <target name="build-fxshell" depends="jar"> <description>Builds the javafx shell.</description> <mkdir dir="${fxshell.classes.dir}"/> @@ -238,7 +244,7 @@ <echo message="" file="${build.dir}/nashorn.policy" append="true"/> <echo message="};" file="${build.dir}/nashorn.policy" append="true"/> <echo message="" file="${build.dir}/nashorn.policy" append="true"/> - + <!-- TestNG framework jar needs AllPermission --> <echo message="grant codeBase "file:/${basedir}/${file.reference.testng.jar}" {" file="${build.dir}/nashorn.policy" append="true"/> <echo message="" file="${build.dir}/nashorn.policy" append="true"/> @@ -462,24 +468,24 @@ <!-- get all external test scripts --> <target name="externals" depends="init, check-external-tests, get-test262, get-octane, get-sunspider"> <!-- make external test dir --> - <mkdir dir="${test.external.dir}"/> + <mkdir dir="${test.external.dir}"/> <!-- jquery --> - <mkdir dir="${test.external.dir}/jquery"/> + <mkdir dir="${test.external.dir}/jquery"/> <get src="http://code.jquery.com/jquery-1.7.2.js" dest="${test.external.dir}/jquery" skipexisting="true" ignoreerrors="true"/> <get src="http://code.jquery.com/jquery-1.7.2.min.js" dest="${test.external.dir}/jquery" skipexisting="true" ignoreerrors="true"/> <!-- prototype --> - <mkdir dir="${test.external.dir}/prototype"/> + <mkdir dir="${test.external.dir}/prototype"/> <get src="http://ajax.googleapis.com/ajax/libs/prototype/1.7.0/prototype.js" dest="${test.external.dir}/prototype" usetimestamp="true" skipexisting="true" ignoreerrors="true"/> <!-- underscorejs --> - <mkdir dir="${test.external.dir}/underscore"/> + <mkdir dir="${test.external.dir}/underscore"/> <get src="http://underscorejs.org/underscore.js" dest="${test.external.dir}/underscore" skipexisting="true" ignoreerrors="true"/> <get src="http://underscorejs.org/underscore-min.js" dest="${test.external.dir}/underscore" skipexisting="true" ignoreerrors="true"/> <!-- yui --> - <mkdir dir="${test.external.dir}/yui"/> + <mkdir dir="${test.external.dir}/yui"/> <get src="http://yui.yahooapis.com/3.5.1/build/yui/yui.js" dest="${test.external.dir}/yui" skipexisting="true" ignoreerrors="true"/> <get src="http://yui.yahooapis.com/3.5.1/build/yui/yui-min.js" dest="${test.external.dir}/yui" skipexisting="true" ignoreerrors="true"/>