Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/parparvm-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
sudo apt-get install -y clang

- name: Run ParparVM JVM tests
working-directory: vm/tests
working-directory: vm
run: mvn -B test

- name: Publish ByteCodeTranslator quality previews
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,16 +239,16 @@ jobs:
run: ant -noinput -buildfile Ports/iOSPort/build.xml jar

- name: Build iOS VM API
run: ant -noinput -buildfile vm/JavaAPI/build.xml jar
run: mvn -f vm/JavaAPI/pom.xml package

- name: Upload a Build Artifact
uses: actions/upload-artifact@v4
with:
name: JavaAPI.jar
path: vm/JavaAPI/dist/JavaAPI.jar
path: vm/JavaAPI/target/JavaAPI-1.0-SNAPSHOT.jar

- name: Build iOS VM
run: ant -noinput -buildfile vm/ByteCodeTranslator/build.xml jar
run: mvn -f vm/ByteCodeTranslator/pom.xml package

- name: Build CLDC 11 VM
run: ant -noinput -buildfile Ports/CLDC11/build.xml jar
Expand All @@ -257,7 +257,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: ByteCodeTranslator.jar
path: vm/ByteCodeTranslator/dist/ByteCodeTranslator.jar
path: vm/ByteCodeTranslator/target/ByteCodeTranslator-1.0-SNAPSHOT.jar

- name: Upload a Build Artifact
uses: actions/upload-artifact@v4
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,4 @@ pom.xml.tag
!.brokk/style.md
!.brokk/review.md
!.brokk/project.properties
dependency-reduced-pom.xml
83 changes: 83 additions & 0 deletions vm/ByteCodeTranslator/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<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>com.codename1.parparvm</groupId>
<artifactId>parparvm-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>

<artifactId>ByteCodeTranslator</artifactId>
<packaging>jar</packaging>
<name>ByteCodeTranslator</name>

<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
</dependency>
</dependencies>

<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.codename1.tools.translator.ByteCodeTranslator</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<phase>package</phase>
<configuration>
<target>
<mkdir dir="${project.basedir}/dist"/>
<copy file="${project.build.directory}/${project.build.finalName}.jar"
tofile="${project.basedir}/dist/${project.artifactId}.jar"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
53 changes: 53 additions & 0 deletions vm/JavaAPI/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<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>com.codename1.parparvm</groupId>
<artifactId>parparvm-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>

<artifactId>JavaAPI</artifactId>
<packaging>jar</packaging>
<name>JavaAPI</name>

<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<!-- Allow compiling java.* packages -->
<compilerArgs>
<arg>-Xlint:-options</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<phase>package</phase>
<configuration>
<target>
<mkdir dir="${project.basedir}/dist"/>
<copy file="${project.build.directory}/${project.build.finalName}.jar"
tofile="${project.basedir}/dist/${project.artifactId}.jar"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
50 changes: 50 additions & 0 deletions vm/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<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>

<groupId>com.codename1.parparvm</groupId>
<artifactId>parparvm-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ParparVM Parent</name>

<modules>
<module>ByteCodeTranslator</module>
<module>JavaAPI</module>
<module>tests</module>
</modules>

<properties>
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<asm.version>5.0.3</asm.version>
<junit.jupiter.version>5.10.2</junit.jupiter.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
59 changes: 22 additions & 37 deletions vm/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,49 @@
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>

<groupId>com.codename1.parparvm</groupId>
<parent>
<groupId>com.codename1.parparvm</groupId>
<artifactId>parparvm-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>

<artifactId>parparvm-tests</artifactId>
<version>1.0-SNAPSHOT</version>
<name>ParparVM Java Tests</name>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.jupiter.version>5.10.2</junit.jupiter.version>
<asm.version>5.0.3</asm.version>
</properties>

<dependencies>
<dependency>
<groupId>com.codename1.parparvm</groupId>
<artifactId>ByteCodeTranslator</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<testResources>
<testResource>
<directory>../ByteCodeTranslator/src</directory>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<!-- Tests run on newer JDK (8+) so source/target 1.8 is appropriate here -->
<!-- But the code they test targets 1.5. The test runner itself needs to run on the JVM. -->
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -50,25 +54,6 @@
<useModulePath>false</useModulePath>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>add-bytecodetranslator-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>../ByteCodeTranslator/src</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down
Loading