This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 078ef83dda57d4da0b06622d828ab18a114ce5c8 Author: Christofer Dutz <[email protected]> AuthorDate: Sat Mar 13 13:28:10 2021 +0100 - Added the antlr-runtime.jar to the classpath - Added some comments on the Class-Path setting in pom.xml --- compiler-common/pom.xml | 1 + compiler-externc/pom.xml | 1 + compiler-jx/pom.xml | 493 +++++++++++++++++++++-------------------- compiler-playerglobalc/pom.xml | 1 + compiler/pom.xml | 1 + debugger/pom.xml | 1 + flex-compiler-oem/pom.xml | 1 + royale-ant-tasks/pom.xml | 1 + royaleunit-ant-tasks/pom.xml | 1 + 9 files changed, 255 insertions(+), 246 deletions(-) diff --git a/compiler-common/pom.xml b/compiler-common/pom.xml index 0ec37a3..dc7cc9e 100644 --- a/compiler-common/pom.xml +++ b/compiler-common/pom.xml @@ -40,6 +40,7 @@ <archive> <manifestEntries> <Sealed>false</Sealed> + <!-- These paths are all defined the way the layout will be in the distribution --> <Class-Path>external/commons-cli.jar external/commons-io.jar external/guava.jar ..</Class-Path> </manifestEntries> </archive> diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml index 45eac0b..77fdbbc 100644 --- a/compiler-externc/pom.xml +++ b/compiler-externc/pom.xml @@ -232,6 +232,7 @@ <configuration> <archive> <manifestEntries> + <!-- These paths are all defined the way the layout will be in the distribution --> <Class-Path>../../compiler/lib/external/commons-cli.jar ../../lib/external/commons-cli.jar ../../compiler/lib/external/commons-io.jar ../../lib/external/commons-io.jar ../../compiler/lib/external/guava.jar ../../lib/external/guava.jar ../../compiler/lib/external/flex-tool-api.jar ../../lib/external/flex-tool-api.jar google/closure-compiler/compiler.jar ../../compiler/lib/compiler-common.jar ../../lib/compiler-common.jar ..</Class-Path> </manifestEntries> </archive> diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index 1cc8eb0..500de78 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -1,246 +1,247 @@ -<?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.royale.compiler</groupId> - <artifactId>royale-compiler-parent</artifactId> - <version>0.9.8-SNAPSHOT</version> - </parent> - - <artifactId>compiler-jx</artifactId> - <version>0.9.8-SNAPSHOT</version> - - <name>Apache Royale: Compiler: Compiler-JX</name> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestEntries> - <Sealed>false</Sealed> - <Class-Path>commons-io.jar guava.jar ../../lib/external/antlr.jar ../../lib/external/antlr-runtime.jar ../../lib/external/commons-lang.jar ../../lib/external/closure-compiler.jar ../../lib/compiler.jar ../../lib/compiler-common.jar</Class-Path> - </manifestEntries> - </archive> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-externc-resources</id> - <phase>process-test-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/../compiler-externc/target</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../compiler-externc/src/test/config</directory> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-custom-resources</id> - <phase>process-test-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target</outputDirectory> - <resources> - <resource> - <directory>${basedir}/src/test/config</directory> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <!-- Make the surefire execute all unit-tests --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>org/**/Test*.java</include> - </includes> - <excludes> - <exclude>**/TestRoyaleFile.java</exclude> - <exclude>**/TestRoyaleMXML*.java</exclude> - <exclude>**/TestSourceMapMXML*.java</exclude> - <exclude>**/TestMXML*.java</exclude> - <exclude>**/TestRoyaleClass.java</exclude> - <exclude>**/TestTypedefsCompile.java</exclude> - </excludes> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <includes> - <include>**/TestMXML*.java</include> - </includes> - <excludes> - <exclude>**/TestTypedefsCompile.java</exclude> - </excludes> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-test-js-typedefs</id> - <phase>test-compile</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>java</executable> - <arguments> - <argument>-classpath</argument> - <classpath /> - <arguments>org.apache.royale.compiler.clients.EXTERNC</arguments> - <argument>-load-config+=../compiler-externc/src/test/config/externc-config.xml</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>generate-test-js-swc</id> - <phase>test-compile</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>java</executable> - <arguments> - <argument>-classpath</argument> - <classpath /> - <arguments>org.apache.royale.compiler.clients.COMPJSC</arguments> - <argument>-targets=SWF</argument> - <argument>-load-config+=../compiler-externc/target/compile-as-config.xml</argument> - <argument>-output=../compiler-externc/target/js.swc</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>generate-test-custom-swc</id> - <phase>test-compile</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>java</executable> - <arguments> - <argument>-classpath</argument> - <classpath /> - <arguments>org.apache.royale.compiler.clients.COMPJSC</arguments> - <argument>-load-config+=target/compile-js-config.xml</argument> - <argument>-output=target/custom.swc</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.apache.royale.compiler</groupId> - <artifactId>compiler-common</artifactId> - <version>0.9.8-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.royale.compiler</groupId> - <artifactId>compiler-externc</artifactId> - <version>0.9.8-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.royale.compiler</groupId> - <artifactId>compiler-playerglobalc</artifactId> - <version>0.9.8-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.royale.compiler</groupId> - <artifactId>compiler</artifactId> - <version>0.9.8-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.11</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> - </dependency> - - <dependency> - <groupId>args4j</groupId> - <artifactId>args4j</artifactId> - <version>2.33</version> - </dependency> - <dependency> - <groupId>com.google.javascript</groupId> - <artifactId>closure-compiler</artifactId> - <version>v20181210</version> - </dependency> - <dependency> - <groupId>org.clojure</groupId> - <artifactId>google-closure-library</artifactId> - <version>0.0-20170809-b9c14c6b</version> - </dependency> - - <dependency> - <groupId>org.apache.royale.compiler</groupId> - <artifactId>compiler-test-utils</artifactId> - <version>0.9.8-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.10</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.royale.compiler</groupId> - <artifactId>compiler-externc</artifactId> - <version>0.9.8-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - - </dependencies> - -<properties /></project> +<?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.royale.compiler</groupId> + <artifactId>royale-compiler-parent</artifactId> + <version>0.9.8-SNAPSHOT</version> + </parent> + + <artifactId>compiler-jx</artifactId> + <version>0.9.8-SNAPSHOT</version> + + <name>Apache Royale: Compiler: Compiler-JX</name> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <Sealed>false</Sealed> + <!-- These paths are all defined the way the layout will be in the distribution --> + <Class-Path>commons-io.jar guava.jar ../../lib/external/antlr.jar ../../lib/external/antlr-runtime.jar ../../lib/external/commons-lang.jar ../../lib/external/closure-compiler.jar ../../lib/compiler.jar ../../lib/compiler-common.jar</Class-Path> + </manifestEntries> + </archive> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-externc-resources</id> + <phase>process-test-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/../compiler-externc/target</outputDirectory> + <resources> + <resource> + <directory>${basedir}/../compiler-externc/src/test/config</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-custom-resources</id> + <phase>process-test-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/target</outputDirectory> + <resources> + <resource> + <directory>${basedir}/src/test/config</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <!-- Make the surefire execute all unit-tests --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>org/**/Test*.java</include> + </includes> + <excludes> + <exclude>**/TestRoyaleFile.java</exclude> + <exclude>**/TestRoyaleMXML*.java</exclude> + <exclude>**/TestSourceMapMXML*.java</exclude> + <exclude>**/TestMXML*.java</exclude> + <exclude>**/TestRoyaleClass.java</exclude> + <exclude>**/TestTypedefsCompile.java</exclude> + </excludes> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <configuration> + <includes> + <include>**/TestMXML*.java</include> + </includes> + <excludes> + <exclude>**/TestTypedefsCompile.java</exclude> + </excludes> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-test-js-typedefs</id> + <phase>test-compile</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>java</executable> + <arguments> + <argument>-classpath</argument> + <classpath /> + <arguments>org.apache.royale.compiler.clients.EXTERNC</arguments> + <argument>-load-config+=../compiler-externc/src/test/config/externc-config.xml</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>generate-test-js-swc</id> + <phase>test-compile</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>java</executable> + <arguments> + <argument>-classpath</argument> + <classpath /> + <arguments>org.apache.royale.compiler.clients.COMPJSC</arguments> + <argument>-targets=SWF</argument> + <argument>-load-config+=../compiler-externc/target/compile-as-config.xml</argument> + <argument>-output=../compiler-externc/target/js.swc</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>generate-test-custom-swc</id> + <phase>test-compile</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>java</executable> + <arguments> + <argument>-classpath</argument> + <classpath /> + <arguments>org.apache.royale.compiler.clients.COMPJSC</arguments> + <argument>-load-config+=target/compile-js-config.xml</argument> + <argument>-output=target/custom.swc</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.apache.royale.compiler</groupId> + <artifactId>compiler-common</artifactId> + <version>0.9.8-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.royale.compiler</groupId> + <artifactId>compiler-externc</artifactId> + <version>0.9.8-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.royale.compiler</groupId> + <artifactId>compiler-playerglobalc</artifactId> + <version>0.9.8-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.royale.compiler</groupId> + <artifactId>compiler</artifactId> + <version>0.9.8-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.11</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + <version>2.33</version> + </dependency> + <dependency> + <groupId>com.google.javascript</groupId> + <artifactId>closure-compiler</artifactId> + <version>v20181210</version> + </dependency> + <dependency> + <groupId>org.clojure</groupId> + <artifactId>google-closure-library</artifactId> + <version>0.0-20170809-b9c14c6b</version> + </dependency> + + <dependency> + <groupId>org.apache.royale.compiler</groupId> + <artifactId>compiler-test-utils</artifactId> + <version>0.9.8-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.10</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.royale.compiler</groupId> + <artifactId>compiler-externc</artifactId> + <version>0.9.8-SNAPSHOT</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + </dependencies> + +<properties /></project> diff --git a/compiler-playerglobalc/pom.xml b/compiler-playerglobalc/pom.xml index c0725a6..d390a8b 100644 --- a/compiler-playerglobalc/pom.xml +++ b/compiler-playerglobalc/pom.xml @@ -41,6 +41,7 @@ <configuration> <archive> <manifestEntries> + <!-- These paths are all defined the way the layout will be in the distribution --> <Class-Path>../../compiler/lib/external/commons-io.jar ../../lib/external/commons-io.jar ../../compiler-jx/lib/dom4j.jar dom4j.jar ../../compiler/lib/compiler-common.jar ../../lib/compiler-common.jar ../../compiler/lib/external/flex-tool-api.jar ../../lib/external/flex-tool-api.jar</Class-Path> </manifestEntries> </archive> diff --git a/compiler/pom.xml b/compiler/pom.xml index 2008ba8..1fbaab1 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -42,6 +42,7 @@ <configuration> <archive> <manifestEntries> + <!-- These paths are all defined the way the layout will be in the distribution --> <Class-Path>compiler-common.jar external/antlr.jar external/antlr-runtime.jar external/commons-cli.jar external/commons-io.jar external/guava.jar external/lzma-sdk-4j.jar external/flex-tool-api.jar ..</Class-Path> </manifestEntries> </archive> diff --git a/debugger/pom.xml b/debugger/pom.xml index 14b930f..b3ae60b 100644 --- a/debugger/pom.xml +++ b/debugger/pom.xml @@ -82,6 +82,7 @@ Do all the JBurg code generation. <addClasspath>false</addClasspath> </manifest> <manifestEntries> + <!-- These paths are all defined the way the layout will be in the distribution --> <Class-Path>compiler.jar compiler-common.jar swfutils.jar external/commons-lang.jar</Class-Path> </manifestEntries> </archive> diff --git a/flex-compiler-oem/pom.xml b/flex-compiler-oem/pom.xml index 1f0552b..a9b69f9 100644 --- a/flex-compiler-oem/pom.xml +++ b/flex-compiler-oem/pom.xml @@ -41,6 +41,7 @@ <mainClass>flex2.tools.Mxmlc</mainClass> </manifest> <manifestEntries> + <!-- These paths are all defined the way the layout will be in the distribution --> <Class-Path>compiler.jar swfutils.jar ../js/lib/jsc.jar</Class-Path> </manifestEntries> </archive> diff --git a/royale-ant-tasks/pom.xml b/royale-ant-tasks/pom.xml index 999ca6d..6a4d17d 100644 --- a/royale-ant-tasks/pom.xml +++ b/royale-ant-tasks/pom.xml @@ -38,6 +38,7 @@ <configuration> <archive> <manifestEntries> + <!-- These paths are all defined the way the layout will be in the distribution --> <Class-Path>jsc.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar</Class-Path> </manifestEntries> </archive> diff --git a/royaleunit-ant-tasks/pom.xml b/royaleunit-ant-tasks/pom.xml index 5e37d53..102298e 100644 --- a/royaleunit-ant-tasks/pom.xml +++ b/royaleunit-ant-tasks/pom.xml @@ -38,6 +38,7 @@ <configuration> <archive> <manifestEntries> + <!-- These paths are all defined the way the layout will be in the distribution --> <Class-Path>dom4j.jar java-websocket.jar slf4j-api.jar</Class-Path> </manifestEntries> </archive>
