Skip to content
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.

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

Jssc fix libs and sync with upstream #229

Merged
merged 8 commits into from Oct 3, 2021
Merged

Jssc fix libs and sync with upstream #229

merged 8 commits into from Oct 3, 2021

Conversation

sampottinger
Copy link
Collaborator

@sampottinger sampottinger commented Jul 24, 2021

Updated JSSC including a sync to the upstream library's latest fixes and migrated to new cleaner native libs. Resolves #119 (finally). Tested on the following:

  • macOS 11.4
  • Windows 10
  • Elementary 5.1 (linux)

@sampottinger
Copy link
Collaborator Author

Whoops... looks like intellij got up in there... one sec.

@sampottinger sampottinger requested a review from benfry July 25, 2021 00:12
@benfry
Copy link
Member

benfry commented Jul 28, 2021

Thanks, just some changes needed here with the name of the platform-specific subfolders. For instance, it needs to be linux64 not linux_64 to export properly. And we can leave out the 32-bit versions everywhere (except ARM, perhaps) since everything is 64-bit. So the folders should be more or less the same as before:

linux64 (64-bit Intel)
linux-arm64 (64-bit ARM for RPi)
linux-armv6hf (32-bit ARM for RPi)

either 
macosx (if it's a 32- and 64-bit fat binary)
or 
macosx64 (if it's just a 64-bit binary)

and then
macosx-arm64 (provisional, since we don't have support yet)

(This adds macosx-arm64 and drops the unnecessary 32-bit versions.)

The macOS names will need to change someday, probably becoming macos instead of macosx, though the -arm64 is confusing here for folks, so haven't decided what best to do there. (Confusing meaning that if we export an application and the folder is called application.macosx-arm64 that most humans will be confused that it means “macOS on my M1 Mac”.

@sampottinger
Copy link
Collaborator Author

Ah got it @benfry. I think these just reflect back what JSSC is doing upstream. I can change these targets.

@sampottinger
Copy link
Collaborator Author

Have a draft but testing across platforms.

@sampottinger
Copy link
Collaborator Author

@benfry, Actually ended up syncing again to master and they are bundling the natives in the jar now. See updated PR.

@benfry benfry merged commit 755925f into master Oct 3, 2021
@benfry benfry deleted the jssc_update_2 branch October 3, 2021 16:51
@benfry
Copy link
Member

benfry commented Oct 3, 2021

Thanks! Now merged for beta 2.

@github-actions
Copy link

github-actions bot commented Oct 4, 2022

This pull request has been automatically locked. Pull requests that have been closed are automatically locked 30 days after the last comment.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 4, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

JSSC binaries for Windows appear to be macOS files
2 participants