You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2020/04/10 07:10:42 UTC
[royale-compiler] branch develop updated (1266488 -> 572cd8a)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
from 1266488 [maven-release-plugin] prepare for next development iteration
new dcc21ca fix Royale_Compiler_Build_Tools_Release_Step_002
new 572cd8a sign and upload seemed to work
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
compiler-build-tools/releasesteps.xml | 110 ++++++++++++++--------------------
1 file changed, 44 insertions(+), 66 deletions(-)
[royale-compiler] 02/02: sign and upload seemed to work
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 572cd8ad58c979666176a8ffb575ebfc75a86791
Author: Alex Harui <ah...@apache.org>
AuthorDate: Fri Apr 10 00:10:23 2020 -0700
sign and upload seemed to work
---
compiler-build-tools/releasesteps.xml | 77 +++++++++++++++--------------------
1 file changed, 33 insertions(+), 44 deletions(-)
diff --git a/compiler-build-tools/releasesteps.xml b/compiler-build-tools/releasesteps.xml
index f6d1c4e..d32352c 100644
--- a/compiler-build-tools/releasesteps.xml
+++ b/compiler-build-tools/releasesteps.xml
@@ -138,7 +138,7 @@
<exec executable="${mvn}" dir="${artifactfolder}/sources" failonerror="true" >
<arg value="clean" />
<arg value="install" />
- <arg value="-Proyale-release,option-with-swf" />
+ <arg value="-Proyale-release" />
</exec>
</target>
@@ -232,35 +232,29 @@
<fail message="${thisFile}-${jar.version}.jar does not match" unless="filesmatch" />
</target>
- <target name="Royale_Compiler_Build_Tools_Release_Step_003_Sign" depends="get-artifact-folder">
+ <target name="Royale_Compiler_Build_Tools_Release_Step_002_Sign" depends="get-artifact-folder">
<fail message="release.version not specified"
unless="release.version"/>
<antcall target="sign-file" >
- <param name="file" value="${artifactfolder}/artifacts/archive/target/local-release-dir/org/apache/royale/compiler/royale-compiler-parent/${release.version}/royale-compiler-parent-${release.version}-source-release.zip" />
- </antcall>
- <antcall target="sign-file" >
- <param name="file" value="${artifactfolder}/artifacts/archive/target/local-release-dir/org/apache/royale/compiler/royale-compiler-parent/${release.version}/royale-compiler-parent-${release.version}.pom" />
+ <param name="file" value="${artifactfolder}/artifacts/archive/compiler-build-tools/target/local-release-dir/org/apache/royale/compiler/compiler-build-tools/${release.version}/compiler-build-tools-${release.version}-source-release.zip" />
</antcall>
<antcall target="sign-jar-artifacts" >
<param name="jarname" value="compiler-build-tools" />
</antcall>
- <antcall target="sign-file" >
- <param name="file" value="${artifactfolder}/artifacts/archive/target/local-release-dir/org/apache/royale/compiler/compiler-externc/${release.version}/compiler-externc-${release.version}-tests.jar" />
- </antcall>
</target>
<target name="sign-jar-artifacts">
<antcall target="sign-file" >
- <param name="file" value="${artifactfolder}/artifacts/archive/target/local-release-dir/org/apache/royale/compiler/${jarname}/${release.version}/${jarname}-${release.version}.pom" />
+ <param name="file" value="${artifactfolder}/artifacts/archive/compiler-build-tools/target/local-release-dir/org/apache/royale/compiler/${jarname}/${release.version}/${jarname}-${release.version}.pom" />
</antcall>
<antcall target="sign-file" >
- <param name="file" value="${artifactfolder}/artifacts/archive/target/local-release-dir/org/apache/royale/compiler/${jarname}/${release.version}/${jarname}-${release.version}-javadoc.jar" />
+ <param name="file" value="${artifactfolder}/artifacts/archive/compiler-build-tools/target/local-release-dir/org/apache/royale/compiler/${jarname}/${release.version}/${jarname}-${release.version}-javadoc.jar" />
</antcall>
<antcall target="sign-file" >
- <param name="file" value="${artifactfolder}/artifacts/archive/target/local-release-dir/org/apache/royale/compiler/${jarname}/${release.version}/${jarname}-${release.version}-sources.jar" />
+ <param name="file" value="${artifactfolder}/artifacts/archive/compiler-build-tools/target/local-release-dir/org/apache/royale/compiler/${jarname}/${release.version}/${jarname}-${release.version}-sources.jar" />
</antcall>
<antcall target="sign-file" >
- <param name="file" value="${artifactfolder}/artifacts/archive/target/local-release-dir/org/apache/royale/compiler/${jarname}/${release.version}/${jarname}-${release.version}.jar" />
+ <param name="file" value="${artifactfolder}/artifacts/archive/compiler-build-tools/target/local-release-dir/org/apache/royale/compiler/${jarname}/${release.version}/${jarname}-${release.version}.jar" />
</antcall>
</target>
@@ -276,53 +270,48 @@
</exec>
</target>
- <target name="Royale_Compiler_Build_Tools_Release_Step_003_Upload" depends="get-artifact-folder">
+ <target name="Royale_Compiler_Build_Tools_Release_Step_002_Upload" depends="get-artifact-folder">
<fail message="release.version not specified"
unless="release.version"/>
<exec executable="${mvn}" failonerror="true" >
<arg value="wagon:upload" />
<arg value="-X" />
- <arg value="-Dwagon.fromDir=${artifactfolder}/artifacts/archive/target/local-release-dir" />
+ <arg value="-Dwagon.fromDir=${artifactfolder}/artifacts/archive/compiler-build-tools/target/local-release-dir" />
<arg value="-Dwagon.url=https://repository.apache.org/service/local/staging/deploy/maven2" />
<arg value="-Dwagon.serverId=apache.releases.https" />
<arg value="-Dwagon.includes=**" />
</exec>
- <antcall target="check-new-version" />
- <antcall target="post-on-dist" />
+ <!--<antcall target="check-new-version" />-->
+ <!--<antcall target="post-on-dist" />-->
</target>
-
- <target name="post-on-dist" depends="credentials" description="Perform required release approval steps">
+
+ <!--
+ <target name="Release_Step_004_Post_Artifacts_To_Dist" depends="credentials" description="Perform required release approval steps">-->
+ <target name="Release_Step_004_Post_Artifacts_To_Dist" description="Perform required release approval steps">
<antcall target="check-new-version" />
- <mkdir dir="${dist.dev}/royale/compiler/${release.version}/rc${rc}/binaries" />
- <copy todir="${dist.dev}/royale/compiler/${release.version}/rc${rc}" >
- <fileset dir="${basedir}/out" >
- <include name="apache-royale-compiler-${release.version}-src*" />
- </fileset>
- </copy>
- <copy todir="${dist.dev}/royale/compiler/${release.version}/rc${rc}/binaries" >
- <fileset dir="${basedir}/out" >
- <include name="apache-royale-compiler-${release.version}-bin*" />
- </fileset>
- </copy>
- <!--
+ <mkdir dir="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}/binaries" />
+ <get url="https://repository.apache.org/content/repositories/orgapacheroyale-${maven.folder.number}/compiler-build-tools/{release.version}/compiler-build-tools-${release.version}-source-release.zip"
+ todir="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}" >
+ </get>
+ <get url="https://repository.apache.org/content/repositories/orgapacheroyale-${maven.folder.number}/compiler-build-tools/{release.version}/compiler-build-tools-${release.version}-source-release.zip.asc"
+ todir="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}" >
+ </get>
+ <checksum />
+ <get url="https://repository.apache.org/content/repositories/orgapacheroyale-${maven.folder.number}/compiler-build-tools/{release.version}/compiler-build-tools-${release.version}.jar" todir="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}/binaries" >
+ </get>
+ <get url="https://repository.apache.org/content/repositories/orgapacheroyale-${maven.folder.number}/compiler-build-tools/{release.version}/compiler-build-tools-${release.version}.jar.asc" todir="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}/binaries" >
+ </get>
+ <checksum />
+<!--
<copy file="${basedir}/README" tofile="${dist.dev}/royale/compiler/${release.version}/rc${rc}/READme" />
-->
- <copy file="${basedir}/ApproveCompilerBuildTools.xml" tofile="${dist.dev}/royale/compiler/${release.version}/rc${rc}/ApproveCompilerBuildTools.xml" />
- <exec executable="${svn}" dir="${dist.dev}/royale/compiler" failonerror="true" >
+ <copy file="${basedir}/ApproveCompilerBuildTools.xml" tofile="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}/ApproveCompilerBuildTools.xml" />
+ <exec executable="${svn}" dir="${dist.dev}/royale/compiler-build-tools" failonerror="true" >
<arg value="update" />
</exec>
- <exec executable="${svn}" dir="${dist.dev}/royale/compiler" failonerror="true" >
+ <exec executable="${svn}" dir="${dist.dev}/royale/compiler-build-tools" failonerror="true" >
<arg value="add" />
- <arg value="${dist.dev}/royale/compiler/${release.version}/rc${rc}" />
- </exec>
- <exec executable="${svn}" dir="${dist.dev}/royale/compiler" failonerror="true" >
- <arg value="commit" />
- <arg value="--username" />
- <arg value="${apache.username}" />
- <arg value="--password" />
- <arg value="${apache.password}" />
- <arg value="-m" />
- <arg value="rc${rc} of Apache Royale Compiler ${release.version}" />
+ <arg value="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}" />
</exec>
</target>
[royale-compiler] 01/02: fix
Royale_Compiler_Build_Tools_Release_Step_002
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit dcc21ca5f32aa877db6cf9429a294b75c9bcd7b6
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Apr 9 00:18:06 2020 -0700
fix Royale_Compiler_Build_Tools_Release_Step_002
---
compiler-build-tools/releasesteps.xml | 33 +++++++++++----------------------
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/compiler-build-tools/releasesteps.xml b/compiler-build-tools/releasesteps.xml
index dccf319..f6d1c4e 100644
--- a/compiler-build-tools/releasesteps.xml
+++ b/compiler-build-tools/releasesteps.xml
@@ -105,7 +105,7 @@
</exec>
</target>
- <target name="Royale_Compiler_Build_Tools_Release_Step_003" depends="get-temp-folder,download-artifacts,unzip-artifacts,build-source,validate-bits">
+ <target name="Royale_Compiler_Build_Tools_Release_Step_002" depends="get-temp-folder,download-artifacts,unzip-artifacts,build-source,validate-bits">
</target>
<target name="get-temp-folder">
<input
@@ -120,23 +120,20 @@
</target>
<target name="download-artifacts" if="artifactfolder">
- <antcall target="download-artifacts-utils" />
- <get src="http://apacheroyaleci2.westus2.cloudapp.azure.com:8080/job/Royale_Release_Step_003/lastSuccessfulBuild/artifact/*zip*/archive.zip" dest="${artifactfolder}/archive.zip" />
+ <get src="http://apacheroyaleci2.westus2.cloudapp.azure.com:8080/job/Royale_Compiler_Build_Tools_Release_Step_002/lastSuccessfulBuild/artifact/*zip*/archive.zip" dest="${artifactfolder}/archive.zip" />
</target>
<target name="unzip-artifacts" if="artifactfolder">
- <antcall target="unzip-artifacts-utils" />
<mkdir dir="${artifactfolder}/artifacts" />
<unzip src="${artifactfolder}/archive.zip" dest="${artifactfolder}/artifacts"/>
</target>
<target name="build-source" >
<mkdir dir="${artifactfolder}/sources" />
- <unzip src="${artifactfolder}/artifacts/archive/target/local-release-dir/org/apache/royale/compiler/royale-compiler-parent/${release.version}/royale-compiler-parent-${release.version}-source-release.zip" dest="${artifactfolder}/sources" >
+ <unzip src="${artifactfolder}/artifacts/archive/compiler-build-tools/target/local-release-dir/org/apache/royale/compiler/compiler-build-tools/${release.version}/compiler-build-tools-${release.version}-source-release.zip" dest="${artifactfolder}/sources" >
<cutdirsmapper dirs="1" />
</unzip>
- <antcall target="build-source-utils" />
<!-- build the main project -->
<exec executable="${mvn}" dir="${artifactfolder}/sources" failonerror="true" >
<arg value="clean" />
@@ -156,7 +153,7 @@
unless="artifact.folder.found"/>
</target>
- <target name="validate-bits" depends="get-artifact-folder,get-utils-version,compare-jars">
+ <target name="validate-bits" depends="get-artifact-folder,compare-jars">
</target>
<target name="write-out-maven-jars-list">
@@ -173,18 +170,11 @@
<ant antfile="releasesteps.xml" target="loopOnce" inheritAll="false" >
<property name="artifactfolder" value="${artifactfolder}" />
<property name="release.version" value="${release.version}" />
- <property name="utils.version" value="${utils.version}" />
</ant>
</target>
<target name="get-jar-version" >
- <condition property="jar.version" value="${utils.version}"
- else="${release.version}">
- <or>
- <equals arg1="${thisFile}" arg2="compiler-jburg-types" />
- <equals arg1="${thisFile}" arg2="compiler-build-tools" />
- </or>
- </condition>
+ <property name="jar.version" value="${release.version}" />
</target>
<target name="loopOnce" >
@@ -210,7 +200,6 @@
<ant antfile="releasesteps.xml" target="loopOnce" inheritAll="false">
<property name="artifactfolder" value="${artifactfolder}" />
<property name="release.version" value="${release.version}" />
- <property name="utils.version" value="${utils.version}" />
</ant>
</target>
<target name="lastone" if="islast">
@@ -222,23 +211,23 @@
<target name="compare_files" depends="get-jar-version">
<echo>comparing ${thisFile}-${jar.version}</echo>
- <fail message="${artifactfolder}/artifacts/archive/target/local-release-dir/org/apache/royale/compiler/${thisFile}/${jar.version}/${thisFile}-${jar.version}.jar does not exist" >
+ <fail message="${artifactfolder}/artifacts/archive/compiler-build-tools/target/local-release-dir/org/apache/royale/compiler/${thisFile}/${jar.version}/${thisFile}-${jar.version}.jar does not exist" >
<condition>
<not>
- <resourceexists><file file="${artifactfolder}/artifacts/archive/target/local-release-dir/org/apache/royale/compiler/${thisFile}/${jar.version}/${thisFile}-${jar.version}.jar"/></resourceexists>
+ <resourceexists><file file="${artifactfolder}/artifacts/archive/compiler-build-tools/target/local-release-dir/org/apache/royale/compiler/${thisFile}/${jar.version}/${thisFile}-${jar.version}.jar"/></resourceexists>
</not>
</condition>
</fail>
- <fail message="${artifactfolder}/sources/${thisFile}/target/${thisFile}-${jar.version}.jar does not exist" >
+ <fail message="${artifactfolder}/sources/target/${thisFile}-${jar.version}.jar does not exist" >
<condition>
<not>
- <resourceexists><file file="${artifactfolder}/sources/${thisFile}/target/${thisFile}-${jar.version}.jar"/></resourceexists>
+ <resourceexists><file file="${artifactfolder}/sources/target/${thisFile}-${jar.version}.jar"/></resourceexists>
</not>
</condition>
</fail>
<condition property="filesmatch" value="true">
- <filesmatch file1="${artifactfolder}/artifacts/archive/target/local-release-dir/org/apache/royale/compiler/${thisFile}/${jar.version}/${thisFile}-${jar.version}.jar"
- file2="${artifactfolder}/sources/${thisFile}/target/${thisFile}-${jar.version}.jar" />
+ <filesmatch file1="${artifactfolder}/artifacts/archive/compiler-build-tools/target/local-release-dir/org/apache/royale/compiler/${thisFile}/${jar.version}/${thisFile}-${jar.version}.jar"
+ file2="${artifactfolder}/sources/target/${thisFile}-${jar.version}.jar" />
</condition>
<fail message="${thisFile}-${jar.version}.jar does not match" unless="filesmatch" />
</target>