You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/08/13 07:49:38 UTC

[1/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34460 adt is missing in windows install

Repository: flex-sdk
Updated Branches:
  refs/heads/develop 96c064e6b -> f406e251a


FLEX-34460 adt is missing in windows install


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/cd88495a
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cd88495a
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cd88495a

Branch: refs/heads/develop
Commit: cd88495aa92d42cfd332cd52f5c4e9aac371fcdc
Parents: 96c064e
Author: Alex Harui <ah...@apache.org>
Authored: Tue Aug 12 14:01:54 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Aug 12 14:01:54 2014 -0700

----------------------------------------------------------------------
 installer.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cd88495a/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 4c75227..6097703 100644
--- a/installer.xml
+++ b/installer.xml
@@ -380,8 +380,7 @@
                 <include name="AIR SDK Readme.txt" />
                 <include name="airsdk.xml" />
                 <include name="bin/adl.exe" />
-                <include name="bin/adl" />
-                <include name="bin/adl.bat" />
+                <include name="bin/adt.bat" />
                 <include name="frameworks/libs/air/**" />
                 <include name="frameworks/projects/air/**" />
                 <include name="include/**" />
@@ -396,6 +395,8 @@
                 <include name="samples/descriptor-sample.xml" />
                 <include name="samples/icons/**" />
                 <include name="templates/air/**" />
+                <include name="templates/extensions/**" />
+                <include name="templates/sdk/**" />
             </fileset>
         </copy>
     </target>


[2/3] git commit: [flex-sdk] [refs/heads/develop] - sdk rcs have release notes in them

Posted by ah...@apache.org.
sdk rcs have release notes in them


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5a4ce0e0
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5a4ce0e0
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5a4ce0e0

Branch: refs/heads/develop
Commit: 5a4ce0e091ad0a98f1fd4b8e37ecba5b4635e260
Parents: cd88495
Author: Alex Harui <ah...@apache.org>
Authored: Tue Aug 12 14:39:02 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Aug 12 14:39:02 2014 -0700

----------------------------------------------------------------------
 releasecandidate.xml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5a4ce0e0/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 10ac156..7ef29a4 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -236,6 +236,7 @@
 			</fileset>
 		</copy>
 		<copy file="${basedir}/README" tofile="${dist.dev}/flex/sdk/${release.version}/rc${rc}/READme" />
+		<copy file="${basedir}/RELEASE_NOTES" tofile="${dist.dev}/flex/sdk/${release.version}/rc${rc}/RELEASE_NOTES" />
 		<copy file="${basedir}/ApproveSDK.xml" tofile="${dist.dev}/flex/sdk/${release.version}/rc${rc}/ApproveSDK.xml" />
 		<copy file="${basedir}/apache-flex-sdk-installer-config.xml" tofile="${dist.dev}/flex/sdk/${release.version}/rc${rc}/binaries/apache-flex-sdk-installer-config.xml" />
 	</target>


[3/3] git commit: [flex-sdk] [refs/heads/develop] - add release target to convert final rc

Posted by ah...@apache.org.
add release target to convert final rc


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f406e251
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f406e251
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f406e251

Branch: refs/heads/develop
Commit: f406e251aadbc89a984c39de043933a8bdbd57c7
Parents: 5a4ce0e
Author: Alex Harui <ah...@apache.org>
Authored: Tue Aug 12 22:49:10 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Aug 12 22:49:10 2014 -0700

----------------------------------------------------------------------
 releasecandidate.xml | 157 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 156 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f406e251/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 7ef29a4..723c423 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -173,7 +173,7 @@
     unless="rc"/>
 	
 	<xmlproperty file="${site}/trunk/content/installer/sdk-installer-config-4.0.xml" semanticAttributes="true" collapseAttributes="true"/>
-	<property name="release.installer" value="${config.version.latest}" />
+	<property name="release.installer" value="${config.version.latest}" />	
 	<!-- clip build number from version -->
 	<echo file="${basedir}/installerv.properties">latest.installer=${release.installer}</echo>
 	<replaceregexp byline="true">
@@ -319,7 +319,104 @@
                 <include name="sdk-installer-config-4.0.xml"/>
             </fileset>
         </replaceregexp>
+		<exec executable="${svn}" dir="${site}" failonerror="true" >
+			<arg value="commit" />
+			<arg value="--username" />
+			<arg value="${apache.username}" />
+			<arg value="--password" />
+			<arg value="${apache.password}" />
+			<arg value="-m" />
+			<arg value="&quot;update sdk-installer-config-4.0 for flex sdk ${release.version} rc${rc}&quot;" />
+		</exec>
+		<!-- pause to give buildbot chance to react -->
+		<sleep seconds="5" />
+		<get src="https://cms.apache.org/flex/publish" username="${apache.username}" password="${apache.password}" dest="${basedir}/getresult.txt" />
+		<delete file="${basedir}/getresult.txt" />
+	</target>
+	
+	<target name="update-installer-config-release" >
+		<exec executable="${svn}" dir="${site}" failonerror="true" >
+			<arg value="update" />
+			<arg value="trunk/content/installer/sdk-installer-config-4.0.xml" />
+		</exec>
+		<property name="latest.release" value="${config.products.ApacheFlexSDK.latestVersion}" />	
+        <replaceregexp byline="true" flags="g">
+            <regexp pattern="ApacheFlexSDK(.*)latestVersion=&quot;${latest.release}&quot;(.*)"/>
+            <substitution expression="ApacheFlexSDK\1latestVersion=&quot;${release.version}&quot;\2"/>
+            <fileset dir="${site}/trunk/content/installer">
+                <include name="sdk-installer-config-4.0.xml"/>
+            </fileset>
+        </replaceregexp>
+        <replaceregexp byline="true" flags="g">
+            <regexp pattern="path=&quot;flex/${latest.release}/binaries/&quot;(.*)default=&quot;true&quot;"/>
+            <substitution expression="path=&quot;http://archive.apache.org/dist/flex/${latest.release}/binaries&quot;\1"/>
+            <fileset dir="${site}/trunk/content/installer">
+                <include name="sdk-installer-config-4.0.xml"/>
+            </fileset>
+        </replaceregexp>
+        <replaceregexp byline="true" flags="g">
+            <regexp pattern="&lt;rc id=&quot;FlexSDKRC&quot;(.*)"/>
+            <substitution expression="&lt;VersionX id=&quot;${release.version}&quot; version=&quot;${release.version}&quot; path=&quot;flex/${release.version}/binaries/&quot; file=&quot;apache-flex-sdk-${release.version}-bin&quot; default=&quot;true&quot; &gt;&#x0a;    &lt;rc id=&quot;FlexSDKRC&quot;\1"/>
+            <fileset dir="${site}/trunk/content/installer">
+                <include name="sdk-installer-config-4.0.xml"/>
+            </fileset>
+        </replaceregexp>
+        <replaceregexp byline="true" flags="g">
+            <regexp pattern="${latest.release}"/>
+            <substitution expression="${release.version}"/>
+            <fileset dir="${site}/trunk/content">
+                <include name="doc-getstarted.cmsPage"/>
+            </fileset>
+        </replaceregexp>
+		<tstamp>
+			<format pattern="yyyy-MM-dd" property="release.date" />
+		</tstamp>
+		<tstamp>
+			<format pattern="MMMM yyyy" property="release.date.month" />
+		</tstamp>
+		<tstamp>
+			<format pattern="dd MMMM yyyy" property="release.date.full" />
+		</tstamp>
+        <replaceregexp byline="true" flags="g">
+            <regexp pattern="${latest.release}"/>
+            <substitution expression="${release.version}"/>
+            <fileset dir="${site}/trunk/content">
+                <include name="doap_Flex.rdf"/>
+                <include name="download-source.cmsPage"/>
+                <include name="download-binaries.cmsPage"/>
+            </fileset>
+        </replaceregexp>
+        <replaceregexp byline="true" flags="g">
+            <regexp pattern="this release, available as of .*\.  (.*)"/>
+            <substitution expression="this release, available as of ${release.date.full}.  \1"/>
+            <fileset dir="${site}/trunk/content">
+                <include name="download-source.cmsPage"/>
+                <include name="download-binaries.cmsPage"/>
+            </fileset>
+        </replaceregexp>
+        <replaceregexp byline="true" flags="g">
+            <regexp pattern="binaries were published on .*\."/>
+            <substitution expression="binaries were published on ${release.date.full}."/>
+            <fileset dir="${site}/trunk/content">
+                <include name="download-binaries.cmsPage"/>
+            </fileset>
+        </replaceregexp>
+        <replaceregexp byline="true" flags="g">
+            <regexp pattern="        &lt;created&gt;.*&lt;/created&gt;"/>
+            <substitution expression="        &lt;created&gt;${release.date}&lt;/created&gt;"/>
+            <fileset dir="${site}/trunk/content">
+                <include name="doap_Flex.rdf"/>
+            </fileset>
+        </replaceregexp>
+        <replaceregexp byline="true" flags="g">
+            <regexp pattern="${latest.release}(.*)\)"/>
+            <substitution expression="${release.version} (${release.date.month})"/>
+            <fileset dir="${site}/trunk/templates">
+                <include name="flex-v2-footer.html"/>
+            </fileset>
+        </replaceregexp>
 	</target>
+	
 	<target name="temp" >
 		<exec executable="${svn}" dir="${site}" failonerror="true" >
 			<arg value="commit" />
@@ -461,4 +558,62 @@ ${my.name}
 		<delete file="${basedir}/discussthread.properties" />
     </target>
 	
+	<target name="release" >
+		<available file="${svn.dist.release}"
+			type="dir" 
+			property="dist.release" value="${svn.dist.release}" />
+    
+		<fail message="The svn.dist.release property is not set to the working copy for https://dist.apache.org/repos/dist/release."
+			unless="dist.release"/>
+				
+		<exec executable="${svn}" dir="${dist.release}/flex" failonerror="true" >
+			<arg value="update" />
+		</exec>
+		<mkdir dir="${dist.release}/flex/${release.version}" />
+		<mkdir dir="${dist.release}/flex/${release.version}/binaries" />
+		<mkdir dir="${dist.release}/flex/${release.version}/doc" />
+		<copy todir="${dist.release}/flex/${release.version}/doc" >
+			<fileset dir="${dist.dev}/flex/sdk/rc${rc}/doc" >
+				<include name="apache-flex-sdk-${release.version}-asdoc*" />
+			</fileset>
+		</copy>
+		<copy todir="${dist.release}/flex/${release.version}/binaries" >
+			<fileset dir="${dist.dev}/flex/sdk/rc${rc}/binaries" >
+				<include name="apache-flex-sdk-${release.version}-bin*" />
+				<include name="apache-flex-sdk-installer-config.xml" />
+			</fileset>
+		</copy>
+		<copy todir="${dist.release}/flex/${release.version}" >
+			<fileset dir="${dist.dev}/flex/sdk/rc${rc}" >
+				<include name="READme" />
+				<include name="RELEASE_NOTES" />
+				<include name="apache-flex-sdk-${release.version}-src*" />
+			</fileset>
+		</copy>
+		<exec executable="${svn}" dir="${dist.release}/flex" failonerror="true" >
+			<arg value="add" />
+			<arg value="${release.version}" />
+		</exec>
+		<exec executable="${svn}" dir="${dist.release}/flex" failonerror="true" >
+			<arg value="commit" />
+			<arg value="--username" />
+			<arg value="${apache.username}" />
+			<arg value="--password" />
+			<arg value="${apache.password}" />
+			<arg value="-m" />
+			<arg value="Apache Flex SDK ${release.version}" />
+		</exec>
+		<exec executable="${git}" dir="${basedir}" failonerror="true" >
+			<arg value="tag" />
+			<arg value="-a" />
+			<arg value="apache-flex-sdk-${release.version}" />
+			<arg value="-m" />
+			<arg value="&quot;Official release of apache-flex-sdk-${release.version}&quot;" />
+		</exec>
+		<exec executable="${git}" dir="${basedir}" failonerror="true" >
+			<arg value="push" />
+			<arg value="--tags" />
+		</exec>
+		<echo>Wait at least 24 hours before running update-installer-config-release target</echo>
+	</target>
 </project>