nucleus-js · ashleygwilliams · Jun 13, 2016 · creationix · Jun 13, 2016 · ashleygwilliams
diff --git a/implementations/duktape/.gitignore b/implementations/duktape/.gitignore
@@ -4,3 +4,4 @@ app
 app.zip
 app-tiny
 prefix
+/target/
diff --git a/implementations/duktape/Cargo.lock b/implementations/duktape/Cargo.lock
diff --git a/implementations/duktape/Cargo.toml b/implementations/duktape/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "nucleus"
+version = "0.1.0"
+authors = [ "Tim Caswell <[email protected]>", 
+            "Jeremiah Senkpiel <[email protected]>",
+            "Steve Klabnik <[email protected]>",
+            "Ashley Williams <[email protected]>" ]
+
+[dependencies]
+c-path = "0.1.1"
+
+[lib]
+crate-type = ["staticlib"]
diff --git a/implementations/duktape/Makefile b/implementations/duktape/Makefile
@@ -8,19 +8,19 @@ CC= cc -g
 # Uncomment the following to make a static musl binary on linux
 # CC= musl-gcc -Os -static
 
-nucleus: main.o miniz.o duktape.o duv/duv.a ${LIBUV}/.libs/libuv.a env.o rust_path/target/release/libc_path.a
-	${CC} $^ -lm -lpthread -o $@ rust_path/target/release/libc_path.a -ldl
+nucleus: main.o miniz.o duktape.o duv/duv.a ${LIBUV}/.libs/libuv.a env.o target/release/libnucleus.a
+	${CC} $^ -lm -lpthread -o $@ target/release/libnucleus.a
 
-rust_path/target/release/libc_path.a: rust_path/src/lib.rs rust_path/src/helpers.rs
-	cd rust_path && cargo build --release
+target/release/libnucleus.a:
+	cargo build --release
 
 install: nucleus
 	install nucleus /usr/local/bin/
 
 test: test-dir test-zip test-app test-app-tiny
 
 test-dir: nucleus
-	./nucleus ../../test/manual -- 1 2 3
+	./nucleus ../../tests -- 1 2 3
 
 test-zip: nucleus app.zip
 	./nucleus app.zip -- 4 5 6
@@ -42,14 +42,14 @@ app-tiny: app.zip prefix
 prefix: nucleus
 	echo "#!$(shell pwd)/nucleus --" > prefix
 
-app.zip: ../../test/manual/* ../../test/manual/deps/*
+app.zip: ../../tests/* ../../tests/deps/*
 	rm -f app.zip
-	cd ../../test/manual; zip -9 -r ../../implementations/duktape/app.zip .; cd -
+	cd ../../tests; zip -9 -r ../implementations/duktape/app.zip .; cd -
 
 env.o: env.c env.h
 	${CC} -std=gnu99 -Wall -Wextra -pedantic -Werror -c $< -o $@
 
-main.o: main.c *.h
+main.o: main.c
 	${CC} -std=gnu99 -Wall -Wextra -pedantic -Werror -c $< -o $@
 
 
@@ -72,7 +72,7 @@ miniz.o: ../../deps/miniz.c
 	${CC} -std=gnu99 -c $< -o $@
 
 clean:
-	rm -rf nucleus *.o app.zip app prefix app-tiny rust_path/target
+	rm -f nucleus *.o app.zip app prefix app-tiny
 	${MAKE} -C duv clean
 
 distclean: clean

diff --git a/implementations/duktape/rust_path/.gitignore b/implementations/duktape/rust_path/.gitignore
diff --git a/implementations/duktape/rust_path/Cargo.toml b/implementations/duktape/rust_path/Cargo.toml
diff --git a/implementations/duktape/rust_path/src/helpers.rs b/implementations/duktape/rust_path/src/helpers.rs
diff --git a/implementations/duktape/rust_path/src/lib.rs b/implementations/duktape/rust_path/src/lib.rs
diff --git a/implementations/duktape/src/lib.rs b/implementations/duktape/src/lib.rs
@@ -0,0 +1 @@
+extern crate c_path;
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ app @@
     app.zip
     app-tiny
     prefix
+    /target/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		extern crate c_path;
Copy link Member creationix Jun 13, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Is this just to get the linker to include the crate in the C library bundle? Copy link Collaborator Author ashleygwilliams Jun 15, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. this is just requiring the c_path crate in the main. basically, `lib.rs` is where all the rust will go when we convert everything.