Skip to content

* dist package re-arrangement: include sources into snapshot, no bin for libs only, warning cleanup #855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tom-Ski merged 2 commits into from
Jul 4, 2026
Merged

* dist package re-arrangement: include sources into snapshot, no bin for libs only, warning cleanup #855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f90ed0a
* dist package re-arrangement: include sources into snapshot, no bin …
dkimitsa Jun 29, 2026
86a1db3
Merge branch 'master' into task/dist-refactor
dkimitsa Jul 3, 2026
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
24 changes: 10 additions & 14 deletions dist/package/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,6 @@
<robovmdir>${basedir}/../../compiler</robovmdir>
</properties>

<profiles>
<profile>
<id>robovm-release</id>
<dependencies>
<!-- RT sources are build during release only -->
<dependency>
<groupId>com.mobidevelop.robovm</groupId>
<artifactId>robovm-rt</artifactId>
<classifier>sources</classifier>
</dependency>
</dependencies>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>com.mobidevelop.robovm</groupId>
Expand All @@ -39,9 +25,19 @@
<groupId>com.mobidevelop.robovm</groupId>
<artifactId>robovm-rt</artifactId>
</dependency>
<dependency>
<groupId>com.mobidevelop.robovm</groupId>
<artifactId>robovm-rt</artifactId>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>com.mobidevelop.robovm</groupId>
<artifactId>robovm-objc</artifactId>
</dependency>
<dependency>
<groupId>com.mobidevelop.robovm</groupId>
<artifactId>robovm-objc</artifactId>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>com.mobidevelop.robovm</groupId>
Expand Down
8 changes: 0 additions & 8 deletions dist/package/src/main/assembly/dist-common.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@
<fileMode>644</fileMode>
<outputDirectory>lib/vm</outputDirectory>
</fileSet>
<fileSet>
<directory>${robovmdir}/bin</directory>
<includes>
<include>*</include>
</includes>
<fileMode>755</fileMode>
<outputDirectory>bin</outputDirectory>
</fileSet>
<fileSet>
<directory>${robovmdir}/compiler</directory>
<outputDirectory>modules/licenses/dist-compiler/compiler</outputDirectory>
Expand Down
14 changes: 13 additions & 1 deletion dist/package/src/main/assembly/dist-full.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@
<componentDescriptor>src/main/assembly/dist-common.xml</componentDescriptor>
</componentDescriptors>

<!-- binaries only needed for compiler package -->
<fileSets>
<fileSet>
<directory>${robovmdir}/bin</directory>
<includes>
<include>*</include>
</includes>
<fileMode>755</fileMode>
<outputDirectory>bin</outputDirectory>
</fileSet>
</fileSets>

<dependencySets>
<dependencySet>
<includes>
Expand All @@ -29,7 +41,7 @@
<dependencySet>
<includes>
<include>*:*:*:sources</include>
<include>*:*:*:javadoc</include>
<!-- there is no javadoc meanwhile, commented out to remove warning <include>*:*:*:javadoc</include>-->
</includes>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
Expand Down
2 changes: 1 addition & 1 deletion dist/package/src/main/assembly/dist-nocompiler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependencySet>
<includes>
<include>*:*:*:sources</include>
<include>*:*:*:javadoc</include>
<!-- there is no javadoc meanwhile, commented out to remove warning <include>*:*:*:javadoc</include>-->
</includes>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
Expand Down
11 changes: 9 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
<artifactId>robovm-rt</artifactId>
<version>${project.version}</version>
</dependency>
<!-- FIXME: -->
<!-- robovm-rt sources used in dist -->
<dependency>
<groupId>com.mobidevelop.robovm</groupId>
<artifactId>robovm-rt</artifactId>
Expand All @@ -254,6 +254,13 @@
<artifactId>robovm-objc</artifactId>
<version>${project.version}</version>
</dependency>
<!-- robovm-objc sources used in dist -->
<dependency>
<groupId>com.mobidevelop.robovm</groupId>
<artifactId>robovm-objc</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>com.mobidevelop.robovm</groupId>
<artifactId>robovm-cocoatouch</artifactId>
Expand Down Expand Up @@ -452,7 +459,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
<version>3.8.0</version>
<configuration>
<!-- FIXME: this one is to fix "single failed: group id 'SOME BIG ID' is too big" when mac is in NT domain -->
<!-- FIXME: this adds PaxHeaders.X in this case, check if it will be adding it for normal user -->
Expand Down
Loading