rapidyaml: Makefile major refactoring

ingydotnet · ingydotnet · commit 54b6993b788e · 2025-03-23T22:17:55.000-07:00
diff --git a/common/binding.mk b/common/binding.mk
@@ -1,3 +1,4 @@
+include $(COMMON)/vars-rapidyaml.mk
 include $(COMMON)/vars-libys.mk
 
 test:: $(LIBYS_SO_FQNP)
diff --git a/common/vars-core.mk b/common/vars-core.mk
@@ -1,6 +1,8 @@
+include $(COMMON)/vars-rapidyaml.mk
+
 CORE_DIR := $(ROOT)/core
 CORE_JAR := $(CORE_DIR)/target/core-$(YAMLSCRIPT_VERSION)-standalone.jar
-CORE_DEPS := $(LEIN)
+CORE_DEPS := $(LEIN) $(RAPIDYAML_INSTALLED)
 
 CORE_INSTALLED := \
   $(MAVEN_REPOSITORY)/yamlscript/core/$(YAMLSCRIPT_VERSION)
diff --git a/common/vars-rapidyaml.mk b/common/vars-rapidyaml.mk
@@ -0,0 +1,26 @@
+RAPIDYAML_DIR := $(ROOT)/rapidyaml
+NATIVE_DIR := $(RAPIDYAML_DIR)/native
+
+export LD_LIBRARY_PATH := $(NATIVE_DIR):$(LD_LIBRARY_PATH)
+export $(DY)LD_LIBRARY_PATH := $(LD_LIBRARY_PATH)
+
+RAPIDYAML_VERSION := 0.8.0
+RAPIDYAML_TAG ?= d3132a25ec21c65e27ff46ab8c3d61c72a321302
+RAPIDYAML_REPO := https://github.com/biojppm/rapidyaml
+RAPIDYAML_BUILD_TYPE ?= Release
+RAPIDYAML_DBG ?= 0
+RAPIDYAML_TIMED ?= 1
+RAPIDYAML_JAVA := \
+  $(RAPIDYAML_DIR)/src/main/java/org/rapidyaml/Rapidyaml.java \
+  $(RAPIDYAML_DIR)/src/main/java/org/rapidyaml/NativeLibLoader.java \
+  $(RAPIDYAML_DIR)/src/main/java/org/rapidyaml/Evt.java \
+  $(RAPIDYAML_DIR)/src/main/java/org/rapidyaml/YamlParseErrorException.java
+RAPIDYAML_JNI_H := $(NATIVE_DIR)/org_rapidyaml_Rapidyaml.h
+RAPIDYAML_SO_NAME := librapidyaml.$(RAPIDYAML_VERSION).$(SO)
+RAPIDYAML_SO := $(NATIVE_DIR)/$(RAPIDYAML_SO_NAME)
+RAPIDYAML_LIB := $(NATIVE_DIR)/librapidyaml.$(DOTLIB)
+RAPIDYAML_JAR := $(RAPIDYAML_DIR)/target/rapidyaml-$(RAPIDYAML_VERSION).jar
+RAPIDYAML_INSTALLED := \
+  $(MAVEN_REPOSITORY)/org/rapidyaml/rapidyaml/$(RAPIDYAML_VERSION)
+RAPIDYAML_INSTALLED := \
+  $(RAPIDYAML_INSTALLED)/rapidyaml-$(RAPIDYAML_VERSION).jar
diff --git a/common/vars.mk b/common/vars.mk
@@ -216,34 +216,6 @@ RELEASE_LYS_NAME := libyamlscript-$(YS_VERSION)-$(GRAALVM_ARCH)
 RELEASE_LYS_TAR := $(RELEASE_LYS_NAME).tar.xz
 
 
-#------------------------------------------------------------------------------
-# RapidYAML variables:
-#------------------------------------------------------------------------------
-RAPIDYAML := $(ROOT)/rapidyaml
-
-RAPIDYAML_VERSION := 0.8.0
-#RAPIDYAML_TAG ?= v$(RAPIDYAML_VERSION)
-RAPIDYAML_TAG ?= d3132a25ec21c65e27ff46ab8c3d61c72a321302
-RAPIDYAML_REPO := https://github.com/biojppm/rapidyaml
-RAPIDYAML_BUILD_TYPE ?= Release
-RAPIDYAML_DBG ?= 0
-RAPIDYAML_TIMED ?= 1
-RAPIDYAML_JAVA := \
-  $(ROOT)/rapidyaml/src/main/java/org/rapidyaml/Rapidyaml.java \
-  $(ROOT)/rapidyaml/src/main/java/org/rapidyaml/NativeLibLoader.java \
-  $(ROOT)/rapidyaml/src/main/java/org/rapidyaml/Evt.java \
-  $(ROOT)/rapidyaml/src/main/java/org/rapidyaml/YamlParseErrorException.java
-RAPIDYAML_JNI_H := $(ROOT)/rapidyaml/native/org_rapidyaml_Rapidyaml.h
-RAPIDYAML_SO_NAME := librapidyaml.$(RAPIDYAML_VERSION).$(SO)
-RAPIDYAML_SO := $(ROOT)/rapidyaml/native/$(RAPIDYAML_SO_NAME)
-RAPIDYAML_LIB := $(ROOT)/rapidyaml/native/librapidyaml.$(DOTLIB)
-RAPIDYAML_JAR := $(ROOT)/rapidyaml/target/rapidyaml-$(RAPIDYAML_VERSION).jar
-RAPIDYAML_INSTALLED_DIR := \
-  $(MAVEN_REPOSITORY)/org/rapidyaml/rapidyaml/$(RAPIDYAML_VERSION)
-RAPIDYAML_INSTALLED := \
-  $(RAPIDYAML_INSTALLED_DIR)/rapidyaml-$(RAPIDYAML_VERSION).jar
-
-
 #------------------------------------------------------------------------------
 # Programs
 #------------------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
@@ -2,25 +2,30 @@ include ../common/base.mk
 include $(COMMON)/java.mk
 include $(COMMON)/clojure.mk
 include $(COMMON)/vars-core.mk
+include $(COMMON)/vars-rapidyaml.mk
 
 export PATH := $(ROOT)/core/bin:$(PATH)
 
 #------------------------------------------------------------------------------
-build:: $(RAPIDYAML_SO) $(RAPIDYAML_INSTALLED)
 
 test:: $(CORE_DEPS)
 	$(LEIN) $@
 
 install: $(CORE_INSTALLED)
 
-$(CORE_INSTALLED): $(CORE_JAR)
+repl-deps:: $(RAPIDYAML_INSTALLED)
+
+$(CORE_INSTALLED): $(CORE_JAR) $(RAPIDYAML_INSTALLED)
 	$(LEIN) install
 	touch $@
 
 $(CORE_JAR): $(CORE_DEPS)
 	$(LEIN) uberjar
 	touch $@
 
+$(RAPIDYAML_INSTALLED):
+	$(MAKE) -C $(RAPIDYAML_DIR) $@
+
 clean::
 	$(RM) pom.xml
 	$(RM) -r target/
diff --git a/libyamlscript/Makefile b/libyamlscript/Makefile
@@ -8,11 +8,7 @@ include $(COMMON)/vars-libys.mk
 #------------------------------------------------------------------------------
 build:: $(LIBYS_DEPS)
 
-<<<<<<< HEAD
 # jar: $(LIBYS_JAR_PATH)
-=======
-jar: $(LIBYAMLSCRIPT_JAR_PATH) $(RAPIDYAML_INSTALLED)
->>>>>>> 8a8f78d0 (core: Add rapidyaml parser support)
 
 install:: $(LIBYS_DEPS)
 	mkdir -p $(PREFIX)/include/
diff --git a/mvp/Makefile b/mvp/Makefile
diff --git a/mvp/pom.xml b/mvp/pom.xml
diff --git a/mvp/src/main/java/com/example/App.java b/mvp/src/main/java/com/example/App.java
diff --git a/mvp/src/test/java/com/example/AppTest.java b/mvp/src/test/java/com/example/AppTest.java
diff --git a/rapidyaml/Makefile b/rapidyaml/Makefile
@@ -1,10 +1,11 @@
 include ../common/base.mk
 include $(COMMON)/clojure.mk
 include $(COMMON)/java.mk
+include $(COMMON)/vars-rapidyaml.mk
 
 RAPIDYAML_CLASS := $(RAPIDYAML_JAVA:.java=.class)
 RAPIDYAML_CLASSES := \
-  $(RAPIDYAML_CLASS:$(RAPIDYAML)/src/main/java/%=-C src/main/java %)
+  $(RAPIDYAML_CLASS:$(ROOT)/rapidyaml/src/main/java/%=-C src/main/java %)
 
 
 #------------------------------------------------------------------------------
@@ -18,15 +19,15 @@ jar: $(RAPIDYAML_JAR)
 jar-test: $(RAPIDYAML_JAR)
 	java -jar $<
 
-install:: $(RAPIDYAML_INSTALLED)
+# install:: $(RAPIDYAML_INSTALLED)
 
 test:: build $(JAVA_INSTALLED)
 	$(MAKE) -C native $@
-	YS_RAPIDYAML_MAVEN_TEST=1 $(MVN) $@
+	YS_TESTING=1 $(MVN) $@
 
 test-x: build $(JAVA_INSTALLED)
 	$(MAKE) -C native test
-	YS_RAPIDYAML_MAVEN_TEST=1 $(MVN) -X -e test
+	YS_TESTING=1 $(MVN) -X -e test
 
 clean::
 	$(RM) $(RAPIDYAML_CLASS) $(RAPIDYAML_SO) $(RAPIDYAML_LIB)
@@ -52,16 +53,16 @@ $(RAPIDYAML_LIB): $(RAPIDYAML_JNI_H)
 	$(MAKE) -C native $@
 
 $(RAPIDYAML_INSTALLED): $(RAPIDYAML_JAR)
-ifdef YS_MAVEN_TEST
-	YS_RAPIDYAML_MAVEN_TEST=1 $(MVN) install
-else
+ifdef YS_MAVEN_TEST_SKIP
 	$(MVN) install -Dmaven.test.skip
+else
+	YS_TESTING=1 $(MVN) install
 endif
 	touch $@
 
 $(RAPIDYAML_JAR): $(RAPIDYAML_CLASS) $(RAPIDYAML_SO)
 	$(JAR) -cf $@ $(RAPIDYAML_CLASSES)
-	$(JAR) -uf $@ -C $(RAPIDYAML)/native/ $(RAPIDYAML_SO_NAME)
+	$(JAR) -uf $@ -C $(ROOT)/rapidyaml/native/ $(RAPIDYAML_SO_NAME)
 	$(JAR) -umf manifest.txt $@
 
 $(RAPIDYAML_CLASS): $(RAPIDYAML_JAVA) $(JAVA_INSTALLED)
diff --git a/rapidyaml/native/Makefile b/rapidyaml/native/Makefile
@@ -2,6 +2,7 @@ include ../../common/base.mk
 include $(COMMON)/clojure.mk
 include $(COMMON)/java.mk
 include $(COMMON)/python.mk
+include $(COMMON)/vars-rapidyaml.mk
 
 # TODO change to static library!
 # https://www.graalvm.org/latest/reference-manual/native-image/guides/build-static-executables/
diff --git a/rapidyaml/src/main/java/org/rapidyaml/Rapidyaml.java b/rapidyaml/src/main/java/org/rapidyaml/Rapidyaml.java
@@ -45,7 +45,7 @@ public static void main(
     //------------------------
 
     public Rapidyaml() throws Exception, IOException {
-        if (System.getenv("YS_RAPIDYAML_MAVEN_TEST") != null)
+        if (System.getenv("YS_TESTING") != null)
             System.loadLibrary(RAPIDYAML_NAME);
         else
             NativeLibLoader.loadLibraryFromResource(RAPIDYAML_LIBNAME);
diff --git a/ys/Makefile b/ys/Makefile
@@ -9,27 +9,6 @@ BPAN_REPO_URL := https://github.com/bpan-org/bpan
 
 test := test/
 
-YS_BUILD_DEPS := \
-  $(YAMLSCRIPT_CLI_BIN) \
-  $(YAMLSCRIPT_CLI_BIN_BASH) \
-  $(COMMON/base.mk) \
-  $(COMMON/clojure.mk) \
-  $(COMMON/docker.mk) \
-  $(COMMON/native.mk) \
-  $(lastword $(MAKEFILE_LIST)) \
-
-ifdef YS_NATIVE_BUILD_STATIC
-ifeq (true,$(IS_LINUX))
-ifeq (true,$(IS_INTEL))
-YS_BUILD_DEPS := $(MUSL_GCC) $(YS_BUILD_DEPS)
-NATIVE_OPTS += \
-  -H:CCompilerOption=-Wl,-z,stack-size=2097152 \
-  --static \
-  --libc=musl
-endif
-endif
-endif
-
 
 #------------------------------------------------------------------------------
 build:: $(CLI_DEPS)
@@ -44,12 +23,7 @@ install: $(CLI_DEPS)
 	install -m 755 $(CLI_BIN_BASH) \
 	  $(PREFIX)/bin/
 
-<<<<<<< HEAD
 # jar: $(CLI_JAR)
-=======
-jar: $(YAMLSCRIPT_CLI_JAR_PATH)
-	@$(MAKE) -s -C $(RAPIDYAML) $(RAPIDYAML_INSTALLED)
->>>>>>> a27837f5 (rapidyaml: Working with native-image)
 
 test: test-run
 
@@ -96,6 +70,8 @@ $(CLI_BIN_BASH): $(CLI_BIN_BASH_SRC)
 
 $(CLI_JAR): $(CLI_JAR_DEPS)
 	$(LEIN) uberjar
+	jar -uf $@ \
+	  -C $(RAPIDYAML_DIR)/native/ librapidyaml.0.8.0.so
 	touch $@
 
 $(CORE_INSTALLED):

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+include $(COMMON)/vars-rapidyaml.mk`
`1`	`2`	`include $(COMMON)/vars-libys.mk`
`2`	`3`
`3`	`4`	`test:: $(LIBYS_SO_FQNP)`