You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by cd...@apache.org on 2021/02/19 13:25:17 UTC

[royale-asjs] branch develop updated: - Make sure the jars have the correct paths in the jar's MANIFEST.MF files

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


The following commit(s) were added to refs/heads/develop by this push:
     new 00d20fc  - Make sure the jars have the correct paths in the jar's MANIFEST.MF files
00d20fc is described below

commit 00d20fc14be09e9dbe14d06703ba42267e9716e1
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Feb 19 14:25:06 2021 +0100

    - Make sure the jars have the correct paths in the jar's MANIFEST.MF files
---
 distribution/jars/compc/pom.xml              | 7 ++++++-
 distribution/jars/compiler-asc/pom.xml       | 8 ++++++--
 distribution/jars/compiler-compc/pom.xml     | 8 ++++++--
 distribution/jars/compiler-compjsc/pom.xml   | 5 +++--
 distribution/jars/compiler-mxmlc/pom.xml     | 7 ++++++-
 distribution/jars/compiler-mxmljsc/pom.xml   | 5 +++--
 distribution/jars/compiler-optimizer/pom.xml | 7 ++++++-
 distribution/jars/compiler-swfdump/pom.xml   | 7 ++++++-
 distribution/jars/mxmlc/pom.xml              | 7 ++++++-
 9 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/distribution/jars/compc/pom.xml b/distribution/jars/compc/pom.xml
index eb268c0..f96c695 100644
--- a/distribution/jars/compc/pom.xml
+++ b/distribution/jars/compc/pom.xml
@@ -16,7 +16,8 @@
   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">
+-->
+<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>
@@ -38,10 +39,14 @@
           <archive>
             <manifest>
               <addClasspath>true</addClasspath>
+              <classpathPrefix>external/</classpathPrefix>
               <classpathLayoutType>custom</classpathLayoutType>
               <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
               <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>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>
diff --git a/distribution/jars/compiler-asc/pom.xml b/distribution/jars/compiler-asc/pom.xml
index e7bfb7c..7fbe168 100644
--- a/distribution/jars/compiler-asc/pom.xml
+++ b/distribution/jars/compiler-asc/pom.xml
@@ -16,7 +16,8 @@
   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">
+-->
+<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>
@@ -30,7 +31,6 @@
   <artifactId>compiler-asc</artifactId>
   <version>${royale.compiler.version}</version>
 
-
   <build>
     <plugins>
       <plugin>
@@ -39,10 +39,14 @@
           <archive>
             <manifest>
               <addClasspath>true</addClasspath>
+              <classpathPrefix>external/</classpathPrefix>
               <classpathLayoutType>custom</classpathLayoutType>
               <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
               <mainClass>org.apache.royale.compiler.clients.ASC</mainClass>
             </manifest>
+            <manifestEntries>
+              <Class-Path>compc.jar compiler.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>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>
diff --git a/distribution/jars/compiler-compc/pom.xml b/distribution/jars/compiler-compc/pom.xml
index 014e13b..81bdb63 100644
--- a/distribution/jars/compiler-compc/pom.xml
+++ b/distribution/jars/compiler-compc/pom.xml
@@ -16,7 +16,8 @@
   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">
+-->
+<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>
@@ -30,7 +31,6 @@
   <artifactId>compiler-compc</artifactId>
   <version>${royale.compiler.version}</version>
 
-
   <build>
     <plugins>
       <plugin>
@@ -39,10 +39,14 @@
           <archive>
             <manifest>
               <addClasspath>true</addClasspath>
+              <classpathPrefix>external/</classpathPrefix>
               <classpathLayoutType>custom</classpathLayoutType>
               <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
               <mainClass>org.apache.royale.compiler.clients.COMPC</mainClass>
             </manifest>
+            <manifestEntries>
+              <Class-Path>compc.jar compiler.jar compiler-asc.jar compiler-common.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>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>
diff --git a/distribution/jars/compiler-compjsc/pom.xml b/distribution/jars/compiler-compjsc/pom.xml
index 3f0c499..5f1d1b1 100644
--- a/distribution/jars/compiler-compjsc/pom.xml
+++ b/distribution/jars/compiler-compjsc/pom.xml
@@ -16,7 +16,8 @@
   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">
+-->
+<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>
@@ -43,7 +44,7 @@
               <mainClass>org.apache.royale.compiler.clients.COMPJSC</mainClass>
             </manifest>
             <manifestEntries>
-              <Class-Path>jsc.jar</Class-Path>
+              <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>
             </manifestEntries>
           </archive>
         </configuration>
diff --git a/distribution/jars/compiler-mxmlc/pom.xml b/distribution/jars/compiler-mxmlc/pom.xml
index 8d9d6fe..046124c 100644
--- a/distribution/jars/compiler-mxmlc/pom.xml
+++ b/distribution/jars/compiler-mxmlc/pom.xml
@@ -16,7 +16,8 @@
   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">
+-->
+<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>
@@ -38,10 +39,14 @@
           <archive>
             <manifest>
               <addClasspath>true</addClasspath>
+              <classpathPrefix>external/</classpathPrefix>
               <classpathLayoutType>custom</classpathLayoutType>
               <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
               <mainClass>org.apache.royale.compiler.clients.MXMLC</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-mxmljsc.jar compiler-optimizer.jar compiler-swfdump.jar debugger.jar flex-compiler-oem.jar mxmlc.jar royale-ant-tasks.jar swfutils.jar</Class-Path>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>
diff --git a/distribution/jars/compiler-mxmljsc/pom.xml b/distribution/jars/compiler-mxmljsc/pom.xml
index d776bf2..dadc603 100644
--- a/distribution/jars/compiler-mxmljsc/pom.xml
+++ b/distribution/jars/compiler-mxmljsc/pom.xml
@@ -16,7 +16,8 @@
   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">
+-->
+<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>
@@ -43,7 +44,7 @@
               <mainClass>org.apache.royale.compiler.clients.MXMLJSC</mainClass>
             </manifest>
             <manifestEntries>
-              <Class-Path>args4j.jar org.json.jar jsc.jar</Class-Path>
+              <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>
             </manifestEntries>
           </archive>
         </configuration>
diff --git a/distribution/jars/compiler-optimizer/pom.xml b/distribution/jars/compiler-optimizer/pom.xml
index ebee0f5..0f04e00 100644
--- a/distribution/jars/compiler-optimizer/pom.xml
+++ b/distribution/jars/compiler-optimizer/pom.xml
@@ -16,7 +16,8 @@
   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">
+-->
+<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>
@@ -38,10 +39,14 @@
           <archive>
             <manifest>
               <addClasspath>true</addClasspath>
+              <classpathPrefix>external/</classpathPrefix>
               <classpathLayoutType>custom</classpathLayoutType>
               <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
               <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>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>
diff --git a/distribution/jars/compiler-swfdump/pom.xml b/distribution/jars/compiler-swfdump/pom.xml
index 5457560..2ef177a 100644
--- a/distribution/jars/compiler-swfdump/pom.xml
+++ b/distribution/jars/compiler-swfdump/pom.xml
@@ -16,7 +16,8 @@
   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">
+-->
+<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>
@@ -38,10 +39,14 @@
           <archive>
             <manifest>
               <addClasspath>true</addClasspath>
+              <classpathPrefix>external/</classpathPrefix>
               <classpathLayoutType>custom</classpathLayoutType>
               <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
               <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>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>
diff --git a/distribution/jars/mxmlc/pom.xml b/distribution/jars/mxmlc/pom.xml
index f8a708a..c3dc350 100644
--- a/distribution/jars/mxmlc/pom.xml
+++ b/distribution/jars/mxmlc/pom.xml
@@ -16,7 +16,8 @@
   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">
+-->
+<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>
@@ -38,10 +39,14 @@
           <archive>
             <manifest>
               <addClasspath>true</addClasspath>
+              <classpathPrefix>external/</classpathPrefix>
               <classpathLayoutType>custom</classpathLayoutType>
               <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
               <mainClass>org.apache.royale.compiler.clients.MXMLC</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 compiler-swfdump.jar debugger.jar flex-compiler-oem.jar royale-ant-tasks.jar swfutils.jar</Class-Path>
+            </manifestEntries>
           </archive>
         </configuration>
       </plugin>