Skip to content

Commit c692d85

Browse files
eschnoueschnou
committed
Fixed build script to works with Android sdk_r05
1 parent 2a438e2 commit c692d85

File tree

1 file changed

+26
-70
lines changed

1 file changed

+26
-70
lines changed

‎build.xml

+26-70
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,23 @@
11
<project name="asmack" default="compile" basedir=".">
22

3-
<property file="local.properties" />
43
<property name="jar.suffix" value="" />
54
<property name="build.all" value="false" />
5+
<property file="local.properties" />
66

7-
<condition property="build-1.1">
8-
<available file="${sdk-location}/platforms/android-1.1/android.jar" />
9-
</condition>
10-
11-
<condition property="build-1.5">
12-
<and>
13-
<istrue value="${build.all}" />
14-
<available file="${sdk-location}/platforms/android-1.5/android.jar" />
15-
</and>
7+
<condition property="build-4">
8+
<available file="${sdk-location}/platforms/android-4/android.jar" />
169
</condition>
1710

18-
<condition property="build-1.6">
19-
<and>
20-
<istrue value="${build.all}" />
21-
<available file="${sdk-location}/platforms/android-1.6/android.jar" />
22-
</and>
11+
<condition property="build-5">
12+
<available file="${sdk-location}/platforms/android-5/android.jar" />
2313
</condition>
2414

25-
<condition property="build-2.0">
26-
<and>
27-
<istrue value="${build.all}" />
28-
<available file="${sdk-location}/platforms/android-2.0/android.jar" />
29-
</and>
15+
<condition property="build-6">
16+
<available file="${sdk-location}/platforms/android-6/android.jar" />
3017
</condition>
3118

32-
<condition property="build-2.0.1">
33-
<and>
34-
<istrue value="${build.all}" />
35-
<available file="${sdk-location}/platforms/android-2.0.1/android.jar" />
36-
</and>
19+
<condition property="build-7">
20+
<available file="${sdk-location}/platforms/android-7/android.jar" />
3721
</condition>
3822

3923
<target name="compile-jse" description="Compile for java se">
@@ -65,35 +49,7 @@
6549
/>
6650
</target>
6751

68-
<target name="compile-a201" description="Compile for android 2.0.1" if="build-2.0.1">
69-
<delete dir="build/classes" failonerror="false" />
70-
<mkdir dir="build/classes" />
71-
<mkdir dir="build/classes/trunk" />
72-
<javac
73-
target="1.5"
74-
srcdir="build/src/trunk"
75-
destdir="build/classes/trunk"
76-
classpath="lib/xmlpull_1_1_3_4c.jar"
77-
bootclasspath="${sdk-location}/platforms/android-2.0.1/android.jar"
78-
debug="true"
79-
debuglevel="source,lines"
80-
/>
81-
<copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy>
82-
<jar
83-
basedir="build/classes/trunk"
84-
destfile="build/asmack-android-2.0.1${jar.suffix}.jar"
85-
filesonly="true"
86-
level="9"
87-
/>
88-
<zip
89-
basedir="build/src/trunk"
90-
destfile="build/asmack-android-2.0.1-source${jar.suffix}.zip"
91-
filesonly="true"
92-
level="9"
93-
/>
94-
</target>
95-
96-
<target name="compile-a20" description="Compile for android 2.0" if="build-2.0">
52+
<target name="compile-a7" description="Compile for android API level 7" if="build-7">
9753
<delete dir="build/classes" failonerror="false" />
9854
<mkdir dir="build/classes" />
9955
<mkdir dir="build/classes/trunk" />
@@ -102,26 +58,26 @@
10258
srcdir="build/src/trunk"
10359
destdir="build/classes/trunk"
10460
classpath="lib/xmlpull_1_1_3_4c.jar"
105-
bootclasspath="${sdk-location}/platforms/android-2.0/android.jar"
61+
bootclasspath="${sdk-location}/platforms/android-7/android.jar"
10662
debug="true"
10763
debuglevel="source,lines"
10864
/>
10965
<copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy>
11066
<jar
11167
basedir="build/classes/trunk"
112-
destfile="build/asmack-android-2.0${jar.suffix}.jar"
68+
destfile="build/asmack-android-7${jar.suffix}.jar"
11369
filesonly="true"
11470
level="9"
11571
/>
11672
<zip
11773
basedir="build/src/trunk"
118-
destfile="build/asmack-android-2.0-source${jar.suffix}.zip"
74+
destfile="build/asmack-android-7-source${jar.suffix}.zip"
11975
filesonly="true"
12076
level="9"
12177
/>
12278
</target>
12379

124-
<target name="compile-a16" description="Compile for android 1.6" if="build-1.6">
80+
<target name="compile-a6" description="Compile for android API level 6" if="build-6">
12581
<delete dir="build/classes" failonerror="false" />
12682
<mkdir dir="build/classes" />
12783
<mkdir dir="build/classes/trunk" />
@@ -130,26 +86,26 @@
13086
srcdir="build/src/trunk"
13187
destdir="build/classes/trunk"
13288
classpath="lib/xmlpull_1_1_3_4c.jar"
133-
bootclasspath="${sdk-location}/platforms/android-1.6/android.jar"
89+
bootclasspath="${sdk-location}/platforms/android-6/android.jar"
13490
debug="true"
13591
debuglevel="source,lines"
13692
/>
13793
<copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy>
13894
<jar
13995
basedir="build/classes/trunk"
140-
destfile="build/asmack-android-1.6${jar.suffix}.jar"
96+
destfile="build/asmack-android-6${jar.suffix}.jar"
14197
filesonly="true"
14298
level="9"
14399
/>
144100
<zip
145101
basedir="build/src/trunk"
146-
destfile="build/asmack-android-1.6-source${jar.suffix}.zip"
102+
destfile="build/asmack-android-6-source${jar.suffix}.zip"
147103
filesonly="true"
148104
level="9"
149105
/>
150106
</target>
151107

152-
<target name="compile-a15" description="Compile for android 1.5" if="build-1.5">
108+
<target name="compile-a5" description="Compile for android API level 5" if="build-5">
153109
<delete dir="build/classes" failonerror="false" />
154110
<mkdir dir="build/classes" />
155111
<mkdir dir="build/classes/trunk" />
@@ -158,26 +114,26 @@
158114
srcdir="build/src/trunk"
159115
destdir="build/classes/trunk"
160116
classpath="lib/xmlpull_1_1_3_4c.jar"
161-
bootclasspath="${sdk-location}/platforms/android-1.5/android.jar"
117+
bootclasspath="${sdk-location}/platforms/android-5/android.jar"
162118
debug="true"
163119
debuglevel="source,lines"
164120
/>
165121
<copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy>
166122
<jar
167123
basedir="build/classes/trunk"
168-
destfile="build/asmack-android-1.5${jar.suffix}.jar"
124+
destfile="build/asmack-android-5${jar.suffix}.jar"
169125
filesonly="true"
170126
level="9"
171127
/>
172128
<zip
173129
basedir="build/src/trunk"
174-
destfile="build/asmack-android-1.5-source${jar.suffix}.zip"
130+
destfile="build/asmack-android-5-source${jar.suffix}.zip"
175131
filesonly="true"
176132
level="9"
177133
/>
178134
</target>
179135

180-
<target name="compile-a11" description="Compile for android 1.1" if="build-1.1">
136+
<target name="compile-a4" description="Compile for android API level 4" if="build-4">
181137
<delete dir="build/classes" failonerror="false" />
182138
<mkdir dir="build/classes" />
183139
<mkdir dir="build/classes/trunk" />
@@ -186,20 +142,20 @@
186142
srcdir="build/src/trunk"
187143
destdir="build/classes/trunk"
188144
classpath="lib/xmlpull_1_1_3_4c.jar"
189-
bootclasspath="${sdk-location}/platforms/android-1.1/android.jar"
145+
bootclasspath="${sdk-location}/platforms/android-4/android.jar"
190146
debug="true"
191147
debuglevel="source,lines"
192148
/>
193149
<copy todir="build/classes/trunk"><fileset dir="build/src/trunk" includes="META-INF/**" /></copy>
194150
<jar
195151
basedir="build/classes/trunk"
196-
destfile="build/asmack-android-1.1${jar.suffix}.jar"
152+
destfile="build/asmack-android-4${jar.suffix}.jar"
197153
filesonly="true"
198154
level="9"
199155
/>
200156
<zip
201157
basedir="build/src/trunk"
202-
destfile="build/asmack-android-1.1-source${jar.suffix}.zip"
158+
destfile="build/asmack-android-4-source${jar.suffix}.zip"
203159
filesonly="true"
204160
level="9"
205161
/>
@@ -208,7 +164,7 @@
208164
<target
209165
name="compile"
210166
description="Compile for all targets"
211-
depends="compile-jse,compile-a201,compile-a20,compile-a16,compile-a15,compile-a11"
167+
depends="compile-jse,compile-a7,compile-a6,compile-a5,compile-a4"
212168
/>
213169

214170
</project>

0 commit comments

Comments
 (0)