More stuff

Author: DilumAluthge

examples/MyLib/Makefile

@@ -7,23 +7,34 @@ all: build-library build-executable
 
 JULIA ?= julia
 GCC ?= gcc
+
 DLEXT := $(shell $(JULIA) --startup-file=no -e 'import Libdl; print(Libdl.dlext)')
 
 TARGET="MyLibCompiled"
 
 MYLIB_INCLUDES = $(TARGET)/include/julia_init.h $(TARGET)/include/mylib.h
 MYLIB_PATH := $(TARGET)/lib/libmylib.$(DLEXT)
 
+DEPS_build_library := src/MyLib.jl
+DEPS_build_library += build/build.jl
+DEPS_build_library += build/generate_precompile.jl build/additional_precompile.jl
+DEPS_build_library += build/mylib.h
+DEPS_build_library += build/Project.toml build/Manifest.toml
+
 .PHONY: build-library
-build-library: build/build.jl src/MyLib.jl
+build-library: MyLibCompiled/lib/libmylib.dylib
+
+MyLibCompiled/lib/libmylib.dylib: $(DEPS_build_library)
 	$(JULIA) --startup-file=no --project=. -e 'import Pkg; Pkg.instantiate(); Pkg.precompile()'
 	$(JULIA) --startup-file=no --project=build -e 'import Pkg; Pkg.instantiate(); Pkg.precompile()'
 	$(JULIA) --startup-file=no --project=build -e 'include("build/build.jl")'
 
 INCLUDE_DIR = $(TARGET)/include
 
 .PHONY: build-executable
-build-executable:
+build-executable: my_application.out
+
+my_application.out: MyLibCompiled/lib/libmylib.dylib
 	$(GCC) my_application.c -o my_application.out -I$(INCLUDE_DIR) -L$(TARGET)/lib -ljulia -lmylib
 
 .PHONY: clean

examples/MyLib/runme.bash

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -euf -o pipefail
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    export DYLD_FALLBACK_LIBRARY_PATH="./MyLibCompiled/lib/:./MyLibCompiled/lib/julia"
+else
+    export LD_LIBRARY_PATH="./MyLibCompiled/lib/"
+fi
+
+./my_application.out "$@"

test/runtests.jl

@@ -277,7 +277,7 @@ end
                 cmd = `$(Base.julia_cmd()[1]) --project="./build" -e "$(code)"`
                 run(cmd)
 
-                
+
                 # We don't want to assume that the machine running the tests has `make` installed
                 # and available in the PATH. Therefore, we use the `GNUMake_jll.jl`` package.
                 my_run(`$(GNUMake_jll.make())`)
@@ -295,6 +295,11 @@ end
                 expected_str = "Incremented count: 4 (Cint)\nIncremented value: 4"
                 @test observed_str == expected_str
 
+                # Yes, we do have a convenience wrapper script at `examples/MyLib/runme.bash`
+                # However, for the PackageCompiler test suite, we don't want to make any assumptions
+                # about Bash being available on the machine that's running the tests.
+                # So instead, we manaully run the `./my_application.out` executable ourselves.
+
                 # Finally, exercise a few more `Makefile` targets, to make sure that they
                 # don't bitrot.
                 my_run(`$(GNUMake_jll.make()) all`)