Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add bundled Java runtime #770

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

Jump to bottom
Merged
merged 136 commits into from
Oct 5, 2021
Merged

Add bundled Java runtime #770

merged 136 commits into from
Oct 5, 2021

Conversation

@tresf
Copy link
Contributor

@tresf tresf commented Mar 9, 2021 •
edited
Loading

Closes #468

Bundles the Java Runtime into a the QZ Tray installer.

  • To skip bundling, use new parameter${jre.skip} 
    ant pkgbuild -Djre.skip=true # skip bundling of Java Runtime
  • Since Initial support for M1 CPU #783 allows JavaFX to be fetched for non-x86_64 architecture by providing new jre.arch parameter. e.g: 
    ant pkgbuild -Dtarget.arch=aarch64 # Grab and bundle ARM64 Java Runtime + JavaFX
    See also b40dd01.
  • Downloads Java for the architecture requested (or detected) matching the vendor hard-coded into JLink.
  • Java will now live in a nested folder:
    OS Path
    🪟 Windows C:\Program Files\QZ Tray\runtime\bin\java.exe
    🐧 Linux /opt/qz-tray/jre/runtime/java
    🍏 MacOS /Applications/QZ Tray.app/Contents/PlugIns/Java.runtime/Contents/Home/bin/java

TODO:

  • Update tutorials, don't assume java -jar is a valid command.

@tresf @Vzor-
jlink branch, rebased (#4)
34d6873 
* Adds JLink helper class, CLI support
* Refactor main(); untangles TrayManager and PrintSocketServer
* Force openjdk@11 on Travis + macOS
* Mimic javapackager structure for macOS
* Temporarily disable clean between builds
* Temporarily allow running Mac version from out

Co-authored-by: Berenz <[email protected]>
Co-authored-by: Vzor- <[email protected]>
tresf and others added 16 commits April 3, 2021 15:22
@tresf
Initial jlink support for aarch64 cross, multiple jdk providers
6ac5116
@tresf
Fix jspawnhelper
cee6378
@tresf
Try to fix jspawnhelper from payload directory.
1fe8fd9
@tresf
Move isWindows() check
3bd4175
@tresf
Fix incorrect JRE lib path in payload
766c78c
@tresf
Simplify code
e6124ce
@tresf
Fix jdeps with newer JDKs
2e347e5
@tresf
Fix java permissions on Linux installs
d3b8592
@tresf
Add Travis-CI arm64 target for Linux
aade408
@tresf
First attempt to fix arm64
652c803
@tresf
Second attempt to fix arm64
5573ff2
@tresf
Third attempt to fix arm64
9f33923
@Vzor-
Cleanup Root dir, moved to .app/Contents
b0747dc
@tresf
Handle installer upgrade
1cdf1a9
@tresf
Various pkg fixes
fd5fdc1 
- Split out app bundle and pkg copy operations
- Redundantly set permissions on payload
- Fix Contents/ prefix nuances introduced with "clean" bundle
- Various small ant fixes
@Vzor-
Root properties fix
48c1f4a
tresf
tresf commented Apr 11, 2021
View reviewed changes
@klabarge
Copy link
Member

klabarge commented Sep 1, 2021

I get the below error during installation on Ubuntu 16.0.4

QZ Tray is starting...
[INFO] 2021-08-31 19:10:23,401 @ qz.installer.Installer:?
	Fixing runtime permissions...
[INFO] 2021-08-31 19:10:23,407 @ qz.installer.Installer:?
	Stopping running instances...
[DEBUG] 2021-08-31 19:10:23,434 @ qz.utils.ShellUtilities:?
	Executing: [pgrep, -x, java]
[DEBUG] 2021-08-31 19:10:23,461 @ qz.utils.ShellUtilities:?
	Executing: [pgrep, -f, qz-tray.jar]
      [success] Task preinstall was successful
Running install task...
Looking for Java...
   [success] Java was found: /tmp/selfgz7723/runtime/bin/java
Verifying the Java version is 1.8+...
   [success] Java 11.0 was detected
   [success] Java >= 9.0, adding jigsaw options
QZ Tray is starting...
[INFO] 2021-08-31 19:10:24,080 @ qz.installer.Installer:?
	Installing to /opt/qz-tray
[ERROR] 2021-08-31 19:10:24,126 @ qz.utils.ArgParser:?
	Installation step INSTALL failed
java.io.FileNotFoundException: /tmp/selfgz7723/Java.runtime/Contents/Home/legal/java.desktop/ADDITIONAL_LICENSE_INFO (No such file or directory)
	at java.base/java.io.FileInputStream.open0(Native Method)
	at java.base/java.io.FileInputStream.open(Unknown Source)
	at java.base/java.io.FileInputStream.<init>(Unknown Source)
	at org.apache.commons.io.FileUtils.doCopyFile(FileUtils.java:1138)
	at org.apache.commons.io.FileUtils.doCopyDirectory(FileUtils.java:1428)
	at org.apache.commons.io.FileUtils.doCopyDirectory(FileUtils.java:1426)
	at org.apache.commons.io.FileUtils.doCopyDirectory(FileUtils.java:1426)
	at org.apache.commons.io.FileUtils.doCopyDirectory(FileUtils.java:1426)
	at org.apache.commons.io.FileUtils.doCopyDirectory(FileUtils.java:1426)
	at org.apache.commons.io.FileUtils.doCopyDirectory(FileUtils.java:1426)
	at org.apache.commons.io.FileUtils.copyDirectory(FileUtils.java:1389)
	at org.apache.commons.io.FileUtils.copyDirectory(FileUtils.java:1261)
	at org.apache.commons.io.FileUtils.copyDirectory(FileUtils.java:1230)
	at qz.installer.Installer.deployApp(Unknown Source)
	at qz.installer.Installer.install(Unknown Source)
	at qz.installer.Installer.install(Unknown Source)
	at qz.utils.ArgParser.processInstallerArgs(Unknown Source)
	at qz.utils.ArgParser.intercept(Unknown Source)
	at qz.App.main(Unknown Source)
      [failure] Task install failed.

@tresf
Copy link
Contributor Author

tresf commented Sep 1, 2021 •
edited
Loading

@klabarge the error you've linked seems to be a very odd issue with ant's inability to remove two types of files:

  • Symbolic links
  • .DS_Store files

This isn't documented very well in ant's documentation so it took a while to find, but for now, I've written a workaround to just get rid of these symlinks from the source as well as to always delete .DS_Store files: f40bb1e.

This means you'll need to run ant clean once, and then the Java.runtime folder pollution should stop. 😅 I found a few other edge-case issues with the build system and they've been patched as well.

@tresf tresf merged commit c0e20f3 into master Oct 5, 2021
@tresf tresf deleted the jlink branch October 5, 2021 04:52
@tresf tresf mentioned this pull request Feb 10, 2022
Closed
emkah4 pushed a commit to Fourbolts/orderkrab-tray that referenced this pull request May 24, 2025
@tresf @Vzor-
@RebeccaDeField @lite1979
Add bundled Java runtime (qzind#770)
858d9d9 
* Initial jlink support for aarch64 cross, multiple jdk providers
* Adds JLink helper class, CLI support
* Pre-extract all native libs (JNA, HID4Java, etc)
* Adds new branding to Windows, MacOS installers
* Adds high-contrast support for Windows installer
* Refactor main(); untangles TrayManager and PrintSocketServer
* Move various utilities to JNA with fallback: focus, hostname, whoami, theme detection
* Leverage JDK9+ for browsing directories
* Use absolute paths for shell execute when possible
* Renames `altPrinting` to `forceRaw`, moves code to JNA using RSS with fallback
* Mimic javapackager structure for macOS
* Adds experimental DMG creation support for macOS

Co-authored-by: Vzor- <[email protected]>
Co-authored-by: Berenz <[email protected]>
Co-authored-by: Rebecca <[email protected]>
Co-authored-by: Lite Finocchiaro <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Vzor- Vzor- Vzor- left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Bundled Java Runtime

6 participants

@tresf @RebeccaDeField @klabarge @Vzor- @lite1979