Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/make/build.xml	Mon Jul 01 23:36:40 2013 +0530
     1.2 +++ b/make/build.xml	Tue Jul 02 07:45:16 2013 -0300
     1.3 @@ -124,7 +124,7 @@
     1.4      <echo message="release=${nashorn.version}" file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties" append="true"/>
     1.5    </target>
     1.6  
     1.7 -  <target name="jar" depends="compile, run-nasgen, generate-cc-template" description="Creates nashorn.jar">
     1.8 +  <target name="jar" depends="compile, run-nasgen, generate-cc-template" description="Creates nashorn.jar" unless="compile.suppress.jar">
     1.9      <jar jarfile="${dist.jar}" manifest="${meta.inf.dir}/MANIFEST.MF" index="true" filesetmanifest="merge">
    1.10        <fileset dir="${build.classes.dir}"/>
    1.11        <manifest>
    1.12 @@ -139,7 +139,13 @@
    1.13        </manifest>
    1.14      </jar>
    1.15    </target>
    1.16 -  
    1.17 +
    1.18 +  <target name="use-promoted-nashorn" depends="init">
    1.19 +    <delete file="${dist.dir}/nashorn.jar"/>
    1.20 +    <copy file="${java.home}/lib/ext/nashorn.jar" todir="${dist.dir}"/>
    1.21 +    <property name="compile.suppress.jar" value="defined"/>
    1.22 +  </target>
    1.23 +
    1.24    <target name="build-fxshell" depends="jar">
    1.25      <description>Builds the javafx shell.</description>
    1.26      <mkdir dir="${fxshell.classes.dir}"/>
    1.27 @@ -238,7 +244,7 @@
    1.28      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.29      <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
    1.30      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.31 -    
    1.32 +
    1.33      <!-- TestNG framework jar needs AllPermission -->
    1.34      <echo message="grant codeBase &quot;file:/${basedir}/${file.reference.testng.jar}&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
    1.35      <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
    1.36 @@ -462,24 +468,24 @@
    1.37    <!-- get all external test scripts -->
    1.38    <target name="externals" depends="init, check-external-tests, get-test262, get-octane, get-sunspider">
    1.39      <!-- make external test dir -->
    1.40 -    <mkdir dir="${test.external.dir}"/> 
    1.41 +    <mkdir dir="${test.external.dir}"/>
    1.42  
    1.43      <!-- jquery -->
    1.44 -    <mkdir dir="${test.external.dir}/jquery"/>    
    1.45 +    <mkdir dir="${test.external.dir}/jquery"/>
    1.46      <get src="http://code.jquery.com/jquery-1.7.2.js" dest="${test.external.dir}/jquery" skipexisting="true" ignoreerrors="true"/>
    1.47      <get src="http://code.jquery.com/jquery-1.7.2.min.js" dest="${test.external.dir}/jquery" skipexisting="true" ignoreerrors="true"/>
    1.48  
    1.49      <!-- prototype -->
    1.50 -    <mkdir dir="${test.external.dir}/prototype"/>    
    1.51 +    <mkdir dir="${test.external.dir}/prototype"/>
    1.52      <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"/>
    1.53  
    1.54      <!-- underscorejs -->
    1.55 -    <mkdir dir="${test.external.dir}/underscore"/> 
    1.56 +    <mkdir dir="${test.external.dir}/underscore"/>
    1.57      <get src="http://underscorejs.org/underscore.js" dest="${test.external.dir}/underscore" skipexisting="true" ignoreerrors="true"/>
    1.58      <get src="http://underscorejs.org/underscore-min.js" dest="${test.external.dir}/underscore" skipexisting="true" ignoreerrors="true"/>
    1.59  
    1.60      <!-- yui -->
    1.61 -    <mkdir dir="${test.external.dir}/yui"/> 
    1.62 +    <mkdir dir="${test.external.dir}/yui"/>
    1.63      <get src="http://yui.yahooapis.com/3.5.1/build/yui/yui.js" dest="${test.external.dir}/yui" skipexisting="true" ignoreerrors="true"/>
    1.64      <get src="http://yui.yahooapis.com/3.5.1/build/yui/yui-min.js" dest="${test.external.dir}/yui" skipexisting="true" ignoreerrors="true"/>
    1.65