Skip to content

Commit 16dc7cb

Browse files
joshtynjalajoshtynjala
committed
Examples: build improvements
1) load ../../sdk.local.properties so that each example doesn't need to override the SDK separately 2) fail on missing certificates only when building for a target that requires a certificate This allows, for example, to build for web without specifying desktop, ios, or android certificates
1 parent 4aafd0a commit 16dc7cb

File tree

16 files changed

+175
-130
lines changed

16 files changed

+175
-130
lines changed

‎examples/ComponentsExplorer/build.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
<property file="./sdk.local.properties"/>
88
<property file="./build.properties"/>
99
<!-- inherit SDK properties from the root of the repository -->
10+
<property file="../../sdk.local.properties"/>
1011
<property file="../../sdk.properties"/>
11-
12-
<fail unless="ios.provision.path"/>
13-
<fail unless="ios.certificate.path"/>
14-
<fail unless="ios.certificate.password"/>
15-
16-
<fail unless="android.certificate.path"/>
17-
<fail unless="android.certificate.password"/>
1812

1913
<target name="build" depends="build-web,build-android,build-ios"/>
2014

@@ -51,7 +45,12 @@
5145
<arg value="-output=${output.path}/ComponentsExplorer.swf"/>
5246
</java>
5347
</target>
54-
<target name="build-ios" depends="build-air-swf">
48+
<target name="-check-ios-properties">
49+
<fail unless="ios.provision.path"/>
50+
<fail unless="ios.certificate.path"/>
51+
<fail unless="ios.certificate.password"/>
52+
</target>
53+
<target name="build-ios" depends="-check-ios-properties,build-air-swf">
5554
<echo message="Packaging ComponentsExplorer.ipa"/>
5655
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
5756
<arg value="-package"/>
@@ -96,7 +95,11 @@
9695
<arg value="ComponentsExplorer.swf"/>
9796
</java>
9897
</target>
99-
<target name="build-android" depends="build-air-swf">
98+
<target name="-check-android-properties">
99+
<fail unless="android.certificate.path"/>
100+
<fail unless="android.certificate.password"/>
101+
</target>
102+
<target name="build-android" depends="-check-android-properties,build-air-swf">
100103
<echo message="Packaging ComponentsExplorer.apk"/>
101104
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
102105
<arg value="-package"/>

‎examples/DragAndDrop/build.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<property file="./sdk.local.properties"/>
88
<property file="./build.properties"/>
99
<!-- inherit SDK properties from the root of the repository -->
10+
<property file="../../sdk.local.properties"/>
1011
<property file="../../sdk.properties"/>
1112

1213
<target name="build" depends="-build-swf"/>

‎examples/DrawersExplorer/build.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
<property file="./sdk.local.properties"/>
88
<property file="./build.properties"/>
99
<!-- inherit SDK properties from the root of the repository -->
10+
<property file="../../sdk.local.properties"/>
1011
<property file="../../sdk.properties"/>
11-
12-
<fail unless="ios.provision.path"/>
13-
<fail unless="ios.certificate.path"/>
14-
<fail unless="ios.certificate.password"/>
15-
16-
<fail unless="android.certificate.path"/>
17-
<fail unless="android.certificate.password"/>
1812

1913
<target name="build" depends="build-web,build-android,build-ios"/>
2014

@@ -51,7 +45,12 @@
5145
<arg value="-output=${output.path}/DrawersExplorer.swf"/>
5246
</java>
5347
</target>
54-
<target name="build-ios" depends="build-air-swf">
48+
<target name="-check-ios-properties">
49+
<fail unless="ios.provision.path"/>
50+
<fail unless="ios.certificate.path"/>
51+
<fail unless="ios.certificate.password"/>
52+
</target>
53+
<target name="build-ios" depends="-check-ios-properties,build-air-swf">
5554
<echo message="Packaging DrawersExplorer.ipa"/>
5655
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
5756
<arg value="-package"/>
@@ -96,7 +95,11 @@
9695
<arg value="DrawersExplorer.swf"/>
9796
</java>
9897
</target>
99-
<target name="build-android" depends="build-air-swf">
98+
<target name="-check-android-properties">
99+
<fail unless="android.certificate.path"/>
100+
<fail unless="android.certificate.password"/>
101+
</target>
102+
<target name="build-android" depends="-check-android-properties,build-air-swf">
100103
<echo message="Packaging DrawersExplorer.apk"/>
101104
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
102105
<arg value="-package"/>

‎examples/Gallery/build.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
<property file="./sdk.local.properties"/>
88
<property file="./build.properties"/>
99
<!-- inherit SDK properties from the root of the repository -->
10+
<property file="../../sdk.local.properties"/>
1011
<property file="../../sdk.properties"/>
11-
12-
<fail unless="ios.provision.path"/>
13-
<fail unless="ios.certificate.path"/>
14-
<fail unless="ios.certificate.password"/>
15-
16-
<fail unless="android.certificate.path"/>
17-
<fail unless="android.certificate.password"/>
1812

1913
<fail unless="flickr.api.key"/>
2014

@@ -38,7 +32,12 @@
3832
<arg value="-output=${output.path}/Gallery.swf"/>
3933
</java>
4034
</target>
41-
<target name="build-ios" depends="build-air-swf">
35+
<target name="-check-ios-properties">
36+
<fail unless="ios.provision.path"/>
37+
<fail unless="ios.certificate.path"/>
38+
<fail unless="ios.certificate.password"/>
39+
</target>
40+
<target name="build-ios" depends="-check-ios-properties,build-air-swf">
4241
<echo message="Packaging Gallery.ipa"/>
4342
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
4443
<arg value="-package"/>
@@ -81,7 +80,11 @@
8180
<arg value="Gallery.swf"/>
8281
</java>
8382
</target>
84-
<target name="build-android" depends="build-air-swf">
83+
<target name="-check-android-properties">
84+
<fail unless="android.certificate.path"/>
85+
<fail unless="android.certificate.password"/>
86+
</target>
87+
<target name="build-android" depends="-check-android-properties,build-air-swf">
8588
<echo message="Packaging Gallery.apk"/>
8689
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
8790
<arg value="-package"/>

‎examples/HelloWorld/build.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
<property file="./sdk.local.properties"/>
88
<property file="./build.properties"/>
99
<!-- inherit SDK properties from the root of the repository -->
10+
<property file="../../sdk.local.properties"/>
1011
<property file="../../sdk.properties"/>
11-
12-
<fail unless="ios.provision.path"/>
13-
<fail unless="ios.certificate.path"/>
14-
<fail unless="ios.certificate.password"/>
15-
16-
<fail unless="android.certificate.path"/>
17-
<fail unless="android.certificate.password"/>
1812

1913
<target name="build" depends="build-web,build-android,build-ios"/>
2014

@@ -50,7 +44,12 @@
5044
<arg value="-output=${output.path}/HelloWorld.swf"/>
5145
</java>
5246
</target>
53-
<target name="build-ios" depends="build-air-swf">
47+
<target name="-check-ios-properties">
48+
<fail unless="ios.provision.path"/>
49+
<fail unless="ios.certificate.path"/>
50+
<fail unless="ios.certificate.password"/>
51+
</target>
52+
<target name="build-ios" depends="-check-ios-properties,build-air-swf">
5453
<echo message="Packaging HelloWorld.ipa"/>
5554
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
5655
<arg value="-package"/>
@@ -93,7 +92,11 @@
9392
<arg value="HelloWorld.swf"/>
9493
</java>
9594
</target>
96-
<target name="build-android" depends="build-air-swf">
95+
<target name="-check-android-properties">
96+
<fail unless="android.certificate.path"/>
97+
<fail unless="android.certificate.password"/>
98+
</target>
99+
<target name="build-android" depends="-check-android-properties,build-air-swf">
97100
<echo message="Packaging HelloWorld.apk"/>
98101
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
99102
<arg value="-package"/>

‎examples/LayoutExplorer/build.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
<property file="./sdk.local.properties"/>
88
<property file="./build.properties"/>
99
<!-- inherit SDK properties from the root of the repository -->
10+
<property file="../../sdk.local.properties"/>
1011
<property file="../../sdk.properties"/>
11-
12-
<fail unless="ios.provision.path"/>
13-
<fail unless="ios.certificate.path"/>
14-
<fail unless="ios.certificate.password"/>
15-
16-
<fail unless="android.certificate.path"/>
17-
<fail unless="android.certificate.password"/>
1812

1913
<target name="build" depends="build-web,build-android,build-ios"/>
2014

@@ -50,7 +44,12 @@
5044
<arg value="-output=${output.path}/LayoutExplorer.swf"/>
5145
</java>
5246
</target>
53-
<target name="build-ios" depends="build-air-swf">
47+
<target name="-check-ios-properties">
48+
<fail unless="ios.provision.path"/>
49+
<fail unless="ios.certificate.path"/>
50+
<fail unless="ios.certificate.password"/>
51+
</target>
52+
<target name="build-ios" depends="-check-ios-properties,build-air-swf">
5453
<echo message="Packaging LayoutExplorer.ipa"/>
5554
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
5655
<arg value="-package"/>
@@ -93,7 +92,11 @@
9392
<arg value="LayoutExplorer.swf"/>
9493
</java>
9594
</target>
96-
<target name="build-android" depends="build-air-swf">
95+
<target name="-check-android-properties">
96+
<fail unless="android.certificate.path"/>
97+
<fail unless="android.certificate.password"/>
98+
</target>
99+
<target name="build-android" depends="-check-android-properties,build-air-swf">
97100
<echo message="Packaging LayoutExplorer.apk"/>
98101
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
99102
<arg value="-package"/>

‎examples/Magic8Chat/build.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,9 @@
77
<property file="./sdk.local.properties"/>
88
<property file="./build.properties"/>
99
<!-- inherit SDK properties from the root of the repository -->
10+
<property file="../../sdk.local.properties"/>
1011
<property file="../../sdk.properties"/>
1112

12-
<fail unless="ios.provision.path"/>
13-
<fail unless="ios.certificate.path"/>
14-
<fail unless="ios.certificate.password"/>
15-
16-
<fail unless="android.certificate.path"/>
17-
<fail unless="android.certificate.password"/>
18-
1913
<target name="build" depends="build-web,build-android,build-ios"/>
2014

2115
<target name="prepare">
@@ -52,7 +46,12 @@
5246
<arg value="-output=${output.path}/Magic8Chat.swf"/>
5347
</java>
5448
</target>
55-
<target name="build-ios" depends="build-air-swf">
49+
<target name="-check-ios-properties">
50+
<fail unless="ios.provision.path"/>
51+
<fail unless="ios.certificate.path"/>
52+
<fail unless="ios.certificate.password"/>
53+
</target>
54+
<target name="build-ios" depends="-check-ios-properties,build-air-swf">
5655
<echo message="Packaging Magic8Chat.ipa"/>
5756
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
5857
<arg value="-package"/>
@@ -97,7 +96,11 @@
9796
<arg value="Magic8Chat.swf"/>
9897
</java>
9998
</target>
100-
<target name="build-android" depends="build-air-swf">
99+
<target name="-check-android-properties">
100+
<fail unless="android.certificate.path"/>
101+
<fail unless="android.certificate.password"/>
102+
</target>
103+
<target name="build-android" depends="-check-android-properties,build-air-swf">
101104
<echo message="Packaging Magic8Chat.apk"/>
102105
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
103106
<arg value="-package"/>

‎examples/PullToRefresh/build.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
<property file="./sdk.local.properties"/>
88
<property file="./build.properties"/>
99
<!-- inherit SDK properties from the root of the repository -->
10+
<property file="../../sdk.local.properties"/>
1011
<property file="../../sdk.properties"/>
11-
12-
<fail unless="ios.provision.path"/>
13-
<fail unless="ios.certificate.path"/>
14-
<fail unless="ios.certificate.password"/>
15-
16-
<fail unless="android.certificate.path"/>
17-
<fail unless="android.certificate.password"/>
1812

1913
<target name="build" depends="build-web,build-android,build-ios"/>
2014

@@ -51,7 +45,12 @@
5145
<arg value="-output=${output.path}/PullToRefresh.swf"/>
5246
</java>
5347
</target>
54-
<target name="build-ios" depends="build-air-swf">
48+
<target name="-check-ios-properties">
49+
<fail unless="ios.provision.path"/>
50+
<fail unless="ios.certificate.path"/>
51+
<fail unless="ios.certificate.password"/>
52+
</target>
53+
<target name="build-ios" depends="-check-ios-properties,build-air-swf">
5554
<echo message="Packaging PullToRefresh.ipa"/>
5655
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
5756
<arg value="-package"/>
@@ -96,7 +95,11 @@
9695
<arg value="PullToRefresh.swf"/>
9796
</java>
9897
</target>
99-
<target name="build-android" depends="build-air-swf">
98+
<target name="-check-android-properties">
99+
<fail unless="android.certificate.path"/>
100+
<fail unless="android.certificate.password"/>
101+
</target>
102+
<target name="build-android" depends="-check-android-properties,build-air-swf">
100103
<echo message="Packaging PullToRefresh.apk"/>
101104
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
102105
<arg value="-package"/>

‎examples/StackScreenNavigatorExplorer/build.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
<property file="./sdk.local.properties"/>
88
<property file="./build.properties"/>
99
<!-- inherit SDK properties from the root of the repository -->
10+
<property file="../../sdk.local.properties"/>
1011
<property file="../../sdk.properties"/>
11-
12-
<fail unless="ios.provision.path"/>
13-
<fail unless="ios.certificate.path"/>
14-
<fail unless="ios.certificate.password"/>
15-
16-
<fail unless="android.certificate.path"/>
17-
<fail unless="android.certificate.password"/>
1812

1913
<target name="build" depends="build-web,build-android,build-ios"/>
2014

@@ -52,7 +46,12 @@
5246
<arg value="-output=${output.path}/StackScreenNavigatorExplorer.swf"/>
5347
</java>
5448
</target>
55-
<target name="build-ios" depends="build-air-swf">
49+
<target name="-check-ios-properties">
50+
<fail unless="ios.provision.path"/>
51+
<fail unless="ios.certificate.path"/>
52+
<fail unless="ios.certificate.password"/>
53+
</target>
54+
<target name="build-ios" depends="-check-ios-properties,build-air-swf">
5655
<echo message="Packaging StackScreenNavigatorExplorer.ipa"/>
5756
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
5857
<arg value="-package"/>
@@ -97,7 +96,11 @@
9796
<arg value="StackScreenNavigatorExplorer.swf"/>
9897
</java>
9998
</target>
100-
<target name="build-android" depends="build-air-swf">
99+
<target name="-check-android-properties">
100+
<fail unless="android.certificate.path"/>
101+
<fail unless="android.certificate.password"/>
102+
</target>
103+
<target name="build-android" depends="-check-android-properties,build-air-swf">
101104
<echo message="Packaging StackScreenNavigatorExplorer.apk"/>
102105
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
103106
<arg value="-package"/>

‎examples/Tabs/build.xml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
<property file="./sdk.local.properties"/>
88
<property file="./build.properties"/>
99
<!-- inherit SDK properties from the root of the repository -->
10+
<property file="../../sdk.local.properties"/>
1011
<property file="../../sdk.properties"/>
11-
12-
<fail unless="ios.provision.path"/>
13-
<fail unless="ios.certificate.path"/>
14-
<fail unless="ios.certificate.password"/>
15-
16-
<fail unless="android.certificate.path"/>
17-
<fail unless="android.certificate.password"/>
1812

1913
<target name="build" depends="build-web,build-android,build-ios"/>
2014

@@ -52,7 +46,12 @@
5246
<arg value="-output=${output.path}/Tabs.swf"/>
5347
</java>
5448
</target>
55-
<target name="build-ios" depends="build-air-swf">
49+
<target name="-check-ios-properties">
50+
<fail unless="ios.provision.path"/>
51+
<fail unless="ios.certificate.path"/>
52+
<fail unless="ios.certificate.password"/>
53+
</target>
54+
<target name="build-ios" depends="-check-ios-properties,build-air-swf">
5655
<echo message="Packaging Tabs.ipa"/>
5756
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
5857
<arg value="-package"/>
@@ -97,7 +96,11 @@
9796
<arg value="Tabs.swf"/>
9897
</java>
9998
</target>
100-
<target name="build-android" depends="build-air-swf">
99+
<target name="-check-android-properties">
100+
<fail unless="android.certificate.path"/>
101+
<fail unless="android.certificate.password"/>
102+
</target>
103+
<target name="build-android" depends="-check-android-properties,build-air-swf">
101104
<echo message="Packaging Tabs.apk"/>
102105
<java jar="${adt}" dir="${basedir}" fork="true" failonerror="true">
103106
<arg value="-package"/>

0 commit comments

Comments
 (0)