You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2021/09/22 17:05:58 UTC
[royale-asjs] branch develop updated: distribution: scripts in bin
and js/bin forced to the correct line endings
This is an automated email from the ASF dual-hosted git repository.
joshtynjala 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 4422cab distribution: scripts in bin and js/bin forced to the correct line endings
4422cab is described below
commit 4422cab19583b276b5ee41b773033ee0a7e9f318
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Wed Sep 22 10:05:45 2021 -0700
distribution: scripts in bin and js/bin forced to the correct line endings
CRLF for Windows .bat files. LF for Unix shell scripts.
---
.../src/main/assembly/component-royale.xml | 28 +++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/distribution/src/main/assembly/component-royale.xml b/distribution/src/main/assembly/component-royale.xml
index b4b3ed4..3da6f78 100644
--- a/distribution/src/main/assembly/component-royale.xml
+++ b/distribution/src/main/assembly/component-royale.xml
@@ -195,9 +195,21 @@
</includes>
<excludes>
<exclude>META-INF/**</exclude>
+ <exclude>*.bat</exclude>
</excludes>
<!-- Make all scripts in here executable -->
<fileMode>0755</fileMode>
+ <lineEnding>lf</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/dependency/compiler</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ <!-- Make all scripts in here executable -->
+ <fileMode>0755</fileMode>
+ <lineEnding>crlf</lineEnding>
</fileSet>
<!-- Copy the js scripts -->
@@ -205,10 +217,24 @@
<directory>../js/bin</directory>
<outputDirectory>js/bin</outputDirectory>
<includes>
- <include>**</include>
+ <include>*</include>
+ </includes>
+ <excludes>
+ <exclude>*.bat</exclude>
+ </excludes>
+ <!-- Make all scripts in here executable -->
+ <fileMode>0755</fileMode>
+ <lineEnding>lf</lineEnding>
+ </fileSet>
+ <fileSet>
+ <directory>../js/bin</directory>
+ <outputDirectory>js/bin</outputDirectory>
+ <includes>
+ <include>*.bat</include>
</includes>
<!-- Make all scripts in here executable -->
<fileMode>0755</fileMode>
+ <lineEnding>crlf</lineEnding>
</fileSet>
<!-- Copy the projects -->