Skip to content

Commit

Permalink
Merge branch 'gluonhq:master' into issue-553
Browse files Browse the repository at this point in the history
  • Loading branch information
Oliver-Loeffler authored Oct 2, 2024
2 parents f38b866 + 458530b commit 72cc949
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/jpackage.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ REM set MODULES=java.desktop,java.logging,java.naming,java.prefs,java.security.j
--module-path %JAVAFX_HOME% ^
--add-modules %JDEPS_MODULES%,%JAVAFX_MODULES% ^
--output app/target/runtime ^
--strip-debug --compress 2 --no-header-files --no-man-pages
--strip-debug --compress zip-6 --no-header-files --no-man-pages

%JPACKAGE_HOME%\bin\jpackage ^
--app-version %APP_VERSION% ^
Expand All @@ -30,4 +30,4 @@ REM set MODULES=java.desktop,java.logging,java.naming,java.prefs,java.security.j
--win-menu ^
--win-menu-group "Scene Builder" ^
--win-per-user-install ^
--win-shortcut
--win-shortcut
4 changes: 2 additions & 2 deletions .github/scripts/jpackage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $JAVA_HOME/bin/jlink \
--module-path $JAVAFX_HOME \
--add-modules $jdeps_modules,$JAVAFX_MODULES \
--output app/target/runtime \
--strip-debug --compress 2 --no-header-files --no-man-pages
--strip-debug --compress zip-6 --no-header-files --no-man-pages

$JPACKAGE_HOME/bin/jpackage \
--app-version $APP_VERSION \
Expand All @@ -19,4 +19,4 @@ $JPACKAGE_HOME/bin/jpackage \
--verbose \
--runtime-image app/target/runtime \
--dest $INSTALL_DIR \
"$@"
"$@"
4 changes: 2 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Copyright (c) 2016, 2023, Gluon and/or its affiliates.
Copyright (c) 2016, 2024, Gluon and/or its affiliates.
Copyright (c) 2012, 2014, Oracle and/or its affiliates.
All rights reserved. Use is subject to license terms.

Expand Down Expand Up @@ -28,4 +28,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 comments on commit 72cc949

Please sign in to comment.