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 2017/12/12 05:54:57 UTC
[royale-asjs] branch develop updated: try to maintain execute bits
in tar.gz
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
The following commit(s) were added to refs/heads/develop by this push:
new 6039b96 try to maintain execute bits in tar.gz
6039b96 is described below
commit 6039b96b498c0781256dda2671f99ae3c305be0e
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Dec 11 21:54:44 2017 -0800
try to maintain execute bits in tar.gz
---
ApproveRoyale.xml | 1 +
build.xml | 16 +++++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ApproveRoyale.xml b/ApproveRoyale.xml
index a6fdeea..2ba875d 100644
--- a/ApproveRoyale.xml
+++ b/ApproveRoyale.xml
@@ -312,6 +312,7 @@
<delete dir="${basedir}/${doc.package.url.name}" failonerror="false" />-->
</target>
+ <!-- untar does not restore file permissions so don't bother checking --->
<target name="untar-file" unless="zip.package" description="Untars zipFile">
<untar src="${basedir}/${package.url.name}.${package.suffix}"
dest="${basedir}" compression="gzip"/>
diff --git a/build.xml b/build.xml
index f225662..f15b4dc 100644
--- a/build.xml
+++ b/build.xml
@@ -424,6 +424,7 @@
<include name="**"/>
</fileset>
</copy>
+ <chmod dir="${basedir}/bin" excludes="**/*.bat" perm="+x" />
<mkdir dir="${basedir}/js/lib" />
<echo>Copying Transpiler from ${ROYALE_COMPILER_REPO}</echo>
<copy todir="${basedir}/js/lib">
@@ -804,6 +805,7 @@
</fixcrlf>
<chmod dir="${staging-dir}/js/bin" excludes="**/*.bat" perm="+x" />
+ <chmod dir="${staging-dir}/bin" excludes="**/*.bat" perm="+x" />
<!--
Source files have Windows line endings. Most UNIX editors can handle
@@ -1009,16 +1011,20 @@
longfile="gnu">
<tarfileset dir="${basedir}/temp" prefix="@{name}">
<include name="**" />
- <exclude name="bin/**" />
+ <exclude name="royale-asjs/bin/**" />
+ <exclude name="royale-asjs/js/bin/**" />
<exclude name="**/*.sh" />
</tarfileset>
<tarfileset dir="${basedir}/temp" prefix="@{name}">
- <include name="bin/*.bat" />
+ <include name="royale-asjs/bin/*.bat" />
+ <include name="royale-asjs/js/bin/*.bat" />
</tarfileset>
- <tarfileset dir="${basedir}/temp" prefix="@{name}" mode="755">
- <include name="bin/*" />
+ <tarfileset dir="${basedir}/temp" prefix="@{name}" filemode="755">
+ <include name="royale-asjs/bin/*" />
+ <include name="royale-asjs/js/bin/*" />
<include name="**/*.sh" />
- <exclude name="bin/*.bat" />
+ <exclude name="royale-asjs/bin/*.bat" />
+ <exclude name="royale-asjs/js/bin/*.bat" />
</tarfileset>
</tar>
</sequential>
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].