reasonml · rgrinberg · May 13, 2017 · May 13, 2017 · May 13, 2017 · May 13, 2017
diff --git a/.gitignore b/.gitignore
@@ -17,5 +17,5 @@ _build/**
 *.byte
 *.install
 pkg/META
-
+.merlin
 /node_modules/
diff --git a/.merlin b/.merlin
diff --git a/Makefile b/Makefile
@@ -1,9 +1,8 @@
-# topkg (https://github.com/dbuenzli/topkg) is a small native packager for your lib
-# http://erratique.ch/software/topkg/doc/Topkg.html#basics
 build:
-	cp pkg/META.in pkg/META
-	ocamlbuild -package topkg pkg/build.native
-	./build.native build
+	jbuilder build
+
+test:
+	jbuilder runtest
 
 # some boilerplate to publish a new version to GitHub
 release:
@@ -14,6 +13,6 @@ release:
 	git push "[email protected]:reasonml/ReasonNativeProject.git" tag $(version)
 
 clean:
-	ocamlbuild -clean
+	rm -rf _build *.install
 
-.PHONY: build release
+.PHONY: build release test
diff --git a/_tags b/_tags
diff --git a/internal-lib/jbuild b/internal-lib/jbuild
@@ -0,0 +1,7 @@
+(jbuild_version 1)
+
+;; why is this lib internal?
+;; because it doesn't have a public_name
+(library
+ ((name internal_lib)
+  (libraries (re))))
diff --git a/internal-lib/m1.ml b/internal-lib/m1.ml
@@ -0,0 +1,3 @@
+
+(* we can have ocaml as well as reason sources *)
+let opt = Re.opt
diff --git a/internal-lib/m2.re b/internal-lib/m2.re
@@ -0,0 +1,2 @@
+
+let y = "testing"
diff --git a/pkg/META.in b/pkg/META.in
diff --git a/pkg/build.ml b/pkg/build.ml
diff --git a/reason-native-lib/jbuild b/reason-native-lib/jbuild
@@ -0,0 +1,6 @@
+(jbuild_version 1)
+
+(library
+ ((name reason_native_lib)
+  (public_name reason-native-project)
+  (libraries (re))))
diff --git a/reason-native-lib/m1.re b/reason-native-lib/m1.re
@@ -0,0 +1,2 @@
+
+let answer = 42;
diff --git a/opam → reason-native-project.opam b/opam → reason-native-project.opam
@@ -12,12 +12,12 @@ doc: "https://reasonml.github.io/ReasonNativeProject/"
 bug-reports: "https://github.com/reasonml/ReasonNativeProject/issues"
 dev-repo: "git://github.com/reasonml/ReasonNativeProject.git"
 tags: [ "reason" "example" ]
-substs: [ "pkg/META" ]
 build: [
-  [make "build"]
+  ["jbuilder" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "topkg"   {>=  "0.8.1" & < "0.9"}
+  "jbuilder" {build}
+  "reason-native-lib"
   "reason"  {= "1.13.3"}
 ]
 available: [ ocaml-version >= "4.02" & ocaml-version < "4.05" ]
diff --git a/reason-native-project/jbuild b/reason-native-project/jbuild
@@ -0,0 +1,6 @@
+(jbuild_version 1)
+
+(executable
+ ((libraries (internal_lib reason-native-project))
+  (name test)
+  (public_name react_native_project)))
diff --git a/src/test.re → reason-native-project/test.re b/src/test.re → reason-native-project/test.re
@@ -7,3 +7,5 @@ print_string msg;
 print_newline ();
 print_string "!!!!!!\n";
 
+let a = Reason_native_lib.M1.answer;
+Printf.printf "Answer: %d\n" a