Skip to content

Commit 8bda314

Browse files
rbrirbri
committed
unified whitespaces
1 parent 6fe978b commit 8bda314

File tree

1 file changed

+155
-155
lines changed

1 file changed

+155
-155
lines changed

‎build.xml‎

Lines changed: 155 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -15,65 +15,65 @@ Ahmed Ashour
1515
====================================================================== -->
1616
<project name="htmlunit-core-js build" default="jar-all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
1717

18-
<property name="version" value="2.28-SNAPSHOT"/>
18+
<property name="version" value="2.28"/>
1919

20-
<property name="target-jvm" value="1.8"/>
21-
<property name="source-level" value="1.8"/>
20+
<property name="target-jvm" value="1.8"/>
21+
<property name="source-level" value="1.8"/>
2222
<property file="build.properties"/>
23-
<property name="rhino.basedir" location="../htmlunit-rhino-fork"/>
24-
<property name="classes" value="${rhino.basedir}/build/classes"/>
25-
<property name="repackaged-rhino.dir" value="target/repackaged-rhino"/>
26-
<property name="jar" location="target/htmlunit-core-js-${version}.jar" />
27-
<property name="jar.sources" location="target/htmlunit-core-js-${version}-sources.jar" />
28-
<property name="javadoc.dir" value="target/javadoc"/>
29-
<property name="jar.javadoc" location="target/htmlunit-core-js-${version}-javadoc.jar" />
30-
<property name="build.dir" location="target"/>
31-
<property name="rhino.diff" location="target/rhinoDiff.txt"/>
32-
33-
34-
<property name="maven-snapshots-repository-id" value="sonatype-nexus-snapshots" />
35-
<property name="maven-snapshots-repository-url" value="https://oss.sonatype.org/content/repositories/snapshots/" />
36-
37-
<target name="clean-compile">
38-
<ant dir="${rhino.basedir}" target="clean"/>
39-
<ant dir="${rhino.basedir}" target="compile"/>
40-
<delete dir="${dist.dir}"/>
41-
</target>
42-
43-
<target name="test" depends="clean-compile" description="Runs htmlunit-specific tests">
44-
<ant antfile="src/build.xml" target="junit"/>
45-
</target>
46-
47-
<target name="repackage" depends="test">
48-
<property name="corejs.dir" value="${repackaged-rhino.dir}/src/net/sourceforge/htmlunit/corejs"/>
49-
50-
<mkdir dir="${corejs.dir}"/>
51-
<copy toDir="${corejs.dir}">
52-
<fileset dir='${rhino.basedir}/src/org/mozilla'>
53-
<include name="**/*"/>
54-
</fileset>
55-
<fileset dir='${rhino.basedir}/toolsrc/org/mozilla'>
56-
<include name="javascript/tools/debugger/**/*.java"/>
57-
<include name="javascript/tools/shell/**/*.java"/>
58-
<include name="javascript/tools/*.java"/>
59-
</fileset>
60-
</copy>
61-
62-
<replace dir="${corejs.dir}" token="org.mozilla" value="net.sourceforge.htmlunit.corejs"/>
63-
<replace dir="${corejs.dir}" token="org/mozilla" value="net/sourceforge/htmlunit/corejs"/>
64-
65-
<antcall target="beautify"/>
66-
67-
<mkdir dir='${repackaged-rhino.dir}/classes'/>
68-
<javac destdir='${repackaged-rhino.dir}/classes' debug='true' encoding="ISO-8859-1" source='${source-level}' target='${target-jvm}' includeAntRuntime='false'>
69-
<src path='${repackaged-rhino.dir}/src' />
70-
</javac>
71-
<copy toDir="${repackaged-rhino.dir}/classes">
72-
<fileset dir="${repackaged-rhino.dir}/src">
73-
<exclude name="**/*.java"/>
74-
</fileset>
75-
</copy>
76-
</target>
23+
<property name="rhino.basedir" location="../htmlunit-rhino-fork"/>
24+
<property name="classes" value="${rhino.basedir}/build/classes"/>
25+
<property name="repackaged-rhino.dir" value="target/repackaged-rhino"/>
26+
<property name="jar" location="target/htmlunit-core-js-${version}.jar" />
27+
<property name="jar.sources" location="target/htmlunit-core-js-${version}-sources.jar" />
28+
<property name="javadoc.dir" value="target/javadoc"/>
29+
<property name="jar.javadoc" location="target/htmlunit-core-js-${version}-javadoc.jar" />
30+
<property name="build.dir" location="target"/>
31+
<property name="rhino.diff" location="target/rhinoDiff.txt"/>
32+
33+
34+
<property name="maven-snapshots-repository-id" value="sonatype-nexus-snapshots" />
35+
<property name="maven-snapshots-repository-url" value="https://oss.sonatype.org/content/repositories/snapshots/" />
36+
37+
<target name="clean-compile">
38+
<ant dir="${rhino.basedir}" target="clean"/>
39+
<ant dir="${rhino.basedir}" target="compile"/>
40+
<delete dir="${dist.dir}"/>
41+
</target>
42+
43+
<target name="test" depends="clean-compile" description="Runs htmlunit-specific tests">
44+
<ant antfile="src/build.xml" target="junit"/>
45+
</target>
46+
47+
<target name="repackage" depends="test">
48+
<property name="corejs.dir" value="${repackaged-rhino.dir}/src/net/sourceforge/htmlunit/corejs"/>
49+
50+
<mkdir dir="${corejs.dir}"/>
51+
<copy toDir="${corejs.dir}">
52+
<fileset dir='${rhino.basedir}/src/org/mozilla'>
53+
<include name="**/*"/>
54+
</fileset>
55+
<fileset dir='${rhino.basedir}/toolsrc/org/mozilla'>
56+
<include name="javascript/tools/debugger/**/*.java"/>
57+
<include name="javascript/tools/shell/**/*.java"/>
58+
<include name="javascript/tools/*.java"/>
59+
</fileset>
60+
</copy>
61+
62+
<replace dir="${corejs.dir}" token="org.mozilla" value="net.sourceforge.htmlunit.corejs"/>
63+
<replace dir="${corejs.dir}" token="org/mozilla" value="net/sourceforge/htmlunit/corejs"/>
64+
65+
<antcall target="beautify"/>
66+
67+
<mkdir dir='${repackaged-rhino.dir}/classes'/>
68+
<javac destdir='${repackaged-rhino.dir}/classes' debug='true' encoding="ISO-8859-1" source='${source-level}' target='${target-jvm}' includeAntRuntime='false'>
69+
<src path='${repackaged-rhino.dir}/src' />
70+
</javac>
71+
<copy toDir="${repackaged-rhino.dir}/classes">
72+
<fileset dir="${repackaged-rhino.dir}/src">
73+
<exclude name="**/*.java"/>
74+
</fileset>
75+
</copy>
76+
</target>
7777

7878
<target name="beautify" depends="beautify-check" if="eclipse.bin">
7979
<exec executable="${eclipse.bin}" failonerror="true">
@@ -88,105 +88,105 @@ Ahmed Ashour
8888
</target>
8989

9090
<target name="beautify-check" unless="eclipse.bin">
91-
<echo message="*******************************************************************"/>
92-
<echo message="&quot;eclipse.bin&quot; is not defined, skipping beautifying the source code."/>
91+
<echo message="*******************************************************************"/>
92+
<echo message="&quot;eclipse.bin&quot; is not defined, skipping beautifying the source code."/>
9393
<echo message="*******************************************************************"/>
9494
</target>
9595

96-
<target name="jar-with-source" depends="repackage, generate-rhino-diff">
97-
<basename property="rhino.diff.filename" file="${rhino.diff}"/>
98-
<dirname property="rhino.diff.dirname" file="${rhino.diff}"/>
99-
<jar destfile="${jar}">
100-
<fileset dir='${repackaged-rhino.dir}/classes' />
101-
<fileset dir='${rhino.diff.dirname}' includes="${rhino.diff.filename}"/>
102-
</jar>
103-
<jar destfile="${jar.sources}">
104-
<fileset dir='${repackaged-rhino.dir}/src'>
105-
<include name="**/*"/>
106-
</fileset>
107-
<fileset dir='${rhino.diff.dirname}' includes="${rhino.diff.filename}"/>
108-
</jar>
109-
</target>
110-
111-
<target name="jar-all" depends="jar-with-source">
112-
<mkdir dir="${javadoc.dir}"/>
113-
<javadoc sourcepath='${repackaged-rhino.dir}/src' destdir='${javadoc.dir}'
114-
author='true' version='true' use='true'
115-
windowtitle="HtmlUnit core-js-${version}"
116-
doctitle="HtmlUnit core-js-${version}" encoding="ISO-8859-1"
117-
/>
118-
<jar destfile="${jar.javadoc}">
119-
<fileset dir='${javadoc.dir}' />
120-
</jar>
121-
</target>
122-
123-
<target name="bundle">
124-
<!-- <gpg file="pom.xml"/>
125-
<gpg file="${jar}"/>
126-
<gpg file="${jar.sources}"/>
127-
<gpg file="${jar.javadoc}"/> -->
128-
<jar destfile="build/bundle.jar">
129-
<fileset dir='.'>
130-
<include name="pom.xml"/>
131-
<include name="pom.xml.asc"/>
132-
</fileset>
133-
<fileset dir="build" includes="*.jar,*.jar.asc" />
134-
</jar>
135-
<delete file="pom.xml.asc"/>
136-
</target>
137-
138-
<target name="check-maven-ant-tasks">
139-
<mkdir dir="lib"/>
140-
<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"/>
141-
<get src="${maven-ant-tasks.url}" dest="lib" skipexisting="true"/>
142-
</target>
143-
144-
<target name="deploy-snapshot" depends="check-maven-ant-tasks,jar-with-source"
145-
description="Deploys a snapshot to Sonatype snapshot repository">
146-
147-
<path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" />
148-
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
149-
classpathref="maven-ant-tasks.classpath" />
150-
151-
<artifact:mvn>
152-
<arg value="org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy-file" />
153-
<arg value="-Durl=${maven-snapshots-repository-url}" />
154-
<arg value="-DrepositoryId=${maven-snapshots-repository-id}" />
155-
<arg value="-DpomFile=pom.xml" />
156-
<arg value="-Dfile=${jar}" />
157-
</artifact:mvn>
158-
159-
<!-- "uniqueVersion=true" will not have sources because of different timestamps,
160-
"uniqueVersion=false" will not be refreshed from snapshot repository -->
161-
<!--
162-
<artifact:mvn>
163-
<arg value="org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy-file" />
164-
<arg value="-Durl=${maven-snapshots-repository-url}" />
165-
<arg value="-DrepositoryId=${maven-snapshots-repository-id}" />
166-
<arg value="-DpomFile=pom.xml" />
167-
<arg value="-Dfile=${jar.sources}" />
168-
<arg value="-Dclassifier=sources" />
96+
<target name="jar-with-source" depends="repackage, generate-rhino-diff">
97+
<basename property="rhino.diff.filename" file="${rhino.diff}"/>
98+
<dirname property="rhino.diff.dirname" file="${rhino.diff}"/>
99+
<jar destfile="${jar}">
100+
<fileset dir='${repackaged-rhino.dir}/classes' />
101+
<fileset dir='${rhino.diff.dirname}' includes="${rhino.diff.filename}"/>
102+
</jar>
103+
<jar destfile="${jar.sources}">
104+
<fileset dir='${repackaged-rhino.dir}/src'>
105+
<include name="**/*"/>
106+
</fileset>
107+
<fileset dir='${rhino.diff.dirname}' includes="${rhino.diff.filename}"/>
108+
</jar>
109+
</target>
110+
111+
<target name="jar-all" depends="jar-with-source">
112+
<mkdir dir="${javadoc.dir}"/>
113+
<javadoc sourcepath='${repackaged-rhino.dir}/src' destdir='${javadoc.dir}'
114+
author='true' version='true' use='true'
115+
windowtitle="HtmlUnit core-js-${version}"
116+
doctitle="HtmlUnit core-js-${version}" encoding="ISO-8859-1"
117+
/>
118+
<jar destfile="${jar.javadoc}">
119+
<fileset dir='${javadoc.dir}' />
120+
</jar>
121+
</target>
122+
123+
<target name="bundle">
124+
<!-- <gpg file="pom.xml"/>
125+
<gpg file="${jar}"/>
126+
<gpg file="${jar.sources}"/>
127+
<gpg file="${jar.javadoc}"/> -->
128+
<jar destfile="build/bundle.jar">
129+
<fileset dir='.'>
130+
<include name="pom.xml"/>
131+
<include name="pom.xml.asc"/>
132+
</fileset>
133+
<fileset dir="build" includes="*.jar,*.jar.asc" />
134+
</jar>
135+
<delete file="pom.xml.asc"/>
136+
</target>
137+
138+
<target name="check-maven-ant-tasks">
139+
<mkdir dir="lib"/>
140+
<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"/>
141+
<get src="${maven-ant-tasks.url}" dest="lib" skipexisting="true"/>
142+
</target>
143+
144+
<target name="deploy-snapshot" depends="check-maven-ant-tasks,jar-with-source"
145+
description="Deploys a snapshot to Sonatype snapshot repository">
146+
147+
<path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" />
148+
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
149+
classpathref="maven-ant-tasks.classpath" />
150+
151+
<artifact:mvn>
152+
<arg value="org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy-file" />
153+
<arg value="-Durl=${maven-snapshots-repository-url}" />
154+
<arg value="-DrepositoryId=${maven-snapshots-repository-id}" />
155+
<arg value="-DpomFile=pom.xml" />
156+
<arg value="-Dfile=${jar}" />
157+
</artifact:mvn>
158+
159+
<!-- "uniqueVersion=true" will not have sources because of different timestamps,
160+
"uniqueVersion=false" will not be refreshed from snapshot repository -->
161+
<!--
162+
<artifact:mvn>
163+
<arg value="org.apache.maven.plugins:maven-deploy-plugin:2.8.2:deploy-file" />
164+
<arg value="-Durl=${maven-snapshots-repository-url}" />
165+
<arg value="-DrepositoryId=${maven-snapshots-repository-id}" />
166+
<arg value="-DpomFile=pom.xml" />
167+
<arg value="-Dfile=${jar.sources}" />
168+
<arg value="-Dclassifier=sources" />
169169
<arg value="-DuniqueVersion=false" />
170-
</artifact:mvn> -->
171-
</target>
172-
173-
<target name="install-local" depends="check-maven-ant-tasks,jar-with-source"
174-
description="Installs the jars into the local Maven repository">
175-
<path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" />
176-
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
177-
classpathref="maven-ant-tasks.classpath" />
178-
179-
<artifact:pom id="maven.project" file="pom.xml" />
180-
<artifact:install file="${jar}">
181-
<pom refid="maven.project"/>
182-
<attach file="${jar.sources}" classifier="sources" />
183-
</artifact:install>
184-
</target>
170+
</artifact:mvn> -->
171+
</target>
172+
173+
<target name="install-local" depends="check-maven-ant-tasks,jar-with-source"
174+
description="Installs the jars into the local Maven repository">
175+
<path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" />
176+
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
177+
classpathref="maven-ant-tasks.classpath" />
178+
179+
<artifact:pom id="maven.project" file="pom.xml" />
180+
<artifact:install file="${jar}">
181+
<pom refid="maven.project"/>
182+
<attach file="${jar.sources}" classifier="sources" />
183+
</artifact:install>
184+
</target>
185185

186186
<target name="copy-to-htmlunit" depends="repackage">
187187
<copy todir="../htmlunit/src/main/java" overwrite="true">
188188
<fileset dir="${repackaged-rhino.dir}/src">
189-
<exclude name="**/*.properties"/>
189+
<exclude name="**/*.properties"/>
190190
</fileset>
191191
</copy>
192192
<copy todir="../htmlunit/src/main/resources" overwrite="true">
@@ -196,11 +196,11 @@ Ahmed Ashour
196196
</copy>
197197
</target>
198198

199-
<target name="generate-rhino-diff">
200-
<echo>Generating diff to ${rhino.diff}</echo>
201-
<exec executable="git" dir="${rhino.basedir}" output="${rhino.diff}" failonerror="true">
202-
<arg value="diff"/>
203-
<arg value="upstream/master..HEAD"/>
204-
</exec>
205-
</target>
199+
<target name="generate-rhino-diff">
200+
<echo>Generating diff to ${rhino.diff}</echo>
201+
<exec executable="git" dir="${rhino.basedir}" output="${rhino.diff}" failonerror="true">
202+
<arg value="diff"/>
203+
<arg value="upstream/master..HEAD"/>
204+
</exec>
205+
</target>
206206
</project>

0 commit comments

Comments
 (0)