1.1 --- a/make/build.xml Thu Feb 14 13:01:52 2013 +0100
1.2 +++ b/make/build.xml Thu Feb 14 13:22:26 2013 +0100
1.3 @@ -54,19 +54,11 @@
1.4
1.5 <target name="clean" depends="init, clean-nasgen">
1.6 <delete includeemptydirs="true">
1.7 - <fileset dir="${build.dir}" excludes="${dynalink.dir.name}/**/*" erroronmissingdir="false"/>
1.8 + <fileset dir="${build.dir}" erroronmissingdir="false"/>
1.9 </delete>
1.10 <delete dir="${dist.dir}"/>
1.11 </target>
1.12
1.13 - <target name="clean-dynalink">
1.14 - <delete dir="${dynalink.dir}"/>
1.15 - </target>
1.16 -
1.17 - <target name="clean-all" depends="clean-dynalink, clean">
1.18 - <delete dir="${build.dir}"/>
1.19 - </target>
1.20 -
1.21 <!-- do it only if ASM is not available -->
1.22 <target name="compile-asm" depends="prepare" unless="asm.available">
1.23 <javac srcdir="${jdk.asm.src.dir}"
1.24 @@ -79,29 +71,7 @@
1.25 includeantruntime="false"/>
1.26 </target>
1.27
1.28 - <target name="check-dynalink-uptodate" depends="init">
1.29 - <property name="versioned.dynalink.jar" value="${dynalink.dir}/dynalink-${dynalink.jar.version}.jar"/>
1.30 - <condition property="dynalink.uptodate">
1.31 - <and>
1.32 - <available file="${versioned.dynalink.jar}"/>
1.33 - <filesmatch file1="${versioned.dynalink.jar}" file2="${dynalink.jar}"/>
1.34 - </and>
1.35 - </condition>
1.36 - </target>
1.37 -
1.38 - <target name="get-dynalink" depends="check-dynalink-uptodate" unless="dynalink.uptodate">
1.39 - <mkdir dir="${dynalink.dir}"/>
1.40 - <!-- Delete previous snapshots, if any -->
1.41 - <delete>
1.42 - <fileset dir="${dynalink.dir}" includes="*"/>
1.43 - </delete>
1.44 - <property name="dynalink.download.base.url" value="http://oss.sonatype.org/content/repositories/${dynalink.version.type}s/org/dynalang/dynalink/${dynalink.version}/dynalink-${dynalink.jar.version}"/>
1.45 - <get src="${dynalink.download.base.url}.jar" dest="${versioned.dynalink.jar}" usetimestamp="true"/>
1.46 - <get src="${dynalink.download.base.url}-sources.jar" dest="${dynalink.dir}/dynalink-sources.jar" usetimestamp="true"/>
1.47 - <copy file="${versioned.dynalink.jar}" tofile="${dynalink.jar}" overwrite="true"/>
1.48 - </target>
1.49 -
1.50 - <target name="compile" depends="compile-asm, get-dynalink" description="Compiles nashorn">
1.51 + <target name="compile" depends="compile-asm" description="Compiles nashorn">
1.52 <javac srcdir="${src.dir}"
1.53 destdir="${build.classes.dir}"
1.54 classpath="${javac.classpath}"
1.55 @@ -126,6 +96,8 @@
1.56 <copy todir="${build.classes.dir}/jdk/nashorn/tools/resources">
1.57 <fileset dir="${src.dir}/jdk/nashorn/tools/resources/"/>
1.58 </copy>
1.59 + <copy file="${src.dir}/jdk/internal/dynalink/support/messages.properties" todir="${build.classes.dir}/jdk/internal/dynalink/support"/>
1.60 +
1.61 <echo message="full=${nashorn.fullversion}" file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties"/>
1.62 <echo file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties" append="true">${line.separator}</echo>
1.63 <echo message="release=${nashorn.version}" file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties" append="true"/>
1.64 @@ -134,7 +106,6 @@
1.65 <target name="jar" depends="compile, run-nasgen" description="Creates nashorn.jar">
1.66 <jar jarfile="${dist.jar}" manifest="${meta.inf.dir}/MANIFEST.MF" index="true" filesetmanifest="merge">
1.67 <fileset dir="${build.classes.dir}"/>
1.68 - <zipfileset src="${dynalink.jar}"/>
1.69 <manifest>
1.70 <attribute name="Archiver-Version" value="n/a"/>
1.71 <attribute name="Build-Jdk" value="${java.runtime.version}"/>
1.72 @@ -152,12 +123,10 @@
1.73 <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="src/overview.html" windowtitle="${nashorn.product.name} ${nashorn.version}" additionalparam="-quiet" failonerror="true">
1.74 <classpath>
1.75 <pathelement location="${build.classes.dir}"/>
1.76 - <pathelement location="${dynalink.jar}"/>
1.77 </classpath>
1.78 <fileset dir="${src.dir}" includes="**/*.java"/>
1.79 <fileset dir="${jdk.asm.src.dir}" includes="**/*.java"/>
1.80 <link href="http://docs.oracle.com/javase/7/docs/api/"/>
1.81 - <link href="http://szegedi.github.com/dynalink/0.4/javadoc/"/>
1.82 <!-- The following tags are used only in ASM sources - just ignore these -->
1.83 <tag name="label" description="label tag in ASM sources" enabled="false"/>
1.84 <tag name="linked" description="linked tag in ASM sources" enabled="false"/>
