Repository: flex-asjs Updated Branches: refs/heads/develop 666b76154 -> cf35d1841
- Added the dummy jars FlashBuilder seems to need - Finetuned the distribution to omit the versions on jars in the lib directory Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cf35d184 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cf35d184 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cf35d184 Branch: refs/heads/develop Commit: cf35d184124dd778ac0c2d51f926735521475181 Parents: 666b761 Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Sat Nov 5 16:55:46 2016 +0100 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Sat Nov 5 16:55:46 2016 +0100 ---------------------------------------------------------------------- distribution/jars/compc/pom.xml | 60 +++++++++++++++++++++ distribution/jars/falcon-asc/pom.xml | 60 +++++++++++++++++++++ distribution/jars/falcon-compc/pom.xml | 60 +++++++++++++++++++++ distribution/jars/falcon-mxmlc/pom.xml | 60 +++++++++++++++++++++ distribution/jars/falcon-optimizer/pom.xml | 60 +++++++++++++++++++++ distribution/jars/falcon-swfdump/pom.xml | 65 +++++++++++++++++++++++ distribution/jars/mxmlc/pom.xml | 60 +++++++++++++++++++++ distribution/pom.xml | 49 ++++++++++++++++- distribution/src/main/assembly/component.xml | 1 + 9 files changed, 474 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/compc/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/jars/compc/pom.xml b/distribution/jars/compc/pom.xml new file mode 100644 index 0000000..1b3cfaa --- /dev/null +++ b/distribution/jars/compc/pom.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>flexjs-framework-parent</artifactId> + <version>0.8.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>compc</artifactId> + <version>0.8.0-SNAPSHOT</version> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathLayoutType>custom</classpathLayoutType> + <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <mainClass>flex2.tools.Compc</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>flex-compiler-oem</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/falcon-asc/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/jars/falcon-asc/pom.xml b/distribution/jars/falcon-asc/pom.xml new file mode 100644 index 0000000..e1b4ae1 --- /dev/null +++ b/distribution/jars/falcon-asc/pom.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>flexjs-framework-parent</artifactId> + <version>0.8.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>falcon-asc</artifactId> + <version>0.8.0-SNAPSHOT</version> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathLayoutType>custom</classpathLayoutType> + <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <mainClass>org.apache.flex.compiler.clients.ASC</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>compiler</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/falcon-compc/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/jars/falcon-compc/pom.xml b/distribution/jars/falcon-compc/pom.xml new file mode 100644 index 0000000..c332371 --- /dev/null +++ b/distribution/jars/falcon-compc/pom.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>flexjs-framework-parent</artifactId> + <version>0.8.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>falcon-compc</artifactId> + <version>0.8.0-SNAPSHOT</version> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathLayoutType>custom</classpathLayoutType> + <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <mainClass>org.apache.flex.compiler.clients.COMPC</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>compiler</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/falcon-mxmlc/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/jars/falcon-mxmlc/pom.xml b/distribution/jars/falcon-mxmlc/pom.xml new file mode 100644 index 0000000..d0bf1b9 --- /dev/null +++ b/distribution/jars/falcon-mxmlc/pom.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>flexjs-framework-parent</artifactId> + <version>0.8.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>falcon-mxmlc</artifactId> + <version>0.8.0-SNAPSHOT</version> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathLayoutType>custom</classpathLayoutType> + <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <mainClass>org.apache.flex.compiler.clients.MXMLC</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>compiler</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/falcon-optimizer/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/jars/falcon-optimizer/pom.xml b/distribution/jars/falcon-optimizer/pom.xml new file mode 100644 index 0000000..eec988e --- /dev/null +++ b/distribution/jars/falcon-optimizer/pom.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>flexjs-framework-parent</artifactId> + <version>0.8.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>falcon-optimizer</artifactId> + <version>0.8.0-SNAPSHOT</version> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathLayoutType>custom</classpathLayoutType> + <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <mainClass>org.apache.flex.compiler.clients.Optimizer</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>compiler</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/falcon-swfdump/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/jars/falcon-swfdump/pom.xml b/distribution/jars/falcon-swfdump/pom.xml new file mode 100644 index 0000000..86f1ef8 --- /dev/null +++ b/distribution/jars/falcon-swfdump/pom.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>flexjs-framework-parent</artifactId> + <version>0.8.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>falcon-swfdump</artifactId> + <version>0.8.0-SNAPSHOT</version> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathLayoutType>custom</classpathLayoutType> + <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <mainClass>org.apache.flex.swf.io.SWFDump</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>compiler</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/mxmlc/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/jars/mxmlc/pom.xml b/distribution/jars/mxmlc/pom.xml new file mode 100644 index 0000000..ff99ffa --- /dev/null +++ b/distribution/jars/mxmlc/pom.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>flexjs-framework-parent</artifactId> + <version>0.8.0-SNAPSHOT</version> + </parent> + + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>mxmlc</artifactId> + <version>0.8.0-SNAPSHOT</version> + + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathLayoutType>custom</classpathLayoutType> + <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <mainClass>org.apache.flex.compiler.clients.MXMLC</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.flex.flexjs.compiler</groupId> + <artifactId>compiler</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 4db74fb..b2dac5e 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -39,6 +39,16 @@ <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format> </properties> + <modules> + <module>jars/compc</module> + <module>jars/falcon-asc</module> + <module>jars/falcon-compc</module> + <module>jars/falcon-mxmlc</module> + <module>jars/falcon-optimizer</module> + <module>jars/falcon-swfdump</module> + <module>jars/mxmlc</module> + </modules> + <dependencies> <!-- Add the compiler module --> <dependency> @@ -409,6 +419,43 @@ <artifactId>swfobject</artifactId> <version>2.2</version> </dependency> + + <!-- Add the dummy jars --> + <dependency> + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>compc</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>mxmlc</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>falcon-asc</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>falcon-compc</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>falcon-mxmlc</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>falcon-optimizer</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.framework.distribution</groupId> + <artifactId>falcon-swfdump</artifactId> + <version>0.8.0-SNAPSHOT</version> + </dependency> </dependencies> <build> @@ -430,7 +477,7 @@ <executions> <execution> <id>unpack-swfobject</id> - <phase>package</phase> + <phase>process-resources</phase> <goals> <goal>unpack</goal> </goals> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/src/main/assembly/component.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/component.xml b/distribution/src/main/assembly/component.xml index 3293692..3b5621c 100644 --- a/distribution/src/main/assembly/component.xml +++ b/distribution/src/main/assembly/component.xml @@ -31,6 +31,7 @@ under the License. <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <includes> <include>org.apache.flex.flexjs.compiler:*:jar</include> + <include>org.apache.flex.flexjs.framework.distribution:*:jar</include> </includes> <excludes> <exclude>org.apache.flex.flexjs.compiler:compiler-jx:jar</exclude>