Support jsonnet >= v0.19.0

Author: eagletmt

ext/jsonnet/callbacks.c

@@ -104,9 +104,15 @@ rubyjsonnet_jump_tag(const char *exc_mesg)
     return 0;
 }
 
+#ifdef HAVE_JSONNET_IMPORT_CALLBACK_0_19
+static int
+import_callback_entrypoint(void *ctx, const char *base, const char *rel, char **found_here,
+			   char **buf, size_t *buflen)
+#else
 static char *
 import_callback_entrypoint(void *ctx, const char *base, const char *rel, char **found_here,
 			   int *success)
+#endif
 {
     struct jsonnet_vm_wrap *const vm = (struct jsonnet_vm_wrap *)ctx;
     int state;
@@ -123,14 +129,26 @@ import_callback_entrypoint(void *ctx, const char *base, const char *rel, char **
 
     if (state) {
 	VALUE msg = rescue_callback(state, "cannot import %s from %s", rel, base);
+#ifdef HAVE_JSONNET_IMPORT_CALLBACK_0_19
+	*buf = rubyjsonnet_str_to_cstr(vm->vm, msg);
+	*buflen = RSTRING_LEN(msg);
+	return 1;
+#else
 	*success = 0;
 	return rubyjsonnet_str_to_cstr(vm->vm, msg);
+#endif
     }
 
     result = rb_Array(result);
-    *success = 1;
     *found_here = rubyjsonnet_str_to_cstr(vm->vm, rb_ary_entry(result, 1));
+#ifdef HAVE_JSONNET_IMPORT_CALLBACK_0_19
+    *buf = rubyjsonnet_str_to_cstr(vm->vm, rb_ary_entry(result, 0));
+    *buflen = RSTRING_LEN(rb_ary_entry(result, 0));
+    return 0;
+#else
+    *success = 1;
     return rubyjsonnet_str_to_cstr(vm->vm, rb_ary_entry(result, 0));
+#endif
 }
 
 /*

ext/jsonnet/extconf.rb

@@ -13,8 +13,8 @@ def using_system_libraries?
   require 'mini_portile2'
   message "Using mini_portile version #{MiniPortile::VERSION}\n"
 
-  recipe = MiniPortile.new('jsonnet', 'v0.18.0')
-  recipe.files = ['https://github.com/google/jsonnet/archive/v0.18.0.tar.gz']
+  recipe = MiniPortile.new('jsonnet', 'v0.20.0')
+  recipe.files = ['https://github.com/google/jsonnet/archive/v0.20.0.tar.gz']
   class << recipe
     CORE_OBJS = %w[
       desugarer.o formatter.o lexer.o libjsonnet.o parser.o pass.o static_analysis.o string_utils.o vm.o
@@ -89,4 +89,21 @@ def target_object_files
 abort 'libjsonnet.h not found' unless have_header('libjsonnet.h')
 abort 'libjsonnet not found' unless have_library('jsonnet')
 have_header('libjsonnet_fmt.h')
+
+import_callback_0_19 = checking_for checking_message('JsonnetImportCallback >= v0.19.0') do
+  try_compile(<<SRC, '-Werror=incompatible-pointer-types')
+#include <libjsonnet.h>
+
+int f(void *ctx, const char *base, const char *rel, char **found_here, char **buf, size_t *buflen);
+
+int main() {
+  jsonnet_import_callback(NULL, f, NULL);
+  return 0;
+}
+SRC
+end
+if import_callback_0_19
+  $defs.push('-DHAVE_JSONNET_IMPORT_CALLBACK_0_19')
+end
+
 create_makefile('jsonnet/jsonnet_wrap')