Fix the build configuration

The build doesn't work due to unresolved calls from libblastrampoline_jll

Author: timholy

.gitignore

@@ -4,3 +4,6 @@
 /Manifest.toml
 /docs/Manifest.toml
 /docs/build/
+language_wrappers/*.so
+language_wrappers/*.dll
+language_wrappers/*.dylib

language_wrappers/Makefile

@@ -1,21 +1,17 @@
 # This Makefile template requires the following variables to be set
 # in the environment or on the command-line:
 #   JULIA: path to julia[.exe] executable
-#   BIN:   binary build directory
 
 ifndef JULIA
-  $(error "Please pass JULIA=[path of target julia binary], or set as environment variable!")
-endif
-ifndef BIN
-  $(error "Please pass BIN=[path of build directory], or set as environment variable!")
+  $(error "Please pass JULIA=[path of Julia binary], or set as environment variable!")
 endif
 
 #=============================================================================
 # location of test source
 SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 PKGDIR := $(dir $(SRCDIR))
-JULIAHOME := $(abspath $(JULIA)/../..)
-BUILDSCRIPT := $(BIN)/../share/julia/juliac-buildscript.jl
+JULIAHOME := $(abspath $(subst bin,,$(dir $(JULIA))))
+BUILDSCRIPT := $(JULIAHOME)/share/julia/juliac.jl
 # include $(JULIAHOME)/Make.inc
 
 # FIXME
@@ -34,14 +30,14 @@ LDFLAGS_ADD = -lm $(shell $(JULIA_CONFIG) --ldflags --ldlibs) -ljulia-internal
 
 release: NMFMerge-jl.$(SHLIB_EXT)
 
-NMFMerge-jl.$(SHLIB_EXT): $(PKGDIR)/src/NMFMerge.jl $(BUILDSCRIPT)
-	$(JULIA) -t 1 -J $(BIN)/../lib/julia/sys.$(SHLIB_EXT) --project --startup-file=no --history-file=no --output-incremental=no --strip-ir --strip-metadata --experimental --trim $(BUILDSCRIPT) $(SRCDIR)/lib.jl --output-lib NMFMerge-jl.so
+NMFMerge-jl.$(SHLIB_EXT): $(PKGDIR)/src/NMFMerge.jl $(SRCDIR)/lib.jl $(BUILDSCRIPT)
+	$(JULIA) -t 1 -J $(dir $(JULIA))/../lib/julia/sys.$(SHLIB_EXT) --project --startup-file=no --history-file=no --output-incremental=no --strip-ir --strip-metadata $(BUILDSCRIPT) --experimental --trim $(SRCDIR)/lib.jl --output-lib $(SRCDIR)/NMFMerge-jl.$(SHLIB_EXT)
 
 check: hello$(EXE) basic_jll$(EXE)   # FIXME
 	$(JULIA) --depwarn=error $(SRCDIR)/../runtests.jl $(SRCDIR)/trimming
 
-clean:  # FIXME
-	-rm -f hello$(EXE) basic_jll$(EXE) init.o hello.o basic_jll.o
+clean:
+	-rm -f $(SRCDIR)/NMFMerge-jl.$(SHLIB_EXT)
 
 .PHONY: release clean check
 

language_wrappers/lib.jl

@@ -2,17 +2,11 @@ module NMFMergeLib
 
 using NMFMerge
 
-struct ReturnValue
-    niters::Int32
-    converged::Bool
-    objvalue::Float64
-end
-
-Base.@ccallable function nmfmerge_inplace(Wout::Matrix{Float64}, Hout::Matrix{Float64}, X::Matrix{Float64}, ncomponents::Int32, tol::Float64, maxiter::Int32)::ReturnValue
+Base.@ccallable function nmfmerge_inplace(Wout::Matrix{Float64}, Hout::Matrix{Float64}, X::Matrix{Float64}, ncomponents::Int32, tol::Float64, maxiter::Int32)::Bool
     result = nmfmerge(X, ncomponents; tol_final=tol, maxiter)
     Wout .= result.W
     Hout .= result.H
-    return ReturnValue(result.niters, result.converged, result.objvalue)
+    return result.converged
 end
 
 end