incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject svn commit: r1380929 - in /incubator/flex/utilities/trunk/installer: build.properties build.xml src/assets/fonts/open-sans/ src/assets/styles/InstallApacheFlexStyle.css
Date Tue, 04 Sep 2012 22:59:44 GMT
Author: bigosmallm
Date: Tue Sep  4 22:59:43 2012
New Revision: 1380929

URL: http://svn.apache.org/viewvc?rev=1380929&view=rev
Log:
Added checks to build.xml that would generate a temp certificate if one is not available.
 
Removed redundant fonts from installer/src/assets/fonts/open-sans folder

Removed:
    incubator/flex/utilities/trunk/installer/src/assets/fonts/open-sans/
Modified:
    incubator/flex/utilities/trunk/installer/build.properties
    incubator/flex/utilities/trunk/installer/build.xml
    incubator/flex/utilities/trunk/installer/src/assets/styles/InstallApacheFlexStyle.css

Modified: incubator/flex/utilities/trunk/installer/build.properties
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/build.properties?rev=1380929&r1=1380928&r2=1380929&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/build.properties (original)
+++ incubator/flex/utilities/trunk/installer/build.properties Tue Sep  4 22:59:43 2012
@@ -47,13 +47,12 @@ COMMON_SOURCE_DIR=${COMMON_PROJECT_DIR}/
 
 #Etc Settings
 DEBUG_FLAG=false
+TEMP_PASS_CHANGE_THIS=random123$%^
 
 #certificate
 STORETYPE=pkcs12
-KEYSTORE_DIR=C:/p/documents/certificates
-KEYSTORE=installapacheflex_self.p12
-CERT_PASSWORD_DIR=C:/p/documents/certificates
-CERT_PASSWORD_FILE=installapacheflex.password
+RELEASE_KEYSTORE_FILE=C:/p/documents/certificates/installapacheflex_self.p12
+CERT_PASSWORD_FILE=C:/p/documents/certificates/installapacheflex.password
 CERT_NAME=Apache Flex
 CERT_ORG_UNIT=
 CERT_ORG_NAME=

Modified: incubator/flex/utilities/trunk/installer/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/build.xml?rev=1380929&r1=1380928&r2=1380929&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/build.xml (original)
+++ incubator/flex/utilities/trunk/installer/build.xml Tue Sep  4 22:59:43 2012
@@ -26,7 +26,7 @@
     <!--location of property file -->
     <property file="${basedir}/build.properties" description="Properties for MakeApacheFlexForFlashBuilder
project" />
     <property file="${basedir}/build.number"/>
-	<property file="${CERT_PASSWORD_DIR}/${CERT_PASSWORD_FILE}"/>
+	<property file="${CERT_PASSWORD_FILE}"/>
 
     <property name="installer.version" value="${release.version}.${build.number}"/>
     <property name="kit.prefix" value="apache-flex-sdk-installer-${installer.version}-incubating"/>
@@ -43,7 +43,29 @@
         <os family="windows"/> 
     </condition>
     <property name="env.AIR_HOME" value="${AIR_HOME_MAC}"/>
-    
+	
+    <condition property="cert_pwd_not_found" >
+		<not>
+       		<available file="${CERT_PASSWORD_FILE}"/>
+		</not>
+    </condition>
+	
+	<condition property="KEYSTORE" value="${RELEASE_KEYSTORE_FILE}" >
+		<available file="${CERT_PASSWORD_FILE}"/>
+	</condition>
+	
+	<condition property="KEYSTORE" value="temp.12" >
+		<not>
+			<available file="${CERT_PASSWORD_FILE}"/>
+		</not>
+	</condition>
+	
+    <condition property="CERT_PASSWORD" value="${TEMP_PASS_CHANGE_THIS}" >
+		<not>
+       		<available file="${CERT_PASSWORD_FILE}"/>
+		</not>
+    </condition>
+	
     <!-- compilers -->
     <property name="ADL" value="${env.AIR_HOME}/bin/adl"/>
     <property name="ADT" value="${env.AIR_HOME}/lib/adt.jar"/>
@@ -87,7 +109,7 @@
     </condition>
     <property name="extension" value="dmg"/>
 
-    <target name="build" depends="init,compile,packagenative,copy-config,cleanup" 
+    <target name="build" depends="init,certificate,compile,packagenative,copy-config,cleanup"

         description="Compiles and packages application"/>
 
     <target name="release" depends="clean,build,source-package,binary-package,rat-report"
@@ -223,12 +245,11 @@
     </target>
 
     <!-- Make sure to use the same certificate each time so we can update the app. -->
-    <target name="certificate">
-        <available file="${KEYSTORE_DIR}/${KEYSTORE}" property="certificate.exists"/>
+    <target name="certificate" if="cert_pwd_not_found">
         <antcall target="generate-certificate"/>
     </target>
 
-    <target name="generate-certificate" depends="abortBuild" unless="certificate.exists">
+    <target name="generate-certificate" depends="abortBuild" >
         <java jar="${ADT}" fork="true"
             failonerror="true">
             <arg value="-certificate"/>
@@ -255,7 +276,7 @@
             <arg value="-storetype"/>
             <arg value="${STORETYPE}"/>
             <arg value="-keystore"/>
-            <arg value="${KEYSTORE_DIR}/${KEYSTORE}"/>
+            <arg value="${KEYSTORE}"/>
             <arg value="-storepass"/>
             <arg value="${CERT_PASSWORD}"/>
             <arg value="${BUILD_DIR}/${APP_NAME}.air"/>

Modified: incubator/flex/utilities/trunk/installer/src/assets/styles/InstallApacheFlexStyle.css
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/assets/styles/InstallApacheFlexStyle.css?rev=1380929&r1=1380928&r2=1380929&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/assets/styles/InstallApacheFlexStyle.css
(original)
+++ incubator/flex/utilities/trunk/installer/src/assets/styles/InstallApacheFlexStyle.css
Tue Sep  4 22:59:43 2012
@@ -21,7 +21,7 @@ limitations under the License.
 @namespace st "ws.tink.spark.controls.*";
 
 @font-face {
-	src: url("assets/fonts/open-sans/OpenSans-SemiboldItalic.ttf");
+	src: url("/assets/fonts/open-sans/OpenSans-SemiboldItalic.ttf");
 	fontFamily: openSansSemibold;
 	advancedAntiAliasing: true;
 	fontStyle:italic;



Mime
View raw message