You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jo...@apache.org on 2017/05/14 15:42:35 UTC
git commit: [flex-asjs] [refs/heads/release0.8.0] - distribution:
-config.xml files in Maven distribution are populated with correct versions
of flex-asjs and flex-typedefs
Repository: flex-asjs
Updated Branches:
refs/heads/release0.8.0 b48777590 -> 022c097f7
distribution: -config.xml files in Maven distribution are populated with correct versions of flex-asjs and flex-typedefs
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/022c097f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/022c097f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/022c097f
Branch: refs/heads/release0.8.0
Commit: 022c097f7b00afacc93dcab1cce973a39c4d103e
Parents: b487775
Author: Josh Tynjala <jo...@apache.org>
Authored: Sun May 14 08:42:28 2017 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Sun May 14 08:42:28 2017 -0700
----------------------------------------------------------------------
.../src/main/resources/frameworks/air-config-template.xml | 2 +-
distribution/src/main/resources/frameworks/air-config.xml | 2 +-
.../src/main/resources/frameworks/airmobile-config.xml | 2 +-
.../main/resources/frameworks/createjs-config-template.xml | 6 +++---
.../src/main/resources/frameworks/createjs-config.xml | 6 +++---
.../src/main/resources/frameworks/flex-config-template.xml | 2 +-
distribution/src/main/resources/frameworks/flex-config.xml | 2 +-
.../src/main/resources/frameworks/jquery-config-template.xml | 8 ++++----
distribution/src/main/resources/frameworks/jquery-config.xml | 8 ++++----
.../src/main/resources/frameworks/js-config-template.xml | 6 +++---
distribution/src/main/resources/frameworks/js-config.xml | 6 +++---
.../src/main/resources/frameworks/node-config-template.xml | 8 ++++----
distribution/src/main/resources/frameworks/node-config.xml | 8 ++++----
13 files changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/air-config-template.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/air-config-template.xml b/distribution/src/main/resources/frameworks/air-config-template.xml
index 24269ee..a6088d3 100644
--- a/distribution/src/main/resources/frameworks/air-config-template.xml
+++ b/distribution/src/main/resources/frameworks/air-config-template.xml
@@ -75,7 +75,7 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<js-external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/air-config.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/air-config.xml b/distribution/src/main/resources/frameworks/air-config.xml
index 3e8f90b..a455301 100644
--- a/distribution/src/main/resources/frameworks/air-config.xml
+++ b/distribution/src/main/resources/frameworks/air-config.xml
@@ -75,7 +75,7 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<js-external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/airmobile-config.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/airmobile-config.xml b/distribution/src/main/resources/frameworks/airmobile-config.xml
index 2cd72a6..0cb1b85 100644
--- a/distribution/src/main/resources/frameworks/airmobile-config.xml
+++ b/distribution/src/main/resources/frameworks/airmobile-config.xml
@@ -75,7 +75,7 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<js-external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/createjs-config-template.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/createjs-config-template.xml b/distribution/src/main/resources/frameworks/createjs-config-template.xml
index 907f02b..fc49642 100644
--- a/distribution/src/main/resources/frameworks/createjs-config-template.xml
+++ b/distribution/src/main/resources/frameworks/createjs-config-template.xml
@@ -58,8 +58,8 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
- <path-element>../js/libs/flexjs-typedefs-createjs-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-createjs-${flexjs.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -76,7 +76,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-gcl-${flexjs.typedefs.version}-typedefs.swc</path-element>
</library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/createjs-config.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/createjs-config.xml b/distribution/src/main/resources/frameworks/createjs-config.xml
index 2d735ed..e1cd6af 100644
--- a/distribution/src/main/resources/frameworks/createjs-config.xml
+++ b/distribution/src/main/resources/frameworks/createjs-config.xml
@@ -58,8 +58,8 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
- <path-element>../js/libs/flexjs-typedefs-createjs-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-createjs-${flexjs.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -76,7 +76,7 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-gcl-${flexjs.typedefs.version}-typedefs.swc</path-element>
</library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/flex-config-template.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/flex-config-template.xml b/distribution/src/main/resources/frameworks/flex-config-template.xml
index ab5bb52..5064794 100644
--- a/distribution/src/main/resources/frameworks/flex-config-template.xml
+++ b/distribution/src/main/resources/frameworks/flex-config-template.xml
@@ -76,7 +76,7 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<js-external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/flex-config.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/flex-config.xml b/distribution/src/main/resources/frameworks/flex-config.xml
index 952591a..e790198 100644
--- a/distribution/src/main/resources/frameworks/flex-config.xml
+++ b/distribution/src/main/resources/frameworks/flex-config.xml
@@ -76,7 +76,7 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<js-external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
</js-external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/jquery-config-template.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/jquery-config-template.xml b/distribution/src/main/resources/frameworks/jquery-config-template.xml
index 0f474b6..7c2b2ed 100644
--- a/distribution/src/main/resources/frameworks/jquery-config-template.xml
+++ b/distribution/src/main/resources/frameworks/jquery-config-template.xml
@@ -57,8 +57,8 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
- <path-element>../js/libs/flexjs-typedefs-jquery-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-jquery-${flexjs.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -75,8 +75,8 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-{flexVersion}.swc</path-element>
- <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-gcl-${flexjs.typedefs.version}-typedefs.swc</path-element>
</library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/jquery-config.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/jquery-config.xml b/distribution/src/main/resources/frameworks/jquery-config.xml
index 8bc7f1b..1aa2637 100644
--- a/distribution/src/main/resources/frameworks/jquery-config.xml
+++ b/distribution/src/main/resources/frameworks/jquery-config.xml
@@ -57,8 +57,8 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
- <path-element>../js/libs/flexjs-typedefs-jquery-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-jquery-${flexjs.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -75,8 +75,8 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-{flexVersion}.swc</path-element>
- <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-gcl-${flexjs.typedefs.version}-typedefs.swc</path-element>
</library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/js-config-template.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/js-config-template.xml b/distribution/src/main/resources/frameworks/js-config-template.xml
index 94c747f..686671b 100644
--- a/distribution/src/main/resources/frameworks/js-config-template.xml
+++ b/distribution/src/main/resources/frameworks/js-config-template.xml
@@ -57,7 +57,7 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -74,8 +74,8 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-{flexVersion}.swc</path-element>
- <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-gcl-${flexjs.typedefs.version}-typedefs.swc</path-element>
</library-path>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/js-config.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/js-config.xml b/distribution/src/main/resources/frameworks/js-config.xml
index 486703a..433ffeb 100644
--- a/distribution/src/main/resources/frameworks/js-config.xml
+++ b/distribution/src/main/resources/frameworks/js-config.xml
@@ -57,7 +57,7 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -74,8 +74,8 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-{flexVersion}.swc</path-element>
- <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-gcl-${flexjs.typedefs.version}-typedefs.swc</path-element>
</library-path>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/node-config-template.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/node-config-template.xml b/distribution/src/main/resources/frameworks/node-config-template.xml
index 7422d21..5346aff 100644
--- a/distribution/src/main/resources/frameworks/node-config-template.xml
+++ b/distribution/src/main/resources/frameworks/node-config-template.xml
@@ -57,8 +57,8 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
- <path-element>../js/libs/flexjs-typedefs-node-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-node-${flexjs.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -75,8 +75,8 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-{flexVersion}.swc</path-element>
- <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-gcl-${flexjs.typedefs.version}-typedefs.swc</path-element>
</library-path>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/022c097f/distribution/src/main/resources/frameworks/node-config.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/frameworks/node-config.xml b/distribution/src/main/resources/frameworks/node-config.xml
index 6abba93..cc79c46 100644
--- a/distribution/src/main/resources/frameworks/node-config.xml
+++ b/distribution/src/main/resources/frameworks/node-config.xml
@@ -57,8 +57,8 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
<external-library-path>
- <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element>
- <path-element>../js/libs/flexjs-typedefs-node-{flexVersion}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-js-${flexjs.typedefs.version}-typedefs.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-node-${flexjs.typedefs.version}-typedefs.swc</path-element>
</external-library-path>
<!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
@@ -75,8 +75,8 @@
<!-- List of SWC files or directories that contain SWC files. -->
<library-path>
- <path-element>libs/Language-{flexVersion}.swc</path-element>
- <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element>
+ <path-element>libs/Language-${version}.swc</path-element>
+ <path-element>../js/libs/flexjs-typedefs-gcl-${flexjs.typedefs.version}-typedefs.swc</path-element>
</library-path>
<mxml>