updated svn properties (Android examples)
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22316 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
parent
b76698d1fe
commit
357b367a03
|
@ -23,13 +23,10 @@
|
|||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -23,13 +23,10 @@
|
|||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -23,13 +23,10 @@
|
|||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -23,13 +23,10 @@
|
|||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -23,13 +23,10 @@
|
|||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -23,13 +23,10 @@
|
|||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -23,13 +23,10 @@
|
|||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -23,13 +23,10 @@
|
|||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -23,13 +23,10 @@
|
|||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -23,13 +23,10 @@
|
|||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -23,13 +23,10 @@
|
|||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
#sdk.dir=c:\\Progra~1\\Android
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -102,18 +102,26 @@ Builds the Scala applications targeted to the Android platform.
|
|||
<if><isset property="prop.file" />
|
||||
<then>
|
||||
<for list="${dirs}" param="dir"><sequential>
|
||||
<replaceproperty
|
||||
name="sdk.dir"
|
||||
value="${os.sdk.dir}"
|
||||
dir="@{dir}"/>
|
||||
<replaceproperty
|
||||
name="scala.dir"
|
||||
value="${os.scala.dir}"
|
||||
dir="@{dir}"/>
|
||||
<replaceproperty
|
||||
name="yguard.dir"
|
||||
value="${os.yguard.dir}"
|
||||
dir="@{dir}"/>
|
||||
<if>
|
||||
<not><available file="@{dir}/local.properties"/></not>
|
||||
<then>
|
||||
<echo message="sdk.dir=${os.sdk.dir}${line.separator}scala.dir=${os.scala.dir}${line.separator}yguard.dir=${os.yguard.dir}${line.separator}"
|
||||
file="@{dir}/local.properties" />
|
||||
</then>
|
||||
<else>
|
||||
<replaceproperty
|
||||
name="sdk.dir"
|
||||
value="${os.sdk.dir}"
|
||||
file="@{dir}/local.properties"/>
|
||||
<replaceproperty
|
||||
name="scala.dir"
|
||||
value="${os.scala.dir}"
|
||||
file="@{dir}/local.properties"/>
|
||||
<replaceproperty
|
||||
name="yguard.dir"
|
||||
value="${os.yguard.dir}"
|
||||
file="@{dir}/local.properties"/>
|
||||
</else></if>
|
||||
<update.scala dir="@{dir}" />
|
||||
</sequential></for>
|
||||
</then>
|
||||
|
@ -198,12 +206,12 @@ Builds the Scala applications targeted to the Android platform.
|
|||
<macrodef name="replaceproperty">
|
||||
<attribute name="name" />
|
||||
<attribute name="value" />
|
||||
<attribute name="dir" />
|
||||
<attribute name="file" />
|
||||
<sequential>
|
||||
<replaceregexp byline="true">
|
||||
<regexp pattern="^@{name}=(.*)"/>
|
||||
<substitution expression="@{name}=@{value}"/>
|
||||
<fileset dir="@{dir}" includes="build.properties"/>
|
||||
<fileset file="@{file}"/>
|
||||
</replaceregexp>
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
|
|
@ -15,13 +15,18 @@
|
|||
# 'key.alias' for the name of the key to use.
|
||||
# The password will be asked during the build when you use the 'release' target.
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
# By adding the following two lines to the imported Ant script file
|
||||
# platforms/android-<level>/ant/ant_rules_r2.xml :
|
||||
# <property name="javac.args" value="-nowarn" />
|
||||
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
|
||||
# you can specify additional compiler arguments (e.g. to generate detailed
|
||||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -15,13 +15,18 @@
|
|||
# 'key.alias' for the name of the key to use.
|
||||
# The password will be asked during the build when you use the 'release' target.
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
# By adding the following two lines to the imported Ant script file
|
||||
# platforms/android-<level>/ant/ant_rules_r2.xml :
|
||||
# <property name="javac.args" value="-nowarn" />
|
||||
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
|
||||
# you can specify additional compiler arguments (e.g. to generate detailed
|
||||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -15,13 +15,18 @@
|
|||
# 'key.alias' for the name of the key to use.
|
||||
# The password will be asked during the build when you use the 'release' target.
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
# By adding the following two lines to the imported Ant script file
|
||||
# platforms/android-<level>/ant/ant_rules_r2.xml :
|
||||
# <property name="javac.args" value="-nowarn" />
|
||||
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
|
||||
# you can specify additional compiler arguments (e.g. to generate detailed
|
||||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -15,13 +15,18 @@
|
|||
# 'key.alias' for the name of the key to use.
|
||||
# The password will be asked during the build when you use the 'release' target.
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
# By adding the following two lines to the imported Ant script file
|
||||
# platforms/android-<level>/ant/ant_rules_r2.xml :
|
||||
# <property name="javac.args" value="-nowarn" />
|
||||
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
|
||||
# you can specify additional compiler arguments (e.g. to generate detailed
|
||||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -95,12 +95,12 @@ First we make sure the Android emulator is up and running; if not we start it
|
|||
using the shell command (let us assume the existence of the "2.2_128M_HVGA"
|
||||
virtual device) :
|
||||
|
||||
android-examples> emulator -no-boot-anim -no-jni -avd 2.2_128M_HVGA &
|
||||
unlocking-android> emulator -no-boot-anim -no-jni -avd 2.2_128M_HVGA &
|
||||
|
||||
Then we move for instance to the "Snake" project directory and execute one of
|
||||
the following Ant targets :
|
||||
|
||||
android-examples> cd BounceyBall
|
||||
unlocking-android> cd BounceyBall
|
||||
Snake> ant clean
|
||||
Snake> ant scala-compile
|
||||
Snake> ant debug
|
||||
|
|
|
@ -15,13 +15,18 @@
|
|||
# 'key.alias' for the name of the key to use.
|
||||
# The password will be asked during the build when you use the 'release' target.
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
# By adding the following two lines to the imported Ant script file
|
||||
# platforms/android-<level>/ant/ant_rules_r2.xml :
|
||||
# <property name="javac.args" value="-nowarn" />
|
||||
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
|
||||
# you can specify additional compiler arguments (e.g. to generate detailed
|
||||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -15,13 +15,18 @@
|
|||
# 'key.alias' for the name of the key to use.
|
||||
# The password will be asked during the build when you use the 'release' target.
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
# By adding the following two lines to the imported Ant script file
|
||||
# platforms/android-<level>/ant/ant_rules_r2.xml :
|
||||
# <property name="javac.args" value="-nowarn" />
|
||||
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
|
||||
# you can specify additional compiler arguments (e.g. to generate detailed
|
||||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -15,13 +15,18 @@
|
|||
# 'key.alias' for the name of the key to use.
|
||||
# The password will be asked during the build when you use the 'release' target.
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
# By adding the following two lines to the imported Ant script file
|
||||
# platforms/android-<level>/ant/ant_rules_r2.xml :
|
||||
# <property name="javac.args" value="-nowarn" />
|
||||
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
|
||||
# you can specify additional compiler arguments (e.g. to generate detailed
|
||||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -15,13 +15,18 @@
|
|||
# 'key.alias' for the name of the key to use.
|
||||
# The password will be asked during the build when you use the 'release' target.
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
# By adding the following two lines to the imported Ant script file
|
||||
# platforms/android-<level>/ant/ant_rules_r2.xml :
|
||||
# <property name="javac.args" value="-nowarn" />
|
||||
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
|
||||
# you can specify additional compiler arguments (e.g. to generate detailed
|
||||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -15,13 +15,18 @@
|
|||
# 'key.alias' for the name of the key to use.
|
||||
# The password will be asked during the build when you use the 'release' target.
|
||||
|
||||
#sdk.dir=C:\\Progra~1\\Android
|
||||
# By adding the following two lines to the imported Ant script file
|
||||
# platforms/android-<level>/ant/ant_rules_r2.xml :
|
||||
# <property name="javac.args" value="-nowarn" />
|
||||
# <compilerarg line="${javac.args}"/> <!-- 'compile' target -->
|
||||
# you can specify additional compiler arguments (e.g. to generate detailed
|
||||
# warning messages):
|
||||
# javac.args=-deprecation -Xlint
|
||||
|
||||
sdk.dir=/opt/android-sdk-linux_86
|
||||
|
||||
#scala.dir=c:\\Progra~1\\Scala
|
||||
scala.dir=/opt/scala
|
||||
|
||||
scalac.addparams=-deprecation
|
||||
|
||||
#yguard.dir=c:\\Progra~1\\yguard-2.3.0.1
|
||||
yguard.dir=/opt/yguard
|
||||
|
|
|
@ -102,18 +102,26 @@ Builds the Scala applications targeted to the Android platform.
|
|||
<if><isset property="prop.file" />
|
||||
<then>
|
||||
<for list="${dirs}" param="dir"><sequential>
|
||||
<replaceproperty
|
||||
name="sdk.dir"
|
||||
value="${os.sdk.dir}"
|
||||
dir="@{dir}"/>
|
||||
<replaceproperty
|
||||
name="scala.dir"
|
||||
value="${os.scala.dir}"
|
||||
dir="@{dir}"/>
|
||||
<replaceproperty
|
||||
name="yguard.dir"
|
||||
value="${os.yguard.dir}"
|
||||
dir="@{dir}"/>
|
||||
<if>
|
||||
<not><available file="@{dir}/local.properties"/></not>
|
||||
<then>
|
||||
<echo message="sdk.dir=${os.sdk.dir}${line.separator}scala.dir=${os.scala.dir}${line.separator}yguard.dir=${os.yguard.dir}${line.separator}"
|
||||
file="@{dir}/local.properties" />
|
||||
</then>
|
||||
<else>
|
||||
<replaceproperty
|
||||
name="sdk.dir"
|
||||
value="${os.sdk.dir}"
|
||||
file="@{dir}/local.properties"/>
|
||||
<replaceproperty
|
||||
name="scala.dir"
|
||||
value="${os.scala.dir}"
|
||||
file="@{dir}/local.properties"/>
|
||||
<replaceproperty
|
||||
name="yguard.dir"
|
||||
value="${os.yguard.dir}"
|
||||
file="@{dir}/local.properties"/>
|
||||
</else></if>
|
||||
<update.scala dir="@{dir}" />
|
||||
</sequential></for>
|
||||
</then>
|
||||
|
@ -198,12 +206,12 @@ Builds the Scala applications targeted to the Android platform.
|
|||
<macrodef name="replaceproperty">
|
||||
<attribute name="name" />
|
||||
<attribute name="value" />
|
||||
<attribute name="dir" />
|
||||
<attribute name="file" />
|
||||
<sequential>
|
||||
<replaceregexp byline="true">
|
||||
<regexp pattern="^@{name}=(.*)"/>
|
||||
<substitution expression="@{name}=@{value}"/>
|
||||
<fileset dir="@{dir}" includes="build.properties"/>
|
||||
<fileset file="@{file}"/>
|
||||
</replaceregexp>
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
|
Loading…
Reference in New Issue