require 'formula' class LibreadlineJava < Formula homepage 'http://java-readline.sourceforge.net/' url 'https://downloads.sourceforge.net/project/java-readline/java-readline/0.8.0/libreadline-java-0.8.0-src.tar.gz' sha1 '1f5574f9345afc039e9c7a09ae4979129891d52a' depends_on 'readline' # Fix "non-void function should return a value"-Error # https://sourceforge.net/tracker/?func=detail&atid=453822&aid=3566332&group_id=48669 patch :DATA def install java_home = ENV["JAVA_HOME"] = `/usr/libexec/java_home`.chomp # Current Oracle JDKs put the jni.h and jni_md.h in a different place than the # original Apple/Sun JDK used to. if File.exist? "#{java_home}/include/jni.h" ENV["JAVAINCLUDE"] = "#{java_home}/include" ENV["JAVANATINC"] = "#{java_home}/include/darwin" elsif File.exist? "/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/jni.h" ENV["JAVAINCLUDE"] = "/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/" ENV["JAVANATINC"] = "/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/" end # Take care of some hard-coded paths, # adjust postfix of jni libraries, # adjust gnu install parameters to bsd install inreplace 'Makefile' do |s| s.change_make_var! "PREFIX", prefix s.change_make_var! "JAVALIBDIR", "$(PREFIX)/share/libreadline-java" s.change_make_var! "JAVAINCLUDE", ENV['JAVAINCLUDE'] s.change_make_var! "JAVANATINC", ENV['JAVANATINC'] s.gsub! "*.so", "*.jnilib" s.gsub! "install -D", "install -c" end # Take care of some hard-coded paths, # adjust CC variable, # adjust postfix of jni libraries inreplace 'src/native/Makefile' do |s| readline = Formula["readline"] s.change_make_var! "INCLUDES", "-I $(JAVAINCLUDE) -I $(JAVANATINC) -I #{readline.opt_include}" s.change_make_var! "LIBPATH", "-L#{readline.opt_lib}" s.change_make_var! "CC", "cc" s.gsub! "LIB_EXT := so", "LIB_EXT := jnilib" s.gsub! "$(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@", "$(CC) -install_name #{HOMEBREW_PREFIX}/lib/$(LIB_PRE)$(TG).$(LIB_EXT) -dynamiclib $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@" end (share/"libreadline-java").mkpath system "make jar" system "make build-native" system "make install" doc.install "api" end def caveats; <<-EOS.undent You may need to set JAVA_HOME: export JAVA_HOME="$(/usr/libexec/java_home)" EOS end # Testing libreadline-java (can we execute and exit libreadline without exceptions?) test do system "echo 'exit' | java -Djava.library.path=#{lib} -cp #{share}/libreadline-java/libreadline-java.jar test.ReadlineTest | grep -v Exception" end end __END__ diff --git a/src/native/org_gnu_readline_Readline.c b/src/native/org_gnu_readline_Readline.c index f601c73..b26cafc 100644 --- a/src/native/org_gnu_readline_Readline.c +++ b/src/native/org_gnu_readline_Readline.c @@ -430,7 +430,7 @@ const char *java_completer(char *text, int state) { jtext = (*jniEnv)->NewStringUTF(jniEnv,text); if (jniMethodId == 0) { - return; + return ((const char *)NULL); } completion = (*jniEnv)->CallObjectMethod(jniEnv, jniObject,