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-asjs.git
commit f73aba35c081f4c9c0942c6ce2ee0a17a35b2a43 Author: Christofer Dutz <[email protected]> AuthorDate: Fri Mar 12 11:24:14 2021 +0100 - Worked on getting the MANIFEST classpath entries right - Made the distribution create the same output in the js/lib directory --- distribution/jars/compc/pom.xml | 7 +- distribution/jars/compiler-asc/pom.xml | 5 +- distribution/jars/compiler-compc/pom.xml | 5 +- distribution/jars/compiler-compjsc/pom.xml | 6 +- distribution/jars/compiler-mxmlc/pom.xml | 5 +- distribution/jars/compiler-mxmljsc/pom.xml | 6 +- distribution/jars/compiler-optimizer/pom.xml | 7 +- distribution/jars/compiler-swfdump/pom.xml | 9 ++- distribution/jars/mxmlc/pom.xml | 5 +- distribution/pom.xml | 10 +++ .../src/main/assembly/component-royale.xml | 81 ++++++++++++++++++++-- 11 files changed, 100 insertions(+), 46 deletions(-) diff --git a/distribution/jars/compc/pom.xml b/distribution/jars/compc/pom.xml index f96c695..e436c36 100644 --- a/distribution/jars/compc/pom.xml +++ b/distribution/jars/compc/pom.xml @@ -38,14 +38,11 @@ <configuration> <archive> <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>external/</classpathPrefix> - <classpathLayoutType>custom</classpathLayoutType> - <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <addClasspath>false</addClasspath> <mainClass>flex2.tools.Compc</mainClass> </manifest> <manifestEntries> - <Class-Path>compiler.jar compiler-asc.jar compiler-common.jar compiler-compc.jar compiler-compjsc.jar compiler-externc.jar compiler-jburg-types.jar compiler-mxmlc.jar compiler-mxmljsc.jar compiler-optimizer.jar compiler-swfdump.jar debugger.jar flex-compiler-oem.jar mxmlc.jar royale-ant-tasks.jar swfutils.jar</Class-Path> + <Class-Path>compiler.jar compiler-common.jar</Class-Path> </manifestEntries> </archive> </configuration> diff --git a/distribution/jars/compiler-asc/pom.xml b/distribution/jars/compiler-asc/pom.xml index 9d5daa7..fc21e56 100644 --- a/distribution/jars/compiler-asc/pom.xml +++ b/distribution/jars/compiler-asc/pom.xml @@ -38,10 +38,7 @@ <configuration> <archive> <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>external/</classpathPrefix> - <classpathLayoutType>custom</classpathLayoutType> - <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <addClasspath>false</addClasspath> <mainClass>org.apache.royale.compiler.clients.ASC</mainClass> </manifest> <manifestEntries> diff --git a/distribution/jars/compiler-compc/pom.xml b/distribution/jars/compiler-compc/pom.xml index 24a1d78..7b9218a 100644 --- a/distribution/jars/compiler-compc/pom.xml +++ b/distribution/jars/compiler-compc/pom.xml @@ -38,10 +38,7 @@ <configuration> <archive> <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>external/</classpathPrefix> - <classpathLayoutType>custom</classpathLayoutType> - <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <addClasspath>false</addClasspath> <mainClass>org.apache.royale.compiler.clients.COMPC</mainClass> </manifest> <manifestEntries> diff --git a/distribution/jars/compiler-compjsc/pom.xml b/distribution/jars/compiler-compjsc/pom.xml index 5f1d1b1..1e93e0b 100644 --- a/distribution/jars/compiler-compjsc/pom.xml +++ b/distribution/jars/compiler-compjsc/pom.xml @@ -38,13 +38,11 @@ <configuration> <archive> <manifest> - <!-- <addClasspath>true</addClasspath> - <classpathLayoutType>custom</classpathLayoutType> - <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> --> + <addClasspath>false</addClasspath> <mainClass>org.apache.royale.compiler.clients.COMPJSC</mainClass> </manifest> <manifestEntries> - <Class-Path>compc.jar compiler.jar compiler-asc.jar compiler-common.jar compiler-compc.jar compiler-externc.jar compiler-jburg-types.jar compiler-mxmlc.jar compiler-mxmljsc.jar compiler-optimizer.jar compiler-swfdump.jar debugger.jar flex-compiler-oem.jar mxmlc.jar royale-ant-tasks.jar swfutils.jar jsc.jar</Class-Path> + <Class-Path>jsc.jar</Class-Path> </manifestEntries> </archive> </configuration> diff --git a/distribution/jars/compiler-mxmlc/pom.xml b/distribution/jars/compiler-mxmlc/pom.xml index 139b3d8..1df24fe 100644 --- a/distribution/jars/compiler-mxmlc/pom.xml +++ b/distribution/jars/compiler-mxmlc/pom.xml @@ -38,10 +38,7 @@ <configuration> <archive> <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>external/</classpathPrefix> - <classpathLayoutType>custom</classpathLayoutType> - <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <addClasspath>false</addClasspath> <mainClass>org.apache.royale.compiler.clients.MXMLC</mainClass> </manifest> <manifestEntries> diff --git a/distribution/jars/compiler-mxmljsc/pom.xml b/distribution/jars/compiler-mxmljsc/pom.xml index dadc603..8426b21 100644 --- a/distribution/jars/compiler-mxmljsc/pom.xml +++ b/distribution/jars/compiler-mxmljsc/pom.xml @@ -38,13 +38,11 @@ <configuration> <archive> <manifest> - <!-- <addClasspath>true</addClasspath> - <classpathLayoutType>custom</classpathLayoutType> - <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> --> + <addClasspath>false</addClasspath> <mainClass>org.apache.royale.compiler.clients.MXMLJSC</mainClass> </manifest> <manifestEntries> - <Class-Path>compc.jar compiler.jar compiler-asc.jar compiler-common.jar compiler-compc.jar compiler-compjsc.jar compiler-externc.jar compiler-jburg-types.jar compiler-mxmlc.jar compiler-optimizer.jar compiler-swfdump.jar debugger.jar flex-compiler-oem.jar mxmlc.jar royale-ant-tasks.jar swfutils.jar args4j.jar org.json.jar jsc.jar</Class-Path> + <Class-Path>args4j.jar jsc.jar</Class-Path> </manifestEntries> </archive> </configuration> diff --git a/distribution/jars/compiler-optimizer/pom.xml b/distribution/jars/compiler-optimizer/pom.xml index 0f04e00..4fcb4c6 100644 --- a/distribution/jars/compiler-optimizer/pom.xml +++ b/distribution/jars/compiler-optimizer/pom.xml @@ -38,14 +38,11 @@ <configuration> <archive> <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>external/</classpathPrefix> - <classpathLayoutType>custom</classpathLayoutType> - <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <addClasspath>false</addClasspath> <mainClass>org.apache.royale.compiler.clients.Optimizer</mainClass> </manifest> <manifestEntries> - <Class-Path>compc.jar compiler.jar compiler-asc.jar compiler-common.jar compiler-compc.jar compiler-compjsc.jar compiler-externc.jar compiler-jburg-types.jar compiler-mxmlc.jar compiler-mxmljsc.jar compiler-swfdump.jar debugger.jar flex-compiler-oem.jar mxmlc.jar royale-ant-tasks.jar swfutils.jar</Class-Path> + <Class-Path>compiler-common.jar compiler.jar</Class-Path> </manifestEntries> </archive> </configuration> diff --git a/distribution/jars/compiler-swfdump/pom.xml b/distribution/jars/compiler-swfdump/pom.xml index 2ef177a..8afea76 100644 --- a/distribution/jars/compiler-swfdump/pom.xml +++ b/distribution/jars/compiler-swfdump/pom.xml @@ -38,14 +38,13 @@ <configuration> <archive> <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>external/</classpathPrefix> - <classpathLayoutType>custom</classpathLayoutType> - <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <addClasspath>false</addClasspath> <mainClass>org.apache.royale.swf.io.SWFDump</mainClass> </manifest> <manifestEntries> - <Class-Path>compc.jar compiler.jar compiler-asc.jar compiler-common.jar compiler-compc.jar compiler-compjsc.jar compiler-externc.jar compiler-jburg-types.jar compiler-mxmlc.jar compiler-mxmljsc.jar compiler-optimizer.jar debugger.jar flex-compiler-oem.jar mxmlc.jar royale-ant-tasks.jar swfutils.jar</Class-Path> + <!-- The Ant build refers to "commons-io.jar" but with a path, that doesn't exist, so it must also work without --> + <!--Class-Path>compiler-common.jar compiler.jar external/commons-io.jar</Class-Path--> + <Class-Path>compiler-common.jar compiler.jar</Class-Path> </manifestEntries> </archive> </configuration> diff --git a/distribution/jars/mxmlc/pom.xml b/distribution/jars/mxmlc/pom.xml index 98b8132..9cca2a9 100644 --- a/distribution/jars/mxmlc/pom.xml +++ b/distribution/jars/mxmlc/pom.xml @@ -38,10 +38,7 @@ <configuration> <archive> <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>external/</classpathPrefix> - <classpathLayoutType>custom</classpathLayoutType> - <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + <addClasspath>false</addClasspath> <mainClass>org.apache.royale.compiler.clients.MXMLC</mainClass> </manifest> <manifestEntries> diff --git a/distribution/pom.xml b/distribution/pom.xml index 2412fd2..cc64fbb 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -261,6 +261,16 @@ <artifactId>compiler-jx</artifactId> <version>${royale.compiler.version}</version> </dependency> + <dependency> + <groupId>org.apache.royale.compiler</groupId> + <artifactId>compiler-externc</artifactId> + <version>${royale.compiler.version}</version> + </dependency> + <dependency> + <groupId>org.apache.royale.compiler</groupId> + <artifactId>royaleunit-ant-tasks</artifactId> + <version>${royale.compiler.version}</version> + </dependency> <!-- Add the framework js-swc modules --> <dependency> diff --git a/distribution/src/main/assembly/component-royale.xml b/distribution/src/main/assembly/component-royale.xml index 8915abb..1040e0b 100644 --- a/distribution/src/main/assembly/component-royale.xml +++ b/distribution/src/main/assembly/component-royale.xml @@ -30,13 +30,27 @@ <!-- FlashBuilder doesn't like us appending the version to the jar name --> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <includes> - <include>org.apache.royale.compiler:*:jar</include> - <include>org.apache.royale.framework.distribution:*:jar</include> + <include>org.apache.royale.framework.distribution:compc:jar</include> + <include>org.apache.royale.compiler:compiler:jar</include> + <include>org.apache.royale.framework.distribution:compiler-asc:jar</include> + <include>org.apache.royale.compiler:compiler-common:jar</include> + <include>org.apache.royale.framework.distribution:compiler-compc:jar</include> + <include>org.apache.royale.framework.distribution:compiler-mxmlc:jar</include> + <include>org.apache.royale.framework.distribution:compiler-optimizer:jar</include> + <include>org.apache.royale.framework.distribution:compiler-swfdump:jar</include> + <include>org.apache.royale.compiler:flex-compiler-oem:jar</include> + <include>org.apache.royale.framework.distribution:mxmlc:jar</include> + <include>org.apache.royale.compiler:swfutils:jar</include> + </includes> + </dependencySet> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>lib</outputDirectory> + <!-- The debugger is named fdb in the Ant distribution --> + <outputFileNameMapping>fdb.jar</outputFileNameMapping> + <includes> + <include>org.apache.royale.compiler:debugger:jar</include> </includes> - <excludes> - <exclude>org.apache.royale.compiler:compiler:jar:scripts</exclude> - <exclude>org.apache.royale.compiler:compiler-jx:jar</exclude> - </excludes> </dependencySet> <!-- Everything else should go to the lib/ext directory --> <dependencySet> @@ -70,14 +84,67 @@ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <includes> <include>*:args4j:jar</include> + <include>*:asdoc:*</include><!-- missing --> <include>*:commons-io:*</include> + <include>org.apache.royale.compiler:compiler-playerglobalc:jar</include> + <include>*:dom4j:*</include> <include>*:flex-tool-api:*</include> <include>*:guava:*</include> - <include>*:org.json:jar</include> + <include>*:jsc:*</include> + <include>*:slf4j-api:*</include> + </includes> + </dependencySet> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>js/lib</outputDirectory> + <outputFileNameMapping>compc.jar</outputFileNameMapping> + <includes> + <include>org.apache.royale.framework.distribution:compiler-compjsc:jar</include> + </includes> + </dependencySet> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>js/lib</outputDirectory> + <outputFileNameMapping>externc.jar</outputFileNameMapping> + <includes> + <include>org.apache.royale.compiler:compiler-externc:jar</include> + </includes> + </dependencySet> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>js/lib</outputDirectory> + <outputFileNameMapping>java-websocket.jar</outputFileNameMapping> + <includes> + <include>org.java-websocket:Java-WebSocket:jar</include> + </includes> + </dependencySet> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>js/lib</outputDirectory> + <outputFileNameMapping>mxmlc.jar</outputFileNameMapping> + <includes> + <include>org.apache.royale.framework.distribution:compiler-mxmljsc:jar</include> + </includes> + </dependencySet> + <dependencySet><!-- missing --> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>js/lib</outputDirectory> + <outputFileNameMapping>royaleUnitTasks.jar</outputFileNameMapping> + <includes> + <include>org.apache.royale.compiler:royaleunit-ant-tasks:jar</include> </includes> </dependencySet> <dependencySet> <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>js/lib</outputDirectory> + <outputFileNameMapping>compiler-royaleTasks.jar</outputFileNameMapping> + <includes> + <include>org.apache.royale.compiler:royale-ant-tasks:jar</include> + </includes> + </dependencySet> + + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputDirectory>js/libs</outputDirectory> <includes> <include>org.apache.royale.typedefs:*:swc</include>
