require 'formula' class LibreadlineJava < Formula homepage 'http://java-readline.sourceforge.net/' url 'http://downloads.sourceforge.net/project/java-readline/java-readline/0.8.0/libreadline-java-0.8.0-src.tar.gz' sha1 '1f5574f9345afc039e9c7a09ae4979129891d52a' depends_on 'readline' def patches # Fix "non-void function should return a value"-Error # https://sourceforge.net/tracker/?func=detail&atid=453822&aid=3566332&group_id=48669 DATA end def install 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.exists? ENV['JAVA_HOME'] + "/include/jni.h" then ENV['JAVAINCLUDE'] = ENV['JAVA_HOME'] + "/include" ENV['JAVANATINC'] = ENV['JAVA_HOME'] + "/include/darwin" elsif File.exists? "/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| s.change_make_var! "INCLUDES", "-I $(JAVAINCLUDE) -I $(JAVANATINC) -I #{HOMEBREW_PREFIX}/opt/readline/include" s.change_make_var! "LIBPATH", "-L#{HOMEBREW_PREFIX}/opt/readline/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 mkdir_p prefix + "share/libreadline-java" system "make jar" system "make build-native" system "make install" doc.install Dir["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, d='n12' href='#n12'>12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166