Skip to content

Commit

Permalink
PORT: jpl_config_dylib/0: support libjawt.dylib and do not complain a…
Browse files Browse the repository at this point in the history
…bout missing dependencies. Paulo Moura.
  • Loading branch information
Jan Wielemaker authored and Jan Wielemaker committed Oct 8, 2018
1 parent ce27544 commit 57d11ed
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions jpl_config.pl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
Author: Jan Wielemaker
E-mail: J.Wielemaker@vu.nl
WWW: http://www.swi-prolog.org
Copyright (c) 2017, VU University Amsterdam
Copyright (c) 2017-2018, VU University Amsterdam
CWI, Amsterdam
All rights reserved.
Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -53,7 +54,7 @@
jpl_config_dylib :-
current_prolog_flag(apple, true),
!,
jpl_config_dylib(['libjvm.dylib', 'libjsig.dylib']).
jpl_config_dylib(['libjvm.dylib', 'libjsig.dylib', 'libjawt.dylib']).
jpl_config_dylib :-
print_message(warning, jpl_config(apple_only)).

Expand Down Expand Up @@ -82,9 +83,13 @@
; print_message(error, jpl_config(not_found(Dylib, Lib))),
fail
).
update_dylib(_, _, _, Lib) :-
debug(dylib(jpl), 'Skipping ~p as this is not a dependency', [Lib]).


jni_dylib_dir('jre/lib/server').
jni_dylib_dir('lib/server'). % Java 8
jni_dylib_dir('lib'). % Java 10 libjawt.dylib

java_home(Dir) :-
getenv('JAVA_HOME', Dir),
Expand Down

0 comments on commit 57d11ed

Please sign in to comment.