Skip to content

Commit e5532a6

Browse files
author
michelou
committed
updated scripts for SDK tools r19
1 parent b2e915b commit e5532a6

File tree

101 files changed

+554
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+554
-218
lines changed

‎README.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,5 @@ http://www.scala-lang.org/
7373

7474

7575
Have fun!
76-
The Scala Team
76+
Stephane
7777

‎android-app-dev/README.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ In order to build/run our Android examples we need to install the following
3434
free software distributions (last tested versions and download sites are given
3535
in parenthesis) :
3636

37-
1) Java SDK 1.6 + (1.6.0_26, www.oracle.com/technetwork/java/javase/downloads/)
37+
1) Java SDK 1.6 + (1.7.0_03, www.oracle.com/technetwork/java/javase/downloads/)
3838
2) Scala SDK 2.7.5 + (2.10.0 , www.scala-lang.org/downloads/)
39-
3) Android SDK 9 + (16 , developer.android.com/sdk/)
40-
4) Apache Ant 1.7.0 + (1.8.2 , ant.apache.org/)
39+
3) Android SDK 9 + (19 , developer.android.com/sdk/)
40+
4) Apache Ant 1.7.0 + (1.8.3 , ant.apache.org/)
4141
5) ProGuard 4.4 + (4.7 , www.proguard.com/)
4242

4343
NB. In this document we rely on Ant tasks featured by the Scala SDK, the

‎android-app-dev/TriviaQuiz/build-scala.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@
4141
destdir="${out.classes.absolute.dir}"
4242
bootclasspathref="android.target.classpath"
4343
logging="${logging}" addparams="${scala.compilerargs}"
44-
classpath="${extensible.classpath}"
45-
classpathref="jar.libs.ref">
44+
classpath="${extensible.classpath}">
4645
<src path="${source.absolute.dir}" />
4746
<src path="${gen.absolute.dir}" />
4847
<classpath>
48+
<fileset dir="${jar.libs.absolute.dir}" includes="*.jar" />
49+
<path refid="project.libraries.jars" />
4950
<pathelement location="${scala-library.jar}" />
5051
<!-- include compiled resources -->
5152
<pathelement location="${out.classes.absolute.dir}" />

‎android-app-dev/configs/ant/build-scala.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@
4141
destdir="${out.classes.absolute.dir}"
4242
bootclasspathref="android.target.classpath"
4343
logging="${logging}" addparams="${scala.compilerargs}"
44-
classpath="${extensible.classpath}"
45-
classpathref="jar.libs.ref">
44+
classpath="${extensible.classpath}">
4645
<src path="${source.absolute.dir}" />
4746
<src path="${gen.absolute.dir}" />
4847
<classpath>
48+
<fileset dir="${jar.libs.absolute.dir}" includes="*.jar" />
49+
<path refid="project.libraries.jars" />
4950
<pathelement location="${scala-library.jar}" />
5051
<!-- include compiled resources -->
5152
<pathelement location="${out.classes.absolute.dir}" />

‎android-essentials/ContentReceiverExample/build-scala.xml‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<property
2020
name="scalac.banner"
2121
value="Scala compiler version ${scala.version.number} - http://scala-lang.org" />
22+
<property name="scala.compilerargs" value="" />
2223

2324
<!-- Rules -->
2425

@@ -39,12 +40,13 @@
3940
<scalac
4041
destdir="${out.classes.absolute.dir}"
4142
bootclasspathref="android.target.classpath"
42-
logging="${logging}" addparams="${scalac.addparams}"
43-
classpath="${extensible.classpath}"
44-
classpathref="jar.libs.ref">
43+
logging="${logging}" addparams="${scala.compilerargs}"
44+
classpath="${extensible.classpath}">
4545
<src path="${source.absolute.dir}" />
4646
<src path="${gen.absolute.dir}" />
4747
<classpath>
48+
<fileset dir="${jar.libs.absolute.dir}" includes="*.jar" />
49+
<path refid="project.libraries.jars" />
4850
<pathelement location="${scala-library.jar}" />
4951
<!-- include compiled resources -->
5052
<pathelement location="${out.classes.absolute.dir}" />
@@ -89,10 +91,6 @@
8991
<condition property="release.mode" value="" else="#RELEASE#">
9092
<equals arg1="${build.target}" arg2="release" />
9193
</condition>
92-
<!-- priority is given to local ProGuard configuration if present -->
93-
<condition property="template.cfg" value="${basedir}/local-proguard-template.cfg">
94-
<available file="${basedir}/local-proguard-template.cfg" />
95-
</condition>
9694
<condition property="template.cfg" value="${basedir}/proguard-template.cfg">
9795
<available file="${basedir}/proguard-template.cfg" />
9896
</condition>
@@ -108,7 +106,7 @@
108106
<path id="project.libraries.jars">
109107
<pathelement location="${scala-library.jar}" />
110108
</path>
111-
<!-- we use properties defined in main_rules.xml -->
109+
<!-- we use properties defined in tools/ant/build.xml -->
112110
<property name="injars" value="" />
113111
<property name="outjars" value="" />
114112
<property name="libraryjars" value="" />
@@ -156,6 +154,20 @@
156154
<!-- Name of the application package extracted from manifest file -->
157155
<xpath input="AndroidManifest.xml" expression="/manifest/@package"
158156
output="manifest.package" />
157+
<!-- we include local configuration if present -->
158+
<if>
159+
<condition>
160+
<available file="${basedir}/proguard-local.cfg" />
161+
</condition>
162+
<then>
163+
<loadfile
164+
property="includes" srcfile="${basedir}/proguard-local.cfg"
165+
failonerror="false" quiet="true" />
166+
</then>
167+
<else>
168+
<property name="includes" value="" />
169+
</else>
170+
</if>
159171
<copy file="${template.cfg}" tofile="${proguard.cfg}">
160172
<filterchain>
161173
<replacetokens>
@@ -166,6 +178,7 @@
166178
<token key="PACKAGENAME" value="${manifest.package}" />
167179
<token key="DEBUG" value="${debug.mode}" />
168180
<token key="RELEASE" value="${release.mode}" />
181+
<token key="INCLUDES" value="${includes}" />
169182
</replacetokens>
170183
</filterchain>
171184
</copy>

‎android-essentials/configs/ant/build-scala.xml‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<property
2020
name="scalac.banner"
2121
value="Scala compiler version ${scala.version.number} - http://scala-lang.org" />
22+
<property name="scala.compilerargs" value="" />
2223

2324
<!-- Rules -->
2425

@@ -39,12 +40,13 @@
3940
<scalac
4041
destdir="${out.classes.absolute.dir}"
4142
bootclasspathref="android.target.classpath"
42-
logging="${logging}" addparams="${scalac.addparams}"
43-
classpath="${extensible.classpath}"
44-
classpathref="jar.libs.ref">
43+
logging="${logging}" addparams="${scala.compilerargs}"
44+
classpath="${extensible.classpath}">
4545
<src path="${source.absolute.dir}" />
4646
<src path="${gen.absolute.dir}" />
4747
<classpath>
48+
<fileset dir="${jar.libs.absolute.dir}" includes="*.jar" />
49+
<path refid="project.libraries.jars" />
4850
<pathelement location="${scala-library.jar}" />
4951
<!-- include compiled resources -->
5052
<pathelement location="${out.classes.absolute.dir}" />
@@ -89,10 +91,6 @@
8991
<condition property="release.mode" value="" else="#RELEASE#">
9092
<equals arg1="${build.target}" arg2="release" />
9193
</condition>
92-
<!-- priority is given to local ProGuard configuration if present -->
93-
<condition property="template.cfg" value="${basedir}/local-proguard-template.cfg">
94-
<available file="${basedir}/local-proguard-template.cfg" />
95-
</condition>
9694
<condition property="template.cfg" value="${basedir}/proguard-template.cfg">
9795
<available file="${basedir}/proguard-template.cfg" />
9896
</condition>
@@ -108,7 +106,7 @@
108106
<path id="project.libraries.jars">
109107
<pathelement location="${scala-library.jar}" />
110108
</path>
111-
<!-- we use properties defined in main_rules.xml -->
109+
<!-- we use properties defined in tools/ant/build.xml -->
112110
<property name="injars" value="" />
113111
<property name="outjars" value="" />
114112
<property name="libraryjars" value="" />
@@ -156,6 +154,20 @@
156154
<!-- Name of the application package extracted from manifest file -->
157155
<xpath input="AndroidManifest.xml" expression="/manifest/@package"
158156
output="manifest.package" />
157+
<!-- we include local configuration if present -->
158+
<if>
159+
<condition>
160+
<available file="${basedir}/proguard-local.cfg" />
161+
</condition>
162+
<then>
163+
<loadfile
164+
property="includes" srcfile="${basedir}/proguard-local.cfg"
165+
failonerror="false" quiet="true" />
166+
</then>
167+
<else>
168+
<property name="includes" value="" />
169+
</else>
170+
</if>
159171
<copy file="${template.cfg}" tofile="${proguard.cfg}">
160172
<filterchain>
161173
<replacetokens>
@@ -166,6 +178,7 @@
166178
<token key="PACKAGENAME" value="${manifest.package}" />
167179
<token key="DEBUG" value="${debug.mode}" />
168180
<token key="RELEASE" value="${release.mode}" />
181+
<token key="INCLUDES" value="${includes}" />
169182
</replacetokens>
170183
</filterchain>
171184
</copy>

‎android-in-practice/CanvasDemo/build-scala.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@
4141
destdir="${out.classes.absolute.dir}"
4242
bootclasspathref="android.target.classpath"
4343
logging="${logging}" addparams="${scala.compilerargs}"
44-
classpath="${extensible.classpath}"
45-
classpathref="jar.libs.ref">
44+
classpath="${extensible.classpath}">
4645
<src path="${source.absolute.dir}" />
4746
<src path="${gen.absolute.dir}" />
4847
<classpath>
48+
<fileset dir="${jar.libs.absolute.dir}" includes="*.jar" />
49+
<path refid="project.libraries.jars" />
4950
<pathelement location="${scala-library.jar}" />
5051
<!-- include compiled resources -->
5152
<pathelement location="${out.classes.absolute.dir}" />

‎android-in-practice/DealDroid/build-scala.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@
4141
destdir="${out.classes.absolute.dir}"
4242
bootclasspathref="android.target.classpath"
4343
logging="${logging}" addparams="${scala.compilerargs}"
44-
classpath="${extensible.classpath}"
45-
classpathref="jar.libs.ref">
44+
classpath="${extensible.classpath}">
4645
<src path="${source.absolute.dir}" />
4746
<src path="${gen.absolute.dir}" />
4847
<classpath>
48+
<fileset dir="${jar.libs.absolute.dir}" includes="*.jar" />
49+
<path refid="project.libraries.jars" />
4950
<pathelement location="${scala-library.jar}" />
5051
<!-- include compiled resources -->
5152
<pathelement location="${out.classes.absolute.dir}" />

‎android-in-practice/DealDroidWithService/build-scala.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@
4141
destdir="${out.classes.absolute.dir}"
4242
bootclasspathref="android.target.classpath"
4343
logging="${logging}" addparams="${scala.compilerargs}"
44-
classpath="${extensible.classpath}"
45-
classpathref="jar.libs.ref">
44+
classpath="${extensible.classpath}">
4645
<src path="${source.absolute.dir}" />
4746
<src path="${gen.absolute.dir}" />
4847
<classpath>
48+
<fileset dir="${jar.libs.absolute.dir}" includes="*.jar" />
49+
<path refid="project.libraries.jars" />
4950
<pathelement location="${scala-library.jar}" />
5051
<!-- include compiled resources -->
5152
<pathelement location="${out.classes.absolute.dir}" />

‎android-in-practice/FileExplorer/build-scala.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@
4141
destdir="${out.classes.absolute.dir}"
4242
bootclasspathref="android.target.classpath"
4343
logging="${logging}" addparams="${scala.compilerargs}"
44-
classpath="${extensible.classpath}"
45-
classpathref="jar.libs.ref">
44+
classpath="${extensible.classpath}">
4645
<src path="${source.absolute.dir}" />
4746
<src path="${gen.absolute.dir}" />
4847
<classpath>
48+
<fileset dir="${jar.libs.absolute.dir}" includes="*.jar" />
49+
<path refid="project.libraries.jars" />
4950
<pathelement location="${scala-library.jar}" />
5051
<!-- include compiled resources -->
5152
<pathelement location="${out.classes.absolute.dir}" />

0 commit comments

Comments
 (0)