Consolidate and streamline Linux builds#14580
Merged
Merged
Conversation
uckelman
requested changes
Mar 29, 2026
dbc4740 to
0bf0ef6
Compare
This PR will consolidate and streamline build for Linux. As such, this PR is _mostly_ reorganisation of data into a single place so that it is easier to maintain and build upon.
- Data common to various Linux packages, such as the Debian, RPM, and FlatPak packages, as well as the tar-ball, is put in `dist/linux` and distributed from there.
This data includes
- A `.desktop` file for desktop integration
- A `.mime.xml` file for mime-types of Vassal modules, saves, logs, and extension.
- a `man(1)` page on `vassal`
- An improved `VASSAL.sh` script which will allow
- Defining properties via `-Dname=value`
- Run Vassal in the Java Debugger, including option to point to the Vassal sources.
- Direct execution of player, editor, etc. by-passing the module manager
- Note that these files are _also_ distributed with the tar-ball, so that a user may use those for desktop integration.
- The script `dist/linux/integration.sh` will also be distributed with the tar-ball. If a user executes that, it will set-up or remove desktop integration.
- The descriptions in the Debian, RPM, and FlatPak packages have been made the same - for consistency.
- The PR also removes the `vassal-maven` repository because it is no longer used.
Most of these files have been renamed to `org.vassalengine.vassal` to conform with the AppStream requirements and practices.
The main point of the updated launch script `VASSAL.sh`, are
- To allow users to pass property definitions to the JVM, for example
```
-Dswing.systemlaf=javax.swing.plaf.metal.MetalLookAndFeel
```
to set a different Look'n'Feel.
- To allow users to load modules, saves, logs, etc. from the current directory _without_ giving the full path to the file. For example
```
VASSAL.sh -l BattleForMoscow.vmod
```
(currently, one would need to do
```
VASSAL.sh -l `pwd`/BattleForMoscow.vmod
```
which feels awkward).
- To run Vassal in the Java debugger `jdb` to hunt down problems.
A follow-up PR to this PR will then set-up the release workflow to generate the files `org.vassalengine.vassal.yaml` and `maven-dependencies.json` for the FlatPak repository at [`flathub/org.vassalengine.org`](https://github.com/flathub/org.vassalengine.org). Thus, after that workflow has run, someone can pick up the artefacts of that workflow and commit them to `flathub/org.vassalengine.org`.
0bf0ef6 to
6770ef4
Compare
Collaborator
Author
|
Accidental added |
uckelman
approved these changes
Mar 30, 2026
Contributor
Which part of the PR does this? |
Collaborator
Author
|
Collaborator
Author
|
Thank you for merging this in - that will hopefully make things simpler for all concerned. I guess you are setting up for a new release - please also consider the following PRs
and as promised above, all are based on Also, please consider to merge in vassalengine/vassal-site-src#4 before making a new release. Thanks. Yours, |
Contributor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR will consolidate and streamline build for Linux. As such,
this PR is mostly reorganisation of data into a single place so that
it is easier to maintain and build upon.
Data common to various Linux packages, such as the Debian, RPM, and FlatPak packages, as well as the tar-ball, is put in
dist/linuxand distributed from there.This data includes
.desktopfile for desktop integration.mime.xmlfile for mime-types of Vassal modules, saves, logs, and extension.man(1)page onvassalVASSAL.shscript which will allow-Dname=valuedist/linux/integration.shwill also be distributed with the tar-ball. If a user executes that, it will set-up or remove desktop integration.The descriptions in the Debian, RPM, and FlatPak packages have been made the same - for consistency.
The PR also removes the
vassal-mavenrepository because it is no longer used.Most of these files have been renamed to
org.vassalengine.vassalto conform with the AppStream requirements and practices.The main point of the updated launch script
VASSAL.sh, areTo allow users to pass property definitions to the JVM, for example
-Dswing.systemlaf=javax.swing.plaf.metal.MetalLookAndFeelto set a different Look'n'Feel.To allow users to load modules, saves, logs, etc. from the current directory without giving the full path to the file. For example
VASSAL.sh -l BattleForMoscow.vmod(currently, one would need to doVASSAL.sh -l `pwd`/BattleForMoscow.vmodwhich feels awkward).To run Vassal in the Java debugger
jdbto hunt down problems.A follow-up PR to this PR will then set-up the release workflow to generate the files
org.vassalengine.vassal.yamlandmaven-dependencies.jsonfor the FlatPak repository atflathub/org.vassalengine.org. Thus, after that workflow has run, someone can pick up the artefacts of that workflow and commit them toflathub/org.vassalengine.org.Closes #14514
Yours,
Christian