[Red5commits] [2365] AIR beta 2 is from of now a requirement with thanks to Daniel Rossi

[mvanbeek]

AIR beta 2 is from of now a requirement with thanks to Daniel Rossi


Timestamp: 10/03/07 18:27:26 GMT (less than one hour ago) 
Change: 2365 
Author: mvanbeek

Files (see diff or trac for details): 
java/server/trunk/swf/DEV_Source/admin/build.properties
java/server/trunk/swf/DEV_Source/admin/build.xml


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/2365

Index: /java/server/trunk/swf/DEV_Source/admin/build.properties
===================================================================
--- /java/server/trunk/swf/DEV_Source/admin/build.properties (revision 2360)
+++ /java/server/trunk/swf/DEV_Source/admin/build.properties (revision 2365)
@@ -1,2 +1,4 @@
+AIR_HOME=/programs/adobe/airsdk/
+
 # SWF output filename.
 output.swf.name = admin
@@ -14,4 +16,12 @@
 air.release = bin/Red5Air.air
 
+air.cert.cname = red5.org
+air.cert.ounit = IT
+air.cert.oname = Red5
+air.cert.country = US
+air.cert.key_type = 2048-RSA
+air.cert.file = cert/Red5Air.pfx
+air.cert.password = red5
+
 # Class-folders you want to search for classes to be included in the docs, 
 # seperated by spaces (for example ../com/ ../net/  ).
Index: /java/server/trunk/swf/DEV_Source/admin/build.xml
===================================================================
--- /java/server/trunk/swf/DEV_Source/admin/build.xml (revision 2360)
+++ /java/server/trunk/swf/DEV_Source/admin/build.xml (revision 2365)
@@ -13,5 +13,5 @@
 	<!-- Flex SDK settings -->
 	<property file="../flex.properties" />
-
+	
 	<!-- Project settings -->
 	<property file="./build.properties" />
@@ -24,5 +24,5 @@
 	<property 
 		name="assets.dir" 
-		location="./src/"/>
+		location="./src/assets/"/>
 	<property 
 		name="debug.build.dir" 
@@ -37,5 +37,8 @@
 	<property 
 		name="adt.jar" 
-		location="${FLEX_HOME}/lib/adt.jar"/>
+		location="${AIR_HOME}/lib/adt.jar"/>
+	<property 
+		name="asdoc.exe" 
+		location="${AIR_HOME}/bin/adt.exe"/>
 	<property 
 		name="main.application.release.out" 
@@ -154,15 +157,30 @@
     <target name="compile.air.release" depends="compile.release">
         <java jar="${adt.jar}" fork="true" failonerror="true">
-            <arg value="-package"/>
-            <arg value="${air.release}"/>
-            <arg value="${air.descriptor}"/>
-        	<arg value="-C"/>
-            <arg value="${release.build.dir}"/>
-            <arg value="${output.swf.name}.swf"/>
-            <arg value="-C"/>
-            <arg value="${assets.dir}"/>
-            <arg value="icons"/>
+            <arg line="-package"/>
+        	<arg line="-certificate ${air.cert.file}"/>
+        	<arg line="-password ${air.cert.password}"/>
+            <arg line="${air.release}"/>
+            <arg line="${air.descriptor}"/>
+        	<arg line="-C"/>
+            <arg line="${release.build.dir}"/>
+            <arg line="${output.swf.name}.swf"/>
+            <arg line="-C"/>
+            <arg line="${assets.dir}"/>
+            <arg line="icons"/>
         </java>
     </target>
+	
+	<target name="build.air.cert">
+	        <java jar="${adt.jar}" fork="true" failonerror="true">
+	            <arg line="-certificate"/>
+	        	<arg line="-cn ${air.cert.cname}"/>
+	        	<arg line="-ou ${air.cert.ounit}"/>
+	        	<arg line="-o ${air.cert.oname}"/>
+	        	<arg line="-c ${air.cert.country}"/>
+	        	<arg line="${air.cert.key_type}"/>	
+	        	<arg line="${air.cert.file}"/>	
+	        	<arg line="${air.cert.password}"/>	
+	        </java>
+	    </target>
 	
 	<!--  additional='-benchmark -optimize=true -title "${swf.release.title}" -description "${swf.release.title}"' -->
@@ -214,6 +232,5 @@
     	<mkdir 
     	    dir="${asdoc.output.dir}"/>
-    	<exec executable="${asdoc.exe}" 
-    		failonerror="false">
+    	<exec executable="${asdoc.exe}" failonerror="false">
 			<arg line='-source-path ${src.dir}'/>
 			<arg line='-doc-sources ${asdoc.domainextensions}'/>


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.