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 2018/01/04 21:42:34 UTC
[royale-asjs] branch develop updated (4bf4b6c -> c6d672c)
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-asjs.git.
from 4bf4b6c Added string utils
new c5813bb maybe it will work now
new 4dd1131 need this with prior commit
new c6d672c use dash instead of dot
The 3 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:
archetypes/pom.xml | 2 +-
build.xml | 20 +++++++++-
distribution/jars/compc/pom.xml | 2 +-
distribution/jars/compiler-asc/pom.xml | 2 +-
distribution/jars/compiler-compc/pom.xml | 2 +-
distribution/jars/compiler-mxmlc/pom.xml | 2 +-
distribution/jars/compiler-optimizer/pom.xml | 2 +-
distribution/jars/compiler-swfdump/pom.xml | 2 +-
distribution/jars/mxmlc/pom.xml | 2 +-
distribution/pom.xml | 2 +-
examples/pom.xml | 2 +-
frameworks/pom.xml | 2 +-
manualtests/pom.xml | 2 +-
pom.xml | 2 +-
releasecandidate.xml | 60 +++++++++++++++-------------
testsuite/pom.xml | 2 +-
16 files changed, 66 insertions(+), 42 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].
[royale-asjs] 01/03: maybe it will work now
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-asjs.git
commit c5813bbb57bdb3a940c8f3de5ec5afb0727a002b
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Jan 4 13:32:26 2018 -0800
maybe it will work now
---
build.xml | 20 +++++++++++++++++-
releasecandidate.xml | 60 +++++++++++++++++++++++++++++-----------------------
2 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/build.xml b/build.xml
index 6077bff..1a55b3c 100644
--- a/build.xml
+++ b/build.xml
@@ -1466,7 +1466,7 @@ limitations under the License.
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
</mxmlc>
<mkdir dir="${basedir}/mustella/tests/basicTests/fonts" />
- <copy todir="${basedir}/mustella/tests/basicTests/fonts" >
+ <copy todir="${basedir}/mustella/tests/basicTests/fonts" failonerror="false">
<fileset dir="${ROYALE_HOME}/frameworks/fonts">
<include name="**/*.swf" />
</fileset>
@@ -1628,6 +1628,24 @@ limitations under the License.
<checksum algorithm="md5" file="${basedir}/out/apache-royale-jsonly-${release.version}-bin.zip" forceOverwrite="yes"/>
</target>
+ <target name="sign-jsonly" if="env.AIR_HOME" >
+ <exec executable="gpg">
+ <arg value="--armor" />
+ <arg value="--output" />
+ <arg value="${basedir}/out/apache-royale-jsonly-${release.version}-bin.zip.asc" />
+ <arg value="--detach-sig" />
+ <arg value="${basedir}/out/apache-royale-jsonly-${release.version}-bin.zip" />
+ </exec>
+
+ <exec executable="gpg">
+ <arg value="--armor" />
+ <arg value="--output" />
+ <arg value="${basedir}/out/apache-royale-jsonly-${release.version}-bin.tar.gz.asc" />
+ <arg value="--detach-sig" />
+ <arg value="${basedir}/out/apache-royale-jsonly-${release.version}-bin.tar.gz" />
+ </exec>
+ </target>
+
<target name="sign" >
<exec executable="gpg">
<arg value="--armor" />
diff --git a/releasecandidate.xml b/releasecandidate.xml
index d2c5a36..c29242d 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -335,31 +335,21 @@
<echo>changed to branch ${branch.name}</echo>
</target>
- <target name="get-maven-compiler-folder" unless="maven.compiler.folder">
- <input
- message="Enter Maven Compiler Staging Repo folder name"
- addproperty="maven.compiler.folder"/>
- </target>
- <target name="get-maven-typedefs-folder" unless="maven.typedefs.folder">
- <input
- message="Enter Maven Typedefs Staging Repo folder name"
- addproperty="maven.typedefs.folder"/>
- </target>
- <target name="get-maven-asjs-folder" unless="maven.asjs.folder">
- <input
- message="Enter Maven ASJS Staging Repo folder name"
- addproperty="maven.asjs.folder"/>
- </target>
<target name="verify-task">
<input
- message="This task will build a release candidate. It expects that the make_branches and maven targets ahve been run first. Press any <enter> to enter the location of the Maven source artifacts."
+ message="This task will build a release candidate. It expects that the make_branches and maven targets have been run first. Press any <enter> to enter the location of the Maven source artifacts."
/>
</target>
- <target name="get-maven-folders" depends="get-maven-compiler-folder, get-maven-typedefs-folder,get-maven-asjs-folder" />
+ <target name="get-maven-folders">
+ <input
+ message="Enter Maven Staging Repo folder number"
+ addproperty="maven.staging.folder.number"/>
+ </target>
<target name="main" depends="check-empty-folder,check-no-repos,verify-task,check-name-and-svn,install-rat,credentials,get-maven-folders,get-maven-source-artifacts" description="Perform packaging steps">
<antcall target="check-new-version" />
+ <antcall target="ant-artifacts" />
<antcall target="stage.rc" />
<antcall target="push.rc" />
</target>
@@ -578,7 +568,7 @@
<arg value="main" />
<!--<arg value="-DpushChanges=false" />-->
</exec>
- <!--<delete file="${compiler}/copyofrelease.properties" failonerror="false" />-->
+ <delete file="${compiler}/copyofrelease.properties" failonerror="false" />
</target>
<target name="royale.compiler" depends="clone-compiler,checkout-release-branch-compiler,maven.prepare.compiler,maven.perform.compiler" />
@@ -675,9 +665,6 @@
<exec executable="${browser}" spawn="true">
<arg value="http://repository.apache.org/" />
</exec>
- <exec executable="${browser}">
- <arg value="http://central.sonatype.org/pages/releasing-the-deployment.html#locate-and-examine-your-staging-repository" />
- </exec>
</target>
<target name="maven" depends="check-empty-folder, use_release_branch, royale.compiler, royale.typedefs, royale.framework, close.maven.staging.repo">
@@ -697,21 +684,35 @@
<mkdir dir="${basedir}/temp/royale-asjs" />
<mkdir dir="${basedir}/temp/royale-typedefs" />
<mkdir dir="${basedir}/temp/royale-compiler" />
- <get src="http://repository.apache.org/staging/royale/${maven.folder.name}/royale-asjs" dest="${basedir}/temp" />
+ <get src="https://repository.apache.org/content/repositories/orgapacheroyale-${maven.staging.folder.number}/org/apache/royale/framework/royale-framework-parent/${release.version}/royale-framework-parent-${release.version}-source-release.zip" dest="${basedir}/temp/royale-asjs.zip" />
<unzip src="${basedir}/temp/royale-asjs.zip"
- dest="${basedir}/royale-asjs"/>
- <get src="http://repository.apache.org/staging/royale/${maven.folder.name}/royale-typedefs" dest="${basedir}/temp" />
+ dest="${basedir}/royale-asjs">
+ <cutdirsmapper dirs="1"/>
+ </unzip>
+ <get src="https://repository.apache.org/content/repositories/orgapacheroyale-${maven.staging.folder.number}/org/apache/royale/typedefs/royale-typedefs-parent/${release.version}/royale-typedefs-parent-${release.version}-source-release.zip" dest="${basedir}/temp/royale-typedefs.zip" />
<unzip src="${basedir}/temp/royale-typedefs.zip"
- dest="${basedir}/royale-typedefs"/>
- <get src="http://repository.apache.org/staging/royale/${maven.folder.name}/royale-compiler" dest="${basedir}/temp" />
+ dest="${basedir}/royale-typedefs">
+ <cutdirsmapper dirs="1"/>
+ </unzip>
+ <get src="https://repository.apache.org/content/repositories/orgapacheroyale-${maven.staging.folder.number}/org/apache/royale/compiler/royale-compiler-parent/${release.version}/royale-compiler-parent-${release.version}-source-release.zip" dest="${basedir}/temp/royale-compiler.zip" />
<unzip src="${basedir}/temp/royale-compiler.zip"
- dest="${basedir}/royale-compiler"/>
+ dest="${basedir}/royale-compiler">
+ <cutdirsmapper dirs="1"/>
+ </unzip>
+ </target>
+
+ <target name="ant-artifacts">
<ant dir="${basedir}/royale-asjs" target="release" />
<ant dir="${basedir}/royale-asjs" target="create-md5" />
+ <ant dir="${basedir}/royale-asjs" target="create-md5-jsonly" />
<ant dir="${basedir}/royale-asjs" target="sign" />
+ <ant dir="${basedir}/royale-asjs" target="sign-jsonly" />
<!--<ant antfile="build.xml" target="doc-create-md5" />-->
<!--<ant antfile="build.xml" target="doc-sign" />-->
+ </target>
+
+ <target name="stage.rc">
<mkdir dir="${dist.dev}/royale/${release.version}/rc${rc}/binaries" />
<!--<mkdir dir="${dist.dev}/royale/${release.version}/rc${rc}/doc" />-->
<copy todir="${dist.dev}/royale/${release.version}/rc${rc}" >
@@ -724,6 +725,11 @@
<include name="apache-royale-${release.version}-bin*" />
</fileset>
</copy>
+ <copy todir="${dist.dev}/royale/${release.version}/rc${rc}/binaries" >
+ <fileset dir="${asjs}/out" >
+ <include name="apache-royale-jsonly-${release.version}-bin*" />
+ </fileset>
+ </copy>
<!--<copy todir="${dist.dev}/royale/${release.version}/rc${rc}/doc" >
<fileset dir="${basedir}/out" >
<include name="apache-royale-${release.version}-asdoc*" />
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.
[royale-asjs] 03/03: use dash instead of dot
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-asjs.git
commit c6d672c542fe0620a6208adc96e9b6cfe01960ca
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Jan 4 13:42:21 2018 -0800
use dash instead of dot
---
archetypes/pom.xml | 2 +-
distribution/jars/compc/pom.xml | 2 +-
distribution/jars/compiler-asc/pom.xml | 2 +-
distribution/jars/compiler-compc/pom.xml | 2 +-
distribution/jars/compiler-mxmlc/pom.xml | 2 +-
distribution/jars/compiler-optimizer/pom.xml | 2 +-
distribution/jars/compiler-swfdump/pom.xml | 2 +-
distribution/jars/mxmlc/pom.xml | 2 +-
distribution/pom.xml | 2 +-
examples/pom.xml | 2 +-
frameworks/pom.xml | 2 +-
manualtests/pom.xml | 2 +-
testsuite/pom.xml | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 1e4b8bd..ce92c97 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.1-SNAPSHOT</version>
</parent>
diff --git a/distribution/jars/compc/pom.xml b/distribution/jars/compc/pom.xml
index 8ee6d4b..0b26bd9 100644
--- a/distribution/jars/compc/pom.xml
+++ b/distribution/jars/compc/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/jars/compiler-asc/pom.xml b/distribution/jars/compiler-asc/pom.xml
index 72ed495..a9898e9 100644
--- a/distribution/jars/compiler-asc/pom.xml
+++ b/distribution/jars/compiler-asc/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/jars/compiler-compc/pom.xml b/distribution/jars/compiler-compc/pom.xml
index 9cdb2b1..bf0b711 100644
--- a/distribution/jars/compiler-compc/pom.xml
+++ b/distribution/jars/compiler-compc/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/jars/compiler-mxmlc/pom.xml b/distribution/jars/compiler-mxmlc/pom.xml
index 239a7e2..0c5f181 100644
--- a/distribution/jars/compiler-mxmlc/pom.xml
+++ b/distribution/jars/compiler-mxmlc/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/jars/compiler-optimizer/pom.xml b/distribution/jars/compiler-optimizer/pom.xml
index d348a16..a0f8408 100644
--- a/distribution/jars/compiler-optimizer/pom.xml
+++ b/distribution/jars/compiler-optimizer/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/jars/compiler-swfdump/pom.xml b/distribution/jars/compiler-swfdump/pom.xml
index a65225b..3cea5cf 100644
--- a/distribution/jars/compiler-swfdump/pom.xml
+++ b/distribution/jars/compiler-swfdump/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/jars/mxmlc/pom.xml b/distribution/jars/mxmlc/pom.xml
index da9d99c..dd2a80d 100644
--- a/distribution/jars/mxmlc/pom.xml
+++ b/distribution/jars/mxmlc/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 2d703eb..db37c52 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
diff --git a/examples/pom.xml b/examples/pom.xml
index 07962aa..270ce20 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
diff --git a/frameworks/pom.xml b/frameworks/pom.xml
index 67b5d13..3d3a50f 100644
--- a/frameworks/pom.xml
+++ b/frameworks/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.1-SNAPSHOT</version>
</parent>
diff --git a/manualtests/pom.xml b/manualtests/pom.xml
index 853fe90..6463dde 100644
--- a/manualtests/pom.xml
+++ b/manualtests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
<relativePath />
</parent>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index bb1f110..b3f4f54 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.0-SNAPSHOT</version>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.
[royale-asjs] 02/03: need this with prior commit
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-asjs.git
commit 4dd11313bb7df6a3a39f6ffc55b8f0025cab17ae
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Jan 4 13:34:06 2018 -0800
need this with prior commit
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f59c7b5..4dfe5b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
</parent>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>royale.framework-parent</artifactId>
+ <artifactId>royale-framework-parent</artifactId>
<version>0.9.1-SNAPSHOT</version>
<packaging>pom</packaging>
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.