Repository: flex-asjs Updated Branches: refs/heads/develop b350e4de9 -> 5b4273cff
attempt to fix distribution build Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5b4273cf Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5b4273cf Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5b4273cf Branch: refs/heads/develop Commit: 5b4273cff919c1ca8bbb7ae3b0e2f6c52a1c4e1a Parents: b350e4d Author: Alex Harui <[email protected]> Authored: Sun Apr 30 23:31:55 2017 -0700 Committer: Alex Harui <[email protected]> Committed: Sun Apr 30 23:31:55 2017 -0700 ---------------------------------------------------------------------- distribution/pom.xml | 44 +++++++++++------------ distribution/src/main/assembly/component.xml | 22 ++++++++---- 2 files changed, 38 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5b4273cf/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index e5cfdd1..b1149a0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -217,154 +217,154 @@ <artifactId>Binding</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Charts</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Collections</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Core</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>CreateJS</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>DragDrop</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Effects</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Flat</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>FontAwesome</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Formatters</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>GoogleMaps</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Graphics</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>HTML</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>HTML5</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>JQuery</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Language</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>MaterialDesignLite</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Mobile</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Network</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Reflection</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Storage</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>XML</artifactId> <version>0.8.0-SNAPSHOT</version> <type>swc</type> - <classifier>typedefs</classifier> + <classifier>js</classifier> </dependency> <!-- Add dependencies to the externs from the compiler module --> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5b4273cf/distribution/src/main/assembly/component.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/component.xml b/distribution/src/main/assembly/component.xml index 8a81182..7e40f9e 100644 --- a/distribution/src/main/assembly/component.xml +++ b/distribution/src/main/assembly/component.xml @@ -75,7 +75,7 @@ under the License. <useProjectArtifact>false</useProjectArtifact> <outputDirectory>frameworks/js/FlexJS/libs</outputDirectory> <includes> - <include>org.apache.flex.flexjs.framework:*:swc:typedefs</include> + <include>org.apache.flex.flexjs.framework:*:swc:js</include> </includes> </dependencySet> @@ -204,6 +204,21 @@ under the License. <destName>basic-manifest-binding.xml</destName> </file> <file> + <source>../frameworks/projects/Basic/src/main/resources/basic-manifest.xml</source> + <outputDirectory>frameworks/manifests</outputDirectory> + <destName>basic-manifest-basic.xml</destName> + </file> + <file> + <source>../frameworks/projects/Basic/src/main/resources/basic-as-manifest.xml</source> + <outputDirectory>frameworks/manifests</outputDirectory> + <destName>basic-as-manifest-basic.xml</destName> + </file> + <file> + <source>../frameworks/projects/Basic/src/main/resources/svg-manifest.xml</source> + <outputDirectory>frameworks/manifests</outputDirectory> + <destName>svg-manifest-basic.xml</destName> + </file> + <file> <source>../frameworks/projects/Charts/src/main/resources/basic-manifest.xml</source> <outputDirectory>frameworks/manifests</outputDirectory> <destName>basic-manifest-charts.xml</destName> @@ -269,11 +284,6 @@ under the License. <destName>basic-manifest-html.xml</destName> </file> <file> - <source>../frameworks/projects/HTML/src/main/resources/svg-manifest.xml</source> - <outputDirectory>frameworks/manifests</outputDirectory> - <destName>svg-manifest-html.xml</destName> - </file> - <file> <source>../frameworks/projects/HTML5/src/main/resources/html5-manifest.xml</source> <outputDirectory>frameworks/manifests</outputDirectory> <destName>html5-manifest.xml</destName>
