Cleanup build

Author: marcoroth

.github/workflows/build-gems.yml

@@ -62,28 +62,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Add LLVM apt Repo
-        run: |-
-          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-21 main"
-          sudo apt update
-
-      - name: Install APT dependencies
-        run: xargs sudo apt-get install -y --no-install-recommends < Aptfile
-
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          bundler-cache: false
-
-      - name: bundle install
-        run: bundle install
+          ruby-version: '3.4'
+          bundler-cache: true
 
       - name: Render Templates
         run: bundle exec rake templates
 
-      - name: Compile Herb
-        run: bundle exec rake make
+      - name: Vendor Prism
+        run: bundle exec rake prism:vendor
 
       - name: Build gem
         run: |
@@ -128,7 +117,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.4'
-          bundler-cache: false
+          bundler-cache: true
 
       - name: Download gem artifacts
         uses: actions/download-artifact@v4

.github/workflows/build.yml

@@ -38,14 +38,11 @@ jobs:
         with:
           bundler-cache: true
 
-      - name: bundle install
-        run: bundle install
-
       - name: Render Templates
         run: bundle exec rake templates
 
       - name: Compile Herb
-        run: bundle exec rake make
+        run: make
 
       - name: Compile Ruby extension
         run: bundle exec rake compile
@@ -63,7 +60,7 @@ jobs:
       #   run: bundle exec srb tc
 
       - name: Run C tests
-        run: ./run_herb_tests
+        run: make test && ./run_herb_tests
 
       - name: Run valgrind on examples/
         run: ./bin/valgrind_check_examples

.github/workflows/java.yml

@@ -36,12 +36,8 @@ jobs:
       - name: Compile Herb
         run: bundle exec rake make
 
-      - name: Build JNI library
-        run: make jni
-        working-directory: java
-
-      - name: Compile Java classes
-        run: make java
+      - name: Build JNI library and Java classes
+        run: make all
         working-directory: java
 
       - name: Run tests

.github/workflows/rust.yml

@@ -44,15 +44,16 @@ jobs:
         with:
           bundler-cache: true
 
-      - name: bundle install
-        run: bundle install
-
       - name: Render Templates
         run: bundle exec rake templates
 
       - name: Compile Herb
         run: bundle exec rake make
 
+      - name: Build Rust
+        run: make build
+        working-directory: rust
+
       - name: Check Rust formatting
         run: make format-check
         working-directory: rust
@@ -61,10 +62,6 @@ jobs:
         run: make lint
         working-directory: rust
 
-      - name: Build Rust
-        run: make build
-        working-directory: rust
-
       - name: Run Rust tests
         run: make test
         working-directory: rust

Makefile

@@ -9,8 +9,6 @@ extension_sources = $(wildcard ext/**/*.c)
 extension_headers = $(wildcard ext/**/*.h)
 extension_objects = $(extension_sources:.o)
 
-prism_objects = $(filter-out src/main.c, $(sources))
-
 project_files = $(sources) $(headers)
 extension_files = $(extension_sources) $(extension_headers)
 nodejs_extension_files = $(wildcard node/**/*.cpp) $(wildcard node/**/*.h) $(wildcard node/**/*.hpp)
@@ -30,12 +28,15 @@ $(shell mkdir -p $(build_dir))
 
 os := $(shell uname -s)
 
-prism_path = $(shell bundle show prism)
-prism_include = $(prism_path)/include
-prism_build = $(prism_path)/build
+prism_vendor_path = vendor/prism
+prism_include = $(prism_vendor_path)/include
+prism_src = $(prism_vendor_path)/src
+
+prism_sources = $(wildcard $(prism_src)/*.c) $(wildcard $(prism_src)/util/*.c)
+prism_objects = $(prism_sources:.c=.o)
+prism_static_lib = $(build_dir)/libprism.a
 
-prism_flags = -I$(prism_include)
-prism_ldflags = $(prism_build)/libprism.a
+prism_flags = -I$(prism_include) -I$(prism_src)
 
 # Enable strict warnings
 warning_flags = -Wall -Wextra -Werror -pedantic
@@ -60,7 +61,7 @@ shared_flags = $(production_flags) $(shared_library_flags) $(prism_flags)
 
 ifeq ($(os),Linux)
   test_cflags = $(test_flags) -I/usr/include/check
-  test_ldflags = -L/usr/lib/x86_64-linux-gnu -lcheck -lm -lsubunit $(prism_ldflags)
+  test_ldflags = -L/usr/lib/x86_64-linux-gnu -lcheck -lm -lsubunit
   cc = clang-21
   clang_format = clang-format-21
   clang_tidy = clang-tidy-21
@@ -69,7 +70,7 @@ endif
 ifeq ($(os),Darwin)
   brew_prefix := $(shell brew --prefix check)
   test_cflags = $(test_flags) -I$(brew_prefix)/include
-  test_ldflags = -L$(brew_prefix)/lib -lcheck -lm $(prism_ldflags)
+  test_ldflags = -L$(brew_prefix)/lib -lcheck -lm
   llvm_path = $(shell brew --prefix llvm@21)
   cc = $(llvm_path)/bin/clang
   clang_format = $(llvm_path)/bin/clang-format
@@ -78,30 +79,40 @@ endif
 
 all: templates prism $(exec) $(lib_name) $(static_lib_name) test wasm clangd_config
 
-$(exec): $(objects)
-	$(cc) $(objects) $(flags) $(ldflags) $(prism_ldflags) -o $(exec)
+$(exec): $(objects) $(prism_objects)
+	$(cc) $(objects) $(prism_objects) $(flags) $(ldflags) -o $(exec)
 
-$(lib_name): $(objects)
-	$(cc) -shared $(objects) $(shared_flags) $(ldflags) $(prism_ldflags) -o $(lib_name)
+$(lib_name): $(objects) $(prism_objects)
+	$(cc) -shared $(objects) $(prism_objects) $(shared_flags) $(ldflags) -o $(lib_name)
 	# cp $(lib_name) $(ruby_extension)
 
 $(static_lib_name): $(objects)
 	ar rcs $(static_lib_name) $(objects)
 
+$(prism_static_lib): $(prism_objects)
+	ar rcs $(prism_static_lib) $(prism_objects)
+
+prism_lib: prism $(prism_static_lib)
+
 src/%.o: src/%.c templates
 	$(cc) -c $(flags) -fPIC $< -o $@
 
+$(prism_src)/%.o: $(prism_src)/%.c prism
+	$(cc) -c $(flags) -fPIC $(prism_flags) $< -o $@
+
+$(prism_src)/util/%.o: $(prism_src)/util/%.c prism
+	$(cc) -c $(flags) -fPIC $(prism_flags) $< -o $@
+
 test/%.o: test/%.c templates
 	$(cc) -c $(test_cflags) $(test_flags) $(prism_flags) $< -o $@
 
-test: $(test_objects) $(non_main_objects)
-	$(cc) $(test_objects) $(non_main_objects) $(test_cflags) $(test_ldflags) -o $(test_exec)
+test: $(test_objects) $(non_main_objects) $(prism_objects)
+	$(cc) $(test_objects) $(non_main_objects) $(prism_objects) $(test_cflags) $(test_ldflags) -o $(test_exec)
 
 clean:
-	rm -f $(exec) $(test_exec) $(lib_name) $(shared_lib_name) $(ruby_extension)
-	rm -rf $(objects) $(test_objects) $(extension_objects) lib/herb/*.bundle tmp
-	rm -rf $(prism_path)
-	rake prism:clean
+	rm -f $(exec) $(test_exec) $(lib_name) $(shared_lib_name) $(prism_static_lib) $(ruby_extension)
+	rm -rf $(objects) $(test_objects) $(prism_objects) $(extension_objects) lib/herb/*.bundle tmp
+	bundle exec rake prism:clean
 
 bundle_install:
 	bundle install
@@ -110,8 +121,7 @@ templates: bundle_install
 	bundle exec rake templates
 
 prism: bundle_install
-	cd $(prism_path) && ruby templates/template.rb && make static && cd -
-	rake prism:vendor
+	bundle exec rake prism:vendor
 
 format:
 	$(clang_format) -i $(project_and_extension_files)

Rakefile

@@ -144,6 +144,11 @@ namespace :prism do
       exit 1
     end
 
+    puts "Generating Prism templates..."
+    Dir.chdir(prism_bundle_path) do
+      system("ruby templates/template.rb", exception: true)
+    end
+
     FileUtils.mkdir_p(prism_vendor_path)
 
     files = [

java/Makefile

@@ -24,16 +24,16 @@ endif
 
 BUILD_DIR = ../build
 SRC_DIR = ../src
-PRISM_PATH = $(shell cd .. && bundle show prism)
-PRISM_INCLUDE = $(PRISM_PATH)/include
-PRISM_BUILD = $(PRISM_PATH)/build
+PRISM_VENDOR_PATH = ../vendor/prism
+PRISM_INCLUDE = $(PRISM_VENDOR_PATH)/include
+PRISM_LIB = $(BUILD_DIR)/libprism.a
 
 JAVAC = $(JAVA_HOME)/bin/javac
 JAVA_CMD = $(JAVA_HOME)/bin/java
 CFLAGS = -std=c99 -Wall -Wextra -fPIC -O2
-INCLUDES = -I. -I$(SRC_DIR)/include -I$(PRISM_INCLUDE) $(JNI_INCLUDES)
+INCLUDES = -I. -I$(SRC_DIR)/include -I$(PRISM_INCLUDE) -I$(PRISM_VENDOR_PATH)/src $(JNI_INCLUDES)
 LDFLAGS = -shared
-LIBS = $(PRISM_BUILD)/libprism.a
+LIBS = $(PRISM_LIB)
 
 HERB_SOURCES = $(wildcard $(SRC_DIR)/*.c) $(wildcard $(SRC_DIR)/**/*.c)
 HERB_OBJECTS = $(filter-out $(SRC_DIR)/main.o, $(HERB_SOURCES:.c=.o))
@@ -48,13 +48,16 @@ JNI_LIB = $(BUILD_DIR)/$(JNI_LIB_PREFIX)herb_jni.$(JNI_LIB_EXT)
 JAVA_SOURCES = $(shell find org -name "*.java" 2>/dev/null)
 JAVA_TIMESTAMP = target/.java_compiled
 
-.PHONY: all clean java jni test
+.PHONY: all clean java jni test prism_lib templates
 
-all: templates jni java
+all: templates prism_lib jni java
 
 templates:
 	cd .. && bundle exec rake templates
 
+prism_lib:
+	cd .. && make prism_lib
+
 jni: $(JNI_LIB)
 
 $(JNI_LIB): $(JNI_OBJECTS) $(HERB_OBJECTS)
@@ -89,8 +92,9 @@ help:
 	@echo "Herb Java/JNI Build System"
 	@echo ""
 	@echo "Targets:"
-	@echo "  all        - Build everything (templates + JNI + Java)"
+	@echo "  all        - Build everything (templates + prism_lib + JNI + Java)"
 	@echo "  templates  - Generate code from ERB templates"
+	@echo "  prism_lib  - Build prism static library"
 	@echo "  jni        - Build JNI shared library"
 	@echo "  java       - Compile Java classes"
 	@echo "  cli        - Show CLI usage"

rust/Makefile

@@ -5,7 +5,7 @@ BIN_NAME = herb-rust
 BIN_PATH = $(BUILD_DIR)/debug/$(BIN_NAME)
 RELEASE_BIN_PATH = $(BUILD_DIR)/release/$(BIN_NAME)
 
-.PHONY: all build release clean test cli help templates format vendor
+.PHONY: all build release clean test cli help templates format vendor prism_lib
 
 all: templates build
 
@@ -44,16 +44,18 @@ clean:
 	cargo clean
 	@echo "Cleaned Rust build artifacts"
 
-vendor:
+prism_lib:
+	cd .. && make prism_lib
+
+vendor: prism_lib
 	@echo "Vendoring C sources into vendor/libherb..."
 	rm -rf vendor/
 	mkdir -p vendor/libherb/
 	mkdir -p vendor/prism/
 	cp -r ../src vendor/libherb/
 	@echo "Vendoring prism library..."
-	PRISM_PATH=$$(bundle show prism) && \
-	cp -r "$$PRISM_PATH/src" vendor/prism/ && \
-	cp -r "$$PRISM_PATH/include" vendor/prism/
+	cp -r ../vendor/prism/src vendor/prism/
+	cp -r ../vendor/prism/include vendor/prism/
 	@echo "Vendored C sources and prism successfully"
 
 help:
@@ -67,6 +69,7 @@ help:
 	@echo "  cli        - Show CLI usage"
 	@echo "  test       - Run Rust tests"
 	@echo "  format     - Format Rust code with rustfmt"
+	@echo "  prism_lib  - Build prism static library"
 	@echo "  vendor     - Vendor C sources into vendor/"
 	@echo "  clean      - Remove build artifacts"
 	@echo "  help       - Show this help"