You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/07/18 13:44:45 UTC
git commit: [flex-asjs] [refs/heads/develop] - - Made the
distribution package create an SDK that IntelliJ can import.
Repository: flex-asjs
Updated Branches:
refs/heads/develop e07e364f4 -> 3ea35f934
- Made the distribution package create an SDK that IntelliJ can import.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3ea35f93
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3ea35f93
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3ea35f93
Branch: refs/heads/develop
Commit: 3ea35f93495de97981cb0f359184d4646c09d6ee
Parents: e07e364
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Mon Jul 18 15:44:38 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Mon Jul 18 15:44:38 2016 +0200
----------------------------------------------------------------------
.gitignore | 2 +-
distribution/pom.xml | 3 +++
distribution/src/main/assembly/component.xml | 21 +++++++++++++----
.../src/main/resources/flex-sdk-description.xml | 24 ++++++++++++++++++++
4 files changed, 44 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3ea35f93/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 73c107a..fdc9722 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,7 @@ FABridge.js
frameworks/projects/spark/manifest.xml
env.properties
local.properties
-flex-sdk-description.xml
+/flex-sdk-description.xml
#OS junk files
[Tt]humbs.db
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3ea35f93/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index bab9953..eccc57b 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -37,6 +37,9 @@
<distributionFileName>apache-flex-flexjs-${project.version}</distributionFileName>
<flashVersion>${flash.version}</flashVersion>
<airVersion>${air.version}</airVersion>
+
+ <timestamp>${maven.build.timestamp}</timestamp>
+ <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3ea35f93/distribution/src/main/assembly/component.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/component.xml b/distribution/src/main/assembly/component.xml
index 39b0b33..45d8725 100644
--- a/distribution/src/main/assembly/component.xml
+++ b/distribution/src/main/assembly/component.xml
@@ -39,7 +39,7 @@ under the License.
<outputDirectory>lib/external</outputDirectory>
<excludes>
<exclude>org.apache.flex.flexjs.framework:*</exclude>
- <exclude>org.apache.flex.flexjs.externs:*</exclude>
+ <exclude>org.apache.flex.flexjs.typedefs:*</exclude>
<exclude>org.apache.flex.flexjs.compiler:*</exclude>
<exclude>*:args4j:jar</exclude>
<exclude>*:google-closure-library*:jar</exclude>
@@ -51,7 +51,7 @@ under the License.
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>externs</outputDirectory>
<includes>
- <include>org.apache.flex.flexjs.externs:*</include>
+ <include>org.apache.flex.flexjs.typedefs:*</include>
</includes>
</dependencySet>
<!-- Put the framework swcs into the frameworks/libs directory -->
@@ -62,7 +62,7 @@ under the License.
<include>org.apache.flex.flexjs.framework:*:swc</include>
</includes>
<excludes>
- <exclude>org.apache.flex.flexjs.framework:*:swc:extern</exclude>
+ <exclude>org.apache.flex.flexjs.framework:*:swc:typedefs</exclude>
</excludes>
</dependencySet>
<!-- Put the playerglobal swc into the frameworks/libs/player directory -->
@@ -87,7 +87,7 @@ under the License.
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>frameworks/js/FlexJS/libs</outputDirectory>
<includes>
- <include>org.apache.flex.flexjs.framework:*:swc:extern</include>
+ <include>org.apache.flex.flexjs.framework:*:swc:typedefs</include>
</includes>
</dependencySet>
@@ -109,7 +109,7 @@ under the License.
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>js/libs</outputDirectory>
<includes>
- <include>org.apache.flex.flexjs.externs:*:swc</include>
+ <include>org.apache.flex.flexjs.typedefs:*:swc</include>
</includes>
</dependencySet>
@@ -170,6 +170,17 @@ under the License.
<include>**</include>
</includes>
</fileSet>
+
+ <!-- Copy the sdk descriptor -->
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>flex-sdk-description.xml</include>
+ </includes>
+ <filtered>true</filtered>
+ </fileSet>
+
</fileSets>
<files>
<!-- Copy the manifests -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3ea35f93/distribution/src/main/resources/flex-sdk-description.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/flex-sdk-description.xml b/distribution/src/main/resources/flex-sdk-description.xml
new file mode 100644
index 0000000..5b567be
--- /dev/null
+++ b/distribution/src/main/resources/flex-sdk-description.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<flex-sdk-description>
+ <name>Apache Flex ${project.version} FP${flash.version} AIR${air.version} en_US</name>
+ <version>${project.version}</version>
+ <build>${timestamp}</build>
+</flex-sdk-description>