Group :: Development/Java
RPM: htmlunit-core-js
Navigation
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: htmlunit-core-js-2.23-build.patch
Download
Download
diff -Nru htmlunit-core-js-core-js-2.23/build.xml htmlunit-core-js-core-js-2.23.build/build.xml
--- htmlunit-core-js-core-js-2.23/build.xml 2016-07-27 14:34:28.000000000 +0200
+++ htmlunit-core-js-core-js-2.23.build/build.xml 2016-07-28 04:45:17.776278930 +0200
@@ -13,14 +13,14 @@
Marc Guillemot
Ahmed Ashour
====================================================================== -->
-<project name="htmlunit-core-js build" default="jar-all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+<project name="htmlunit-core-js build" default="jar-all">
<property name="version" value="2.23"/>
<property name="target-jvm" value="1.7"/>
<property name="source-level" value="1.7"/>
<property file="build.properties"/>
- <property name="rhino.basedir" location="../htmlunit-rhino-fork"/>
+ <property name="rhino.basedir" location="${basedir}/htmlunit-rhino-fork"/> <property name="classes" value="${rhino.basedir}/build/classes"/><property name="repackaged-rhino.dir" value="target/repackaged-rhino"/>
<property name="jar" location="target/htmlunit-core-js-${version}.jar" />@@ -44,7 +44,7 @@
<ant antfile="src/build.xml" target="junit"/>
</target>
- <target name="repackage" depends="test">
+ <target name="repackage">
<property name="corejs.dir" value="${repackaged-rhino.dir}/src/net/sourceforge/htmlunit/corejs"/> <mkdir dir="${corejs.dir}"/>@@ -65,7 +65,7 @@
<antcall target="beautify"/>
<mkdir dir='${repackaged-rhino.dir}/classes'/>- <javac destdir='${repackaged-rhino.dir}/classes' debug='true' encoding="ISO-8859-1" source='1.7' target='1.7' includeAntRuntime='false'>+ <javac destdir='${repackaged-rhino.dir}/classes' debug='true' encoding="utf-8" source='1.7' target='1.7' includeAntRuntime='false'> <src path='${repackaged-rhino.dir}/src' /></javac>
<copy toDir="${repackaged-rhino.dir}/classes">@@ -93,7 +93,7 @@
<echo message="*******************************************************************"/>
</target>
- <target name="jar-with-source" depends="repackage, generate-rhino-diff">
+ <target name="jar-with-source" depends="repackage">
<basename property="rhino.diff.filename" file="${rhino.diff}"/> <dirname property="rhino.diff.dirname" file="${rhino.diff}"/> <jar destfile="${jar}">@@ -136,26 +136,11 @@
</target>
<target name="check-maven-ant-tasks">
- <mkdir dir="lib"/>
- <property name="maven-ant-tasks.url" value="http://repo1.maven.org/maven2/org/apache/maven/maven-ant-tasks/2.1.3/maven-ant-tasks-2.1.3.jar"/>
- <get src="${maven-ant-tasks.url}" dest="lib" skipexisting="true"/></target>
<target name="deploy-snapshot" depends="check-maven-ant-tasks,jar-with-source"
description="Deploys a snapshot to Sonatype snapshot repository">
- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
- classpathref="maven-ant-tasks.classpath" />
-
- <artifact:mvn>
- <arg value="org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy-file" />
- <arg value="-Durl=${maven-snapshots-repository-url}" />- <arg value="-DrepositoryId=${maven-snapshots-repository-id}" />- <arg value="-DpomFile=pom.xml" />
- <arg value="-Dfile=${jar}" />- </artifact:mvn>
-
<!-- "uniqueVersion=true" will not have sources because of different timestamps,
"uniqueVersion=false" will not be refreshed from snapshot repository -->
<!--
@@ -172,15 +157,6 @@
<target name="install-local" depends="check-maven-ant-tasks,jar-with-source"
description="Installs the jars into the local Maven repository">
- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
- classpathref="maven-ant-tasks.classpath" />
-
- <artifact:pom id="maven.project" file="pom.xml" />
- <artifact:install file="${jar}">- <pom refid="maven.project"/>
- <attach file="${jar.sources}" classifier="sources" />- </artifact:install>
</target>
<target name="copy-to-htmlunit" depends="repackage">
diff -Nru htmlunit-core-js-core-js-2.23/htmlunit-rhino-fork/build.xml htmlunit-core-js-core-js-2.23.build/htmlunit-rhino-fork/build.xml
--- htmlunit-core-js-core-js-2.23/htmlunit-rhino-fork/build.xml 2015-06-02 08:09:36.000000000 +0200
+++ htmlunit-core-js-core-js-2.23.build/htmlunit-rhino-fork/build.xml 2016-07-28 04:37:06.558219683 +0200
@@ -150,6 +150,8 @@
destdir="${dist.dir}/javadoc"version="true"
author="true"
+ encoding="UTF-8"
+ additionalparam="-Xdoclint:none"
windowtitle="${Name}" /> <zip destfile="${dist.dir}/javadoc.zip" basedir="${dist.dir}/javadoc"/></target>
@@ -161,6 +163,8 @@
version="true"
package="true"
author="true"
+ encoding="UTF-8"
+ additionalparam="-Xdoclint:none"
windowtitle="${Name}"><fileset
dir="."
@@ -173,7 +177,7 @@
<!--
Compiles and tests all sources and then creates the distribution file
-->
- <target name="all" depends="deepclean,compile-all,junit-all,dist">
+ <target name="all" depends="deepclean,compile-all,dist">
</target>
<target name="dist" depends="deepclean,jar,copy-all,javadoc">
diff -Nru htmlunit-core-js-core-js-2.23/htmlunit-rhino-fork/testsrc/build.xml htmlunit-core-js-core-js-2.23.build/htmlunit-rhino-fork/testsrc/build.xml
--- htmlunit-core-js-core-js-2.23/htmlunit-rhino-fork/testsrc/build.xml 2015-06-02 08:09:36.000000000 +0200
+++ htmlunit-core-js-core-js-2.23.build/htmlunit-rhino-fork/testsrc/build.xml 2016-07-28 04:41:41.758246875 +0200
@@ -54,7 +54,6 @@
<target name="junit-compile">
<mkdir dir="${test.classes}" />- <antcall target="get-junit"/>
<javac
destdir="${test.classes}" debug="true"encoding="UTF-8"
@@ -62,8 +61,8 @@
source="${source-level}">
<classpath>
- <pathelement path="lib/junit.jar" />
- <pathelement path="lib/hamcrest.jar" />
+ <fileset dir="/usr/share/java" includes="junit.jar" />
+ <fileset dir="/usr/share/java" includes="hamcrest/all.jar" />
<pathelement path="${classes}" /></classpath>
<src path="testsrc"/>
@@ -83,8 +82,8 @@
source="${source-level}">
<classpath>
- <pathelement path="lib/junit.jar" />
- <pathelement path="lib/hamcrest.jar" />
+ <fileset dir="/usr/share/java" includes="junit.jar" />
+ <fileset dir="/usr/share/java" includes="hamcrest/all.jar" />
<pathelement path="${classes}" /></classpath>
<sourcepath path="testsrc" />
@@ -110,13 +109,13 @@
<get src="${test.emma_ant.url}" dest="lib/emma_ant.jar" usetimestamp="true"/></target>
- <target name="coverage-instrument" depends="get-emma">
+ <target name="coverage-instrument">
<property name="coverage.dir" location="${build.dir}/coverage"/> <property name="coverage.classes.dir" location="${build.dir}/coverage/classes"/> <mkdir dir="${coverage.classes.dir}"/><path id="emma.lib">
- <pathelement location="lib/emma.jar" />
- <pathelement location="lib/emma_ant.jar" />
+ <fileset dir="/usr/share/java" includes="emma.jar" />
+ <fileset dir="/usr/share/java" includes="emma_ant.jar" />
</path>
<taskdef resource="emma_ant.properties" classpathref="emma.lib" />
<property name="coverage.instrumentationfile" location="${coverage.dir}/instrumentation"/>@@ -136,7 +135,7 @@
<target name="junit" depends="junit-compile,coverage-instrument">
<junit printsummary="on" fork="true" forkmode="once" maxmemory="${test.vm.mx}" showoutput="true"- failureproperty="junitFailed">
+ failureproperty="no">
<!--
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,suspend=y,server=y,address=localhost:14000"/>
@@ -150,15 +149,16 @@
<sysproperty key="user.country" value="US"/>
<sysproperty key="user.timezone" value="America/Los_Angeles"/>
<classpath>
- <pathelement location="${xbean.jar}"/>- <pathelement location="${jsr173.jar}"/> <pathelement path="${coverage.classes.dir}" /> <pathelement path="${classes}" /> <pathelement path="${test.classes}" />- <pathelement path="lib/emma.jar"/>
- <pathelement path="lib/junit.jar" />
- <pathelement path="lib/hamcrest.jar" />
<pathelement location="${test.jstests.jar}"/>+ <fileset dir="/usr/share/java" includes="emma.jar" />
+ <fileset dir="/usr/share/java" includes="emma_ant.jar" />
+ <fileset dir="/usr/share/java" includes="bea-stax-api.jar"/>
+ <fileset dir="/usr/share/java" includes="xmlbeans/xbean.jar"/>
+ <fileset dir="/usr/share/java" includes="junit.jar" />
+ <fileset dir="/usr/share/java" includes="hamcrest/all.jar"/>
</classpath>
<batchtest todir="build/test">
<!-- -->
@@ -188,8 +188,8 @@
<classpath>
<pathelement path="${classes}" /> <pathelement path="${test.classes}" />- <pathelement path="lib/junit.jar" />
- <pathelement path="lib/hamcrest.jar" />
+ <fileset dir="/usr/share/java" includes="junit.jar" />
+ <fileset dir="/usr/share/java" includes="hamcrest/all.jar" />
<pathelement location="${test.jstests.jar}"/></classpath>
@@ -209,8 +209,8 @@
<classpath>
<pathelement path="${classes}" /> <pathelement path="${test.classes}" />- <pathelement path="lib/junit.jar" />
- <pathelement path="lib/hamcrest.jar" />
+ <fileset dir="/usr/share/java" includes="junit.jar" />
+ <fileset dir="/usr/share/java" includes="hamcrest/all.jar" />
<pathelement location="${test.jstests.jar}"/></classpath>
<batchtest todir="build/test/benchmark">
@@ -263,8 +263,8 @@
maxmemory="${test.vm.mx}">
<classpath>
- <pathelement location="${xbean.jar}"/>- <pathelement location="${jsr173.jar}"/>+ <fileset dir="/usr/share/java" includes="bea-stax-api.jar"/>
+ <fileset dir="/usr/share/java" includes="xmlbeans/xbean.jar"/>
<pathelement path="${classes}" /> <pathelement path="${test.classes}" /> <pathelement location="${test.jstests.jar}"/>