Repository: flex-asjs Updated Branches: refs/heads/develop 9218ab051 -> 60e0516df
distribution: uses new {flexVersion} token in config XML to reference SWC files Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/60e0516d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/60e0516d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/60e0516d Branch: refs/heads/develop Commit: 60e0516dffb45b618b441ff0f539556fbceb3e11 Parents: 9218ab0 Author: Josh Tynjala <joshtynj...@apache.org> Authored: Fri Jan 13 18:00:12 2017 -0800 Committer: Josh Tynjala <joshtynj...@apache.org> Committed: Fri Jan 13 18:00:24 2017 -0800 ---------------------------------------------------------------------- .../main/resources/frameworks/createjs-config-template.xml | 6 +++--- .../src/main/resources/frameworks/createjs-config.xml | 6 +++--- .../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 ++++---- 8 files changed, 28 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60e0516d/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 b9897df..df32b02 100644 --- a/distribution/src/main/resources/frameworks/createjs-config-template.xml +++ b/distribution/src/main/resources/frameworks/createjs-config-template.xml @@ -53,8 +53,8 @@ <!-- List of SWC files or directories to compile against but to omit from --> <!-- linking. --> <external-library-path> - <path-element>../js/libs/js.swc</path-element> - <path-element>../js/libs/createjs.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-createjs-{flexVersion}-typedefs.swc</path-element> </external-library-path> <!-- Turn on writing of generated/*.as files to disk. These files are generated by --> @@ -71,7 +71,7 @@ <!-- List of SWC files or directories that contain SWC files. --> <library-path> - <path-element>../js/libs/GCL.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element> </library-path> <mxml> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60e0516d/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 ad9d28d..1582ed2 100644 --- a/distribution/src/main/resources/frameworks/createjs-config.xml +++ b/distribution/src/main/resources/frameworks/createjs-config.xml @@ -53,8 +53,8 @@ <!-- List of SWC files or directories to compile against but to omit from --> <!-- linking. --> <external-library-path> - <path-element>../js/libs/js.swc</path-element> - <path-element>../js/libs/createjs.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-createjs-{flexVersion}-typedefs.swc</path-element> </external-library-path> <!-- Turn on writing of generated/*.as files to disk. These files are generated by --> @@ -71,7 +71,7 @@ <!-- List of SWC files or directories that contain SWC files. --> <library-path> - <path-element>../js/libs/GCL.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element> </library-path> <mxml> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60e0516d/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 6ca74ee..cda05c9 100644 --- a/distribution/src/main/resources/frameworks/jquery-config-template.xml +++ b/distribution/src/main/resources/frameworks/jquery-config-template.xml @@ -53,8 +53,8 @@ <!-- List of SWC files or directories to compile against but to omit from --> <!-- linking. --> <external-library-path> - <path-element>../js/libs/js.swc</path-element> - <path-element>../js/libs/jquery.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-jquery-{flexVersion}-typedefs.swc</path-element> </external-library-path> <!-- Turn on writing of generated/*.as files to disk. These files are generated by --> @@ -71,8 +71,8 @@ <!-- List of SWC files or directories that contain SWC files. --> <library-path> - <path-element>libs/Core.swc</path-element> - <path-element>../js/libs/GCL.swc</path-element> + <path-element>libs/Core-{flexVersion}.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element> </library-path> <mxml> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60e0516d/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 cde2cf6..8bc9f83 100644 --- a/distribution/src/main/resources/frameworks/jquery-config.xml +++ b/distribution/src/main/resources/frameworks/jquery-config.xml @@ -53,8 +53,8 @@ <!-- List of SWC files or directories to compile against but to omit from --> <!-- linking. --> <external-library-path> - <path-element>../js/libs/js.swc</path-element> - <path-element>../js/libs/jquery.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-jquery-{flexVersion}-typedefs.swc</path-element> </external-library-path> <!-- Turn on writing of generated/*.as files to disk. These files are generated by --> @@ -71,8 +71,8 @@ <!-- List of SWC files or directories that contain SWC files. --> <library-path> - <path-element>libs/Core.swc</path-element> - <path-element>../js/libs/GCL.swc</path-element> + <path-element>libs/Core-{flexVersion}.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element> </library-path> <mxml> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60e0516d/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 9e12436..f24b85b 100644 --- a/distribution/src/main/resources/frameworks/js-config-template.xml +++ b/distribution/src/main/resources/frameworks/js-config-template.xml @@ -53,7 +53,7 @@ <!-- List of SWC files or directories to compile against but to omit from --> <!-- linking. --> <external-library-path> - <path-element>../js/libs/js.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element> </external-library-path> <!-- Turn on writing of generated/*.as files to disk. These files are generated by --> @@ -70,8 +70,8 @@ <!-- List of SWC files or directories that contain SWC files. --> <library-path> - <path-element>libs/Core.swc</path-element> - <path-element>../js/libs/GCL.swc</path-element> + <path-element>libs/Core-{flexVersion}.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element> </library-path> <mxml> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60e0516d/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 6f13fcd..55df933 100644 --- a/distribution/src/main/resources/frameworks/js-config.xml +++ b/distribution/src/main/resources/frameworks/js-config.xml @@ -53,7 +53,7 @@ <!-- List of SWC files or directories to compile against but to omit from --> <!-- linking. --> <external-library-path> - <path-element>../js/libs/js.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element> </external-library-path> <!-- Turn on writing of generated/*.as files to disk. These files are generated by --> @@ -70,8 +70,8 @@ <!-- List of SWC files or directories that contain SWC files. --> <library-path> - <path-element>libs/Core.swc</path-element> - <path-element>../js/libs/GCL.swc</path-element> + <path-element>libs/Core-{flexVersion}.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element> </library-path> <mxml> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60e0516d/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 dd82080..1b89a5d 100644 --- a/distribution/src/main/resources/frameworks/node-config-template.xml +++ b/distribution/src/main/resources/frameworks/node-config-template.xml @@ -53,8 +53,8 @@ <!-- List of SWC files or directories to compile against but to omit from --> <!-- linking. --> <external-library-path> - <path-element>../js/libs/js.swc</path-element> - <path-element>../js/libs/node.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-node-{flexVersion}-typedefs.swc</path-element> </external-library-path> <!-- Turn on writing of generated/*.as files to disk. These files are generated by --> @@ -71,8 +71,8 @@ <!-- List of SWC files or directories that contain SWC files. --> <library-path> - <path-element>libs/Core.swc</path-element> - <path-element>../js/libs/GCL.swc</path-element> + <path-element>libs/Core-{flexVersion}.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element> </library-path> <mxml> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60e0516d/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 4ad71b5..d7e84e0 100644 --- a/distribution/src/main/resources/frameworks/node-config.xml +++ b/distribution/src/main/resources/frameworks/node-config.xml @@ -53,8 +53,8 @@ <!-- List of SWC files or directories to compile against but to omit from --> <!-- linking. --> <external-library-path> - <path-element>../js/libs/js.swc</path-element> - <path-element>../js/libs/node.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-js-{flexVersion}-typedefs.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-node-{flexVersion}-typedefs.swc</path-element> </external-library-path> <!-- Turn on writing of generated/*.as files to disk. These files are generated by --> @@ -71,8 +71,8 @@ <!-- List of SWC files or directories that contain SWC files. --> <library-path> - <path-element>libs/Core.swc</path-element> - <path-element>../js/libs/GCL.swc</path-element> + <path-element>libs/Core-{flexVersion}.swc</path-element> + <path-element>../js/libs/flexjs-typedefs-gcl-{flexVersion}-typedefs.swc</path-element> </library-path> <mxml>