You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2018/09/02 09:43:42 UTC
[royale-asjs] branch develop updated: Reverted these changes
This is an automated email from the ASF dual-hosted git repository.
harbs 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 1d64582 Reverted these changes
1d64582 is described below
commit 1d645822f111c1b88c3e0d617bc6ad0633f80736
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Sep 2 12:40:17 2018 +0300
Reverted these changes
The changed tokens were unrecognized and broke the swf tests in the ant build.
---
distribution/src/main/resources/frameworks/flex-config-template.xml | 4 ++--
distribution/src/main/resources/frameworks/flex-config.xml | 4 ++--
examples/royale/ASDoc/src/main/config/asdoc-js-config.xml | 2 +-
examples/royale/ASDoc/src/main/config/asdoc-swf-config.xml | 2 +-
examples/royale/Flex2Royale/src/main/config/asdoc-config.xml | 2 +-
frameworks/asdoc-config.xml | 2 +-
frameworks/flex-config-template.xml | 4 ++--
frameworks/royale-config-template.xml | 4 ++--
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/distribution/src/main/resources/frameworks/flex-config-template.xml b/distribution/src/main/resources/frameworks/flex-config-template.xml
index 16a9267..9d68460 100644
--- a/distribution/src/main/resources/frameworks/flex-config-template.xml
+++ b/distribution/src/main/resources/frameworks/flex-config-template.xml
@@ -70,7 +70,7 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<swf-external-library-path>
- <path-element>{playerglobalHome}/${targetPlayerMajorVersion}.${targetPlayerMinorVersion}/playerglobal.swc</path-element>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
</swf-external-library-path>
<!-- List of SWC files or directories to compile against but to omit from -->
@@ -94,7 +94,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<swf-library-path>
<path-element>libs</path-element>
- <path-element>{playerglobalHome}/${targetPlayerMajorVersion}.${targetPlayerMinorVersion}</path-element>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
</swf-library-path>
<!-- List of SWC files or directories that contain SWC files. -->
diff --git a/distribution/src/main/resources/frameworks/flex-config.xml b/distribution/src/main/resources/frameworks/flex-config.xml
index 91b8987..14e0148 100644
--- a/distribution/src/main/resources/frameworks/flex-config.xml
+++ b/distribution/src/main/resources/frameworks/flex-config.xml
@@ -70,7 +70,7 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<swf-external-library-path>
- <path-element>libs/player/${targetPlayerMajorVersion}.${targetPlayerMinorVersion}/playerglobal.swc</path-element>
+ <path-element>libs/player/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
</swf-external-library-path>
<!-- List of SWC files or directories to compile against but to omit from -->
@@ -94,7 +94,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<swf-library-path>
<path-element>libs</path-element>
- <path-element>libs/player/${targetPlayerMajorVersion}.${targetPlayerMinorVersion}</path-element>
+ <path-element>libs/player/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
</swf-library-path>
<!-- List of SWC files or directories that contain SWC files. -->
diff --git a/examples/royale/ASDoc/src/main/config/asdoc-js-config.xml b/examples/royale/ASDoc/src/main/config/asdoc-js-config.xml
index 8be3eba..c862a2a 100644
--- a/examples/royale/ASDoc/src/main/config/asdoc-js-config.xml
+++ b/examples/royale/ASDoc/src/main/config/asdoc-js-config.xml
@@ -135,7 +135,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>{playerglobalHome}/${targetPlayerMajorVersion}.${targetPlayerMinorVersion}</path-element>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
</library-path>
<!-- namespace declaration for asdoc -->
diff --git a/examples/royale/ASDoc/src/main/config/asdoc-swf-config.xml b/examples/royale/ASDoc/src/main/config/asdoc-swf-config.xml
index dbb944d..eb185a3 100644
--- a/examples/royale/ASDoc/src/main/config/asdoc-swf-config.xml
+++ b/examples/royale/ASDoc/src/main/config/asdoc-swf-config.xml
@@ -135,7 +135,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>{playerglobalHome}/${targetPlayerMajorVersion}.${targetPlayerMinorVersion}</path-element>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
</library-path>
<!-- namespace declaration for asdoc -->
diff --git a/examples/royale/Flex2Royale/src/main/config/asdoc-config.xml b/examples/royale/Flex2Royale/src/main/config/asdoc-config.xml
index 450098a..3555330 100644
--- a/examples/royale/Flex2Royale/src/main/config/asdoc-config.xml
+++ b/examples/royale/Flex2Royale/src/main/config/asdoc-config.xml
@@ -135,7 +135,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>{playerglobalHome}/${targetPlayerMajorVersion}.${targetPlayerMinorVersion}</path-element>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
</library-path>
<!-- namespace declaration for asdoc -->
diff --git a/frameworks/asdoc-config.xml b/frameworks/asdoc-config.xml
index a77c9ea..a36470e 100644
--- a/frameworks/asdoc-config.xml
+++ b/frameworks/asdoc-config.xml
@@ -100,7 +100,7 @@
<library-path>
<path-element>${royalelib}/libs/core.swc</path-element>
<path-element>${royalelib}/libs/framework.swc</path-element>
- <path-element>{playerglobalHome}/${targetPlayerMajorVersion}.${targetPlayerMinorVersion}</path-element>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
</library-path>
<!-- namespace declaration for asdoc -->
diff --git a/frameworks/flex-config-template.xml b/frameworks/flex-config-template.xml
index c399c33..19be559 100644
--- a/frameworks/flex-config-template.xml
+++ b/frameworks/flex-config-template.xml
@@ -70,7 +70,7 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<external-library-path>
- <path-element>{playerglobalHome}/${targetPlayerMajorVersion}.${targetPlayerMinorVersion}/playerglobal.swc</path-element>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
</external-library-path>
<!-- List of SWC files or directories to compile against but to omit from -->
@@ -94,7 +94,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
<path-element>libs</path-element>
- <path-element>{playerglobalHome}/${targetPlayerMajorVersion}.${targetPlayerMinorVersion}</path-element>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
</library-path>
<!-- List of SWC files or directories that contain SWC files. -->
diff --git a/frameworks/royale-config-template.xml b/frameworks/royale-config-template.xml
index 220400b..487b0ca 100644
--- a/frameworks/royale-config-template.xml
+++ b/frameworks/royale-config-template.xml
@@ -70,7 +70,7 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<external-library-path>
- <path-element>{playerglobalHome}/${targetPlayerMajorVersion}.${targetPlayerMinorVersion}/playerglobal.swc</path-element>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
</external-library-path>
<!-- List of SWC files or directories to compile against but to omit from -->
@@ -94,7 +94,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
<path-element>libs</path-element>
- <path-element>{playerglobalHome}/${targetPlayerMajorVersion}.${targetPlayerMinorVersion}</path-element>
+ <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
</library-path>
<!-- List of SWC files or directories that contain SWC files. -->