Build libyamlstar with gloat.mk

Author: ingydotnet

Makefile

@@ -2,8 +2,7 @@ M := .cache/makes
 $(shell [ -d $M ] || git clone -q https://github.com/makeplus/makes $M)
 include $M/init.mk
 include $M/gh.mk
-include $M/graalvm.mk
-include $M/lein.mk
+include $M/gloat.mk
 include $M/yamlscript.mk
 include $M/clean.mk
 include $M/shell.mk
@@ -54,10 +53,8 @@ ALL-TESTS := \
   $(BINDING-TESTS)
 
 
-build jar install::
-	$(MAKE) -C core $@ v=$v
-	$(MAKE) -C cli $@ v=$v
-	$(MAKE) -C libyamlstar $@ v=$v
+build install::
+	$(MAKE) -C libyamlstar $@
 
 test:: test-core
 

libyamlstar/Makefile

@@ -1,72 +1,43 @@
 include ../common/init.mk
-include $M/graalvm.mk
-include $M/lein.mk
+include $M/gloat.mk
 include ../common/common.mk
-include ../common/native.mk
 
 MAKES-CLEAN := \
-  target \
-  .lein-* \
-  src/libyamlstar/*.class \
-
-MAKES-REALCLEAN := \
   lib \
 
 # Library paths and names
-API-VERSION := 0
-
-# JAR files still use -SNAPSHOT (from project.clj)
-# but .so files use clean version
 LIB-DIR := lib
 LIB-NAME := $(LIB-DIR)/libyamlstar
 LIB-SO := $(LIB-NAME).$(SO)
-LIB-SO-VERSIONED := $(LIB-NAME).$(SO).$(LIBYAMLSTAR-VERSION)
-LIB-JAR := target/libyamlstar-$(LIBYAMLSTAR-VERSION)-SNAPSHOT-standalone.jar
+LIB-HEADER := $(LIB-NAME).h
 
-# Core dependency jar in local maven repository
-CORE-JAR := $(MAVEN-REPOSITORY)/yamlstar/core/$(LIBYAMLSTAR-VERSION)-SNAPSHOT/core-$(LIBYAMLSTAR-VERSION)-SNAPSHOT.jar
+CORE-YAMLSTAR := ../core/src/yamlstar
 
-# Header files generated by native-image --shared
-LIB-HEADERS := \
-  $(LIB-DIR)/graal_isolate.h \
-  $(LIB-NAME).h \
+# Clojure source files compiled by gloat (order matters for namespaces)
+GLOAT-SRCS := \
+  $(CORE-YAMLSTAR)/parser/prelude.clj \
+  $(CORE-YAMLSTAR)/parser/parser.clj \
+  $(CORE-YAMLSTAR)/parser/receiver.clj \
+  $(CORE-YAMLSTAR)/parser/grammar.clj \
+  $(CORE-YAMLSTAR)/parser.clj \
+  $(CORE-YAMLSTAR)/composer.clj \
+  $(CORE-YAMLSTAR)/resolver.clj \
+  $(CORE-YAMLSTAR)/constructor.clj \
+  $(CORE-YAMLSTAR)/core.clj \
+  src/libyamlstar.clj \
 
 
 build: $(LIB-SO)
 
 test:
 
-jar: $(LIB-JAR)
-
 install: $(LIB-SO)
-	mkdir -p $(PREFIX)/include/
-	install -m 644 $(LIB-HEADERS) $(PREFIX)/include/
 	mkdir -p $(PREFIX)/lib/
-	install -m 644 $(LIB-SO-VERSIONED) $(PREFIX)/lib/
-	ln -sf $(notdir $(LIB-SO-VERSIONED)) $(PREFIX)/lib/$(notdir $(LIB-SO))
-	ln -sf $(notdir $(LIB-SO-VERSIONED)) $(PREFIX)/lib/$(notdir $(LIB-SO)).$(API-VERSION)
+	install -m 644 $(LIB-SO) $(PREFIX)/lib/
+	install -m 644 $(LIB-HEADER) $(PREFIX)/include/ 2>/dev/null || true
 
-$(CORE-JAR):
-	$(MAKE) -C ../core install
-
-$(LIB-JAR): $(CORE-JAR) $(LEIN)
-	lein uberjar
-
-$(LIB-SO): $(LIB-JAR) $(REFLECTION-JSON) $(GRAALVM)
-	@echo "Building shared library..."
+$(LIB-SO): $(GLOAT-SRCS) | $(GLOAT-DIR)
+	@echo "Building shared library with gloat..."
 	mkdir -p $(LIB-DIR)
-	$(GRAALVM) \
-	  $(NATIVE-OPTS) \
-	  --shared \
-	  -jar $< \
-	  -o $(LIB-NAME)
-	mv $(LIB-SO) $(LIB-SO-VERSIONED)
-	ln -sf $(notdir $(LIB-SO-VERSIONED)) $(LIB-SO)
-	ln -sf $(notdir $(LIB-SO-VERSIONED)) $(LIB-SO).$(API-VERSION)
-	@echo "Shared library created at: $(LIB-SO)"
-	@echo "Headers: $(LIB-HEADERS)"
-
-# Declare that these files are created as side effects of building $(LIB-SO)
-$(LIB-SO-VERSIONED): $(LIB-SO)
-$(LIB-NAME).h: $(LIB-SO)
-$(LIB-DIR)/graal_isolate.h: $(LIB-SO)
+	env -u GOROOT $(GLOAT-BIN)/gloat $(GLOAT-SRCS) -o $@
+	@echo "Shared library created at: $@"