Skip to content

Commit 9ed7b1e

Browse files
committed
minor updates to Ant build so it runs better in FDT/Eclipse.
1 parent 13e8f5b commit 9ed7b1e

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

‎build.template.properties‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,21 @@
44
run.test = true
55
run.asdoc = true
66
autolaunch.url = true
7+
mobile = false
78

89
# Build paths
9-
FLEX_HOME = /Applications/Adobe Flash Builder 4/sdks/4.0.0
10-
android.sdk= /Users/jfreeman/Documents/AndroidDev/android-sdk-mac_86
10+
FLEX_HOME = /Applications/Adobe Flash Builder 4/sdks/4.0.0.air_for_android_2.1
11+
android.sdk= /Users/jfreeman/Documents/AndroidDev/android-sdk-mac_86-2.1
12+
13+
#FOR Air on Android 2.2 builds
14+
#FLEX_HOME = /Applications/Adobe Flash Builder 4/sdks/4.0.0.air_for_android_2.2
15+
#android.sdk= /Users/jfreeman/Documents/AndroidDev/android-sdk-mac_86-2.2
1116

1217
#Properties file for build.xml
1318
project.name=BitmapScrollerApp
1419

1520
#Version number
16-
ver.num=v1.5.0-beta
21+
ver.num=v1.5.1-beta
1722
project.name.versioned=${project.name}-${ver.num}
1823
deploy.name.versioned=${project.name}-${ver.num}
1924

@@ -24,7 +29,6 @@ report.url = ${report.loc}/html/index.html
2429
## Don't change these settings ###
2530

2631
#build locations
27-
mobile = false
2832
asdoc.loc=${FLEX_HOME}/bin/asdoc
2933
main.src.loc=${basedir}/src
3034
test.src.loc=${basedir}/test
@@ -41,4 +45,4 @@ password=password
4145
air.swcs=${FLEX_HOME}/frameworks/libs/air
4246

4347
#Android Deployment
44-
adb=${android.sdk}/tools/adb
48+
adb=${android.sdk}/tools/adb

‎build.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040

4141
<target name="package-apk" description="Packages up project for deployment to android">
4242
<var name="mobile" value="true" />
43-
<echo message="${mobile}"/>
4443
<runtarget target="compile" />
4544
<runtarget target="android.package-apk" />
4645
</target>

‎build/build-includes/test.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@
9898
</if>
9999
</target>
100100

101-
<target name="local-run-pc">
101+
<target name="local-run-test-pc">
102102
<exec executable="${browser}">
103103
<arg line="file://${report.url}"/>
104104
</exec>
105105
</target>
106106

107-
<target name="local-run-mac">
107+
<target name="local-run-test-mac">
108108
<exec executable="open">
109109
<arg line="-a ${browser} file://${report.url}"/>
110110
</exec>

‎src/BitmapScrollerApp.as‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ package
3131
import com.flashartofwar.ui.Slider;
3232

3333
import flash.display.Bitmap;
34-
import flash.display.BitmapData;
3534
import flash.display.Loader;
3635
import flash.display.Sprite;
3736
import flash.display.StageAlign;

0 commit comments

Comments
 (0)