Skip to content

give em to the distro packagers#3040

Closed
Alto1772 wants to merge 6 commits intoHarbourMasters:develop-sulufrom
Alto1772:app-install-method
Closed

give em to the distro packagers#3040
Alto1772 wants to merge 6 commits intoHarbourMasters:develop-sulufrom
Alto1772:app-install-method

Conversation

@Alto1772
Copy link
Contributor

@Alto1772 Alto1772 commented Jun 26, 2023

This depends on Kenix3/libultraship#307

Some changes noted:

  • Extractor::CallZapd() creates OTR file in the temporary directory first and then puts it in the folder where the game is located, or in the user configurations, according to the output of LocateFileAcrossAppDirs. This does not copy soh.otr as it's pretty much useless when the assets/game folder missing.
  • Breaking down appimage component into ship and extractor respectively for use within Linux distribution packagers. Reason is compatibility for this AUR package as the base game and extractor was and still is originally going to be seperate. Use command cmake --install build-cmake --component ship && cmake --install build-cmake --component extractor together. Will not affect Appimage building.

Requires having soh.otr ONLY to test generating other OTR files.

Build Artifacts

@Archez
Copy link
Contributor

Archez commented Jun 26, 2023

You can update the LUS submodule reference in this PR to point to your LUS changes so that these builds will actually complete and can be tested directly.

@Alto1772 Alto1772 changed the base branch from develop to develop-sulu June 27, 2023 02:10
@Alto1772 Alto1772 force-pushed the app-install-method branch from e91276a to d53b337 Compare June 27, 2023 02:24
@Alto1772 Alto1772 force-pushed the app-install-method branch from d53b337 to 64ed4f6 Compare June 27, 2023 02:26
@briaguya0
Copy link
Contributor

briaguya0 commented Aug 11, 2023

once #3113 is merged, this one should be updated to use latest LUS (so the diff shows no LUS changes) and then it should be good to go

@leggettc18
Copy link
Contributor

@briaguya-ai if we just merge this one first and then #3113 that should just work without any need to update submodules right?

@briaguya0
Copy link
Contributor

if we merge this first then immediately bump LUS to latest we should be fine (but we'll have a strange commit with a PR version of LUS in the history)

@leggettc18
Copy link
Contributor

Oh if it's about not having a tagged LUS submodule sha in the repo then yeah we should probably do it the way you suggested. I didn't think about that.

@briaguya0
Copy link
Contributor

It's not about the tag so much as about it not being an upstream LUS commit at all

@briaguya0
Copy link
Contributor

briaguya0 commented Aug 13, 2023

It's probably worth it for someone to pull this into a new branch with an LUS bump and get it merged

@leggettc18
Copy link
Contributor

@Alto1772 are you available to update the LUS submodule on this branch? The one currently on develop-sulu now should have the changes you need.

@Archez Archez added the merge conflicts PR has conflicts that need to be resolved before it can be merged label Aug 13, 2023
leggettc18 added a commit that referenced this pull request Aug 13, 2023
* implement for install method packagers

* use std::filesystem::temp_directory_path

* absolutely impeccable

* include libultraship proof

* fix windows compilation

* rename "Installation" back to "Bundle"

---------

Co-authored-by: Alto1772 <56553686+Alto1772@users.noreply.github.com>
@leggettc18
Copy link
Contributor

Closing since these changes made it in via #3119

@leggettc18 leggettc18 closed this Aug 13, 2023
@Alto1772 Alto1772 deleted the app-install-method branch November 13, 2023 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

libultraship merge conflicts PR has conflicts that need to be resolved before it can be merged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants