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/11 17:22:08 UTC
[royale-compiler] branch develop updated: more fixes
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
The following commit(s) were added to refs/heads/develop by this push:
new 2597d08 more fixes
2597d08 is described below
commit 2597d0844f71ccf6ada937ed27f5b6ae0b3a02a2
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sat Apr 11 10:21:47 2020 -0700
more fixes
---
compiler-build-tools/ApproveBuildTools.xml | 9 +++++----
compiler-build-tools/releasesteps.xml | 6 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/compiler-build-tools/ApproveBuildTools.xml b/compiler-build-tools/ApproveBuildTools.xml
index d497b23..40c74b7 100644
--- a/compiler-build-tools/ApproveBuildTools.xml
+++ b/compiler-build-tools/ApproveBuildTools.xml
@@ -47,10 +47,11 @@
</not>
</and>
</condition>
+ <!--
<condition property="package.suffix" value="zip">
<os family="windows" />
- </condition>
- <property name="package.suffix" value="tar.gz" />
+ </condition>-->
+ <property name="package.suffix" value="zip" />
<property name="src.rat.report" value="${basedir}/rat-report-src.txt"/>
<property name="bin.rat.report" value="${basedir}/rat-report-bin.txt"/>
@@ -578,7 +579,7 @@
addproperty="bin.license.ok"/>
</target>
- <target name="build" depends="copy.downloads">
+ <target name="build">
<input
message="The final step is to run the build and any tests the build script runs. This can take several minutes. Press y to start the build."
validargs="y"
@@ -590,8 +591,8 @@
<condition property="vote" value="+1">
<and>
<equals arg1="${rat.src.license.ok}" arg2="y" />
- <equals arg1="${rat.src.binaries.ok}" arg2="y" />
<!--
+ <equals arg1="${rat.src.binaries.ok}" arg2="y" />
<equals arg1="${rat.bin.license.ok}" arg2="y" />
<equals arg1="${rat.bin.binaries.ok}" arg2="y" />
<equals arg1="${readme.ok}" arg2="y" />
diff --git a/compiler-build-tools/releasesteps.xml b/compiler-build-tools/releasesteps.xml
index b4fe488..f6869d7 100644
--- a/compiler-build-tools/releasesteps.xml
+++ b/compiler-build-tools/releasesteps.xml
@@ -296,12 +296,12 @@
<antcall target="check-new-version" />
<mkdir dir="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}/binaries" />
<get src="https://repository.apache.org/content/repositories/orgapacheroyale-${maven.folder.number}/org/apache/royale/compiler/compiler-build-tools/${release.version}/compiler-build-tools-${release.version}-source-release.zip"
- dest="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}" >
+ dest="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}/apache-royale-compiler-build-tools-${release.version}-source-release.zip" >
</get>
<get src="https://repository.apache.org/content/repositories/orgapacheroyale-${maven.folder.number}/org/apache/royale/compiler/compiler-build-tools/${release.version}/compiler-build-tools-${release.version}-source-release.zip.asc"
- dest="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}" >
+ dest="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}/apache-royale-compiler-build-tools-${release.version}-source-release.zip.asc" >
</get>
- <checksum algorithm="SHA-512" file="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}/compiler-build-tools-${release.version}-source-release.zip" forceOverwrite="yes" fileext=".sha512"/>
+ <checksum algorithm="SHA-512" file="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}/apache-royale-compiler-build-tools-${release.version}-source-release.zip" forceOverwrite="yes" fileext=".sha512"/>
<get src="https://repository.apache.org/content/repositories/orgapacheroyale-${maven.folder.number}/org/apache/royale/compiler/compiler-build-tools/${release.version}/compiler-build-tools-${release.version}.jar" dest="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}/binaries" >
</get>
<get src="https://repository.apache.org/content/repositories/orgapacheroyale-${maven.folder.number}/org/apache/royale/compiler/compiler-build-tools/${release.version}/compiler-build-tools-${release.version}.jar.asc" dest="${dist.dev}/royale/compiler-build-tools/${release.version}/rc${rc}/binaries" >