Skip to content

Commit a54a3de

Browse files
committed
revert changes to build.xml
1 parent 8aa535c commit a54a3de

File tree

1 file changed

+12
-42
lines changed

1 file changed

+12
-42
lines changed

build.xml

+12-42
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
<project basedir="." default="build" name="socket.io-java-client">
88
<property environment="env"/>
99
<property name="ECLIPSE_HOME" value="../../../../../Applications/eclipse"/>
10-
<property name="treckme.location" value="../treckme"/>
11-
<property name="treckme_android.location" value="../treckme_android"/>
1210
<property name="junit.output.dir" value="junit"/>
1311
<property name="debuglevel" value="source,lines,vars"/>
1412
<property name="target" value="1.6"/>
@@ -19,9 +17,9 @@
1917
</path>
2018
<path id="socket.io-java-client.classpath">
2119
<pathelement location="bin"/>
22-
<path refid="JUnit 4.libraryclasspath"/>
23-
<pathelement location="libs/weberknecht-0.1.1.jar"/>
2420
<pathelement location="libs/json-org.jar"/>
21+
<pathelement location="libs/weberknecht-0.1.1.jar"/>
22+
<path refid="JUnit 4.libraryclasspath"/>
2523
</path>
2624
<target name="init">
2725
<mkdir dir="bin"/>
@@ -30,16 +28,6 @@
3028
<exclude name="**/*.java"/>
3129
</fileset>
3230
</copy>
33-
<copy includeemptydirs="false" todir="bin">
34-
<fileset dir="examples">
35-
<exclude name="**/*.java"/>
36-
</fileset>
37-
</copy>
38-
<copy includeemptydirs="false" todir="bin">
39-
<fileset dir="tests">
40-
<exclude name="**/*.java"/>
41-
</fileset>
42-
</copy>
4331
</target>
4432
<target name="clean">
4533
<delete dir="bin"/>
@@ -53,29 +41,8 @@
5341
<src path="src"/>
5442
<classpath refid="socket.io-java-client.classpath"/>
5543
</javac>
56-
<javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
57-
<src path="examples"/>
58-
<classpath refid="socket.io-java-client.classpath"/>
59-
</javac>
60-
<javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
61-
<src path="tests"/>
62-
<classpath refid="socket.io-java-client.classpath"/>
63-
</javac>
64-
</target>
65-
<target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects">
66-
<ant antfile="build.xml" dir="${treckme.location}" inheritAll="false" target="clean"/>
67-
<ant antfile="build.xml" dir="${treckme.location}" inheritAll="false" target="build">
68-
<propertyset>
69-
<propertyref name="build.compiler"/>
70-
</propertyset>
71-
</ant>
72-
<ant antfile="build.xml" dir="${treckme_android.location}" inheritAll="false" target="clean"/>
73-
<ant antfile="build.xml" dir="${treckme_android.location}" inheritAll="false" target="build">
74-
<propertyset>
75-
<propertyref name="build.compiler"/>
76-
</propertyset>
77-
</ant>
7844
</target>
45+
<target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
7946
<target description="copy Eclipse compiler jars to ant lib directory" name="init-eclipse-compiler">
8047
<copy todir="${ant.library.dir}">
8148
<fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
@@ -99,12 +66,7 @@
9966
</junit>
10067
</target>
10168
<target name="BasicExample">
102-
<java classname="basic.BasicExample" failonerror="true" fork="yes">
103-
<classpath refid="socket.io-java-client.classpath"/>
104-
</java>
105-
</target>
106-
<target name="ChatFrame">
107-
<java classname="chat.ChatFrame" failonerror="true" fork="yes">
69+
<java classname="BasicExample" failonerror="true" fork="yes">
10870
<classpath refid="socket.io-java-client.classpath"/>
10971
</java>
11072
</target>
@@ -132,4 +94,12 @@
13294
<report format="frames" todir="${junit.output.dir}"/>
13395
</junitreport>
13496
</target>
97+
<target name="jar" depends="build-project">
98+
<mkdir dir="jar"/>
99+
<jar destfile="jar/socketio.jar" basedir="bin">
100+
<zipgroupfileset dir="libs/" includes="*.jar"/>
101+
<manifest>
102+
</manifest>
103+
</jar>
104+
</target>
135105
</project>

0 commit comments

Comments
 (0)