- Worked on getting the MANIFEST classpath entries right
- Made the distribution create the same output in the js/lib directory
diff --git a/compiler-common/pom.xml b/compiler-common/pom.xml
index 79d5a8d..0ec37a3 100644
--- a/compiler-common/pom.xml
+++ b/compiler-common/pom.xml
@@ -40,7 +40,7 @@
<archive>
<manifestEntries>
<Sealed>false</Sealed>
- <Class-Path>external/commons-cli.jar external/commons-io.jar external/ guava.jar ..</Class-Path>
+ <Class-Path>external/commons-cli.jar external/commons-io.jar external/guava.jar ..</Class-Path>
</manifestEntries>
</archive>
</configuration>
diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml
index 94e2ff3..45eac0b 100644
--- a/compiler-externc/pom.xml
+++ b/compiler-externc/pom.xml
@@ -228,6 +228,17 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
+ <id>default-jar</id>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <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>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-test-jar</id>
<goals>
<goal>test-jar</goal>
</goals>
diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml
index b29e7e6..abf5349 100644
--- a/compiler-jx/pom.xml
+++ b/compiler-jx/pom.xml
@@ -39,7 +39,7 @@
<archive>
<manifestEntries>
<Sealed>false</Sealed>
- <Class-Path>commons-io.jar guava.jar ../../lib/external/antlr.jar ../../lib/external/antlr-runtime.jar ../..jar ../../compiler/lib/external/commons-lang.jar ../../lib/external/closure-compiler.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar ../../compiler/lib/compiler-common.jar ../../lib/compiler-common.jar</Class-Path>
+ <Class-Path>commons-io.jar guava.jar ../../lib/external/antlr.jar ../../lib/external/commons-lang.jar ../../lib/external/closure-compiler.jar ../../lib/compiler.jar ../../lib/compiler-common.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
diff --git a/compiler-playerglobalc/pom.xml b/compiler-playerglobalc/pom.xml
index 37528e2..c0725a6 100644
--- a/compiler-playerglobalc/pom.xml
+++ b/compiler-playerglobalc/pom.xml
@@ -37,6 +37,17 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
+ <id>default-jar</id>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <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>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-test-jar</id>
<goals>
<goal>test-jar</goal>
</goals>
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 47ec9fc..d944733 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -42,7 +42,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>compiler-common.jar external/antlr.jar external/commons-cli.jar external/commons-io.jar external/guava.jar external/lzma-sdk.jar external/flex-tool-api.jar ..</Class-Path>
+ <Class-Path>compiler-common.jar external/antlr.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>
</configuration>
diff --git a/debugger/pom.xml b/debugger/pom.xml
index b19c7a9..14b930f 100644
--- a/debugger/pom.xml
+++ b/debugger/pom.xml
@@ -74,6 +74,19 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ </manifest>
+ <manifestEntries>
+ <Class-Path>compiler.jar compiler-common.jar swfutils.jar external/commons-lang.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/flex-compiler-oem/pom.xml b/flex-compiler-oem/pom.xml
index ba9ab61..1f0552b 100644
--- a/flex-compiler-oem/pom.xml
+++ b/flex-compiler-oem/pom.xml
@@ -30,6 +30,25 @@
<name>Apache Royale: Compiler: OEM Layer</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ <mainClass>flex2.tools.Mxmlc</mainClass>
+ </manifest>
+ <manifestEntries>
+ <Class-Path>compiler.jar swfutils.jar ../js/lib/jsc.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
diff --git a/royale-ant-tasks/pom.xml b/royale-ant-tasks/pom.xml
index 17a5ada..999ca6d 100644
--- a/royale-ant-tasks/pom.xml
+++ b/royale-ant-tasks/pom.xml
@@ -30,6 +30,22 @@
<name>Apache Royale: Royale Ant Tasks</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Class-Path>jsc.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
diff --git a/royaleunit-ant-tasks/pom.xml b/royaleunit-ant-tasks/pom.xml
index 57c9e8d..5e37d53 100644
--- a/royaleunit-ant-tasks/pom.xml
+++ b/royaleunit-ant-tasks/pom.xml
@@ -30,6 +30,22 @@
<name>Apache Royale: RoyaleUnit Ant Tasks</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Class-Path>dom4j.jar java-websocket.jar slf4j-api.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
