kurt/helios/unified-make-file

.github/workflows/build.yml

@@ -79,10 +79,10 @@ jobs:
           name: helioscli-artifacts
           path: ./HeliosCLI
       - name: Set execute permissions for test script
-        run: chmod +x ./runtests.sh
+        run: chmod +x ./run_tests.sh
         working-directory: tests
       - name: Run general tests
-        run: ./runtests.sh
+        run: ./run_tests.sh
         working-directory: tests
 
   embedded:

.github/workflows/release.yml

@@ -37,10 +37,10 @@ jobs:
           name: helioscli-artifacts
           path: ./HeliosCLI
       - name: Set execute permissions for test script
-        run: chmod +x ./runtests.sh
+        run: chmod +x ./run_tests.sh
         working-directory: tests
       - name: Run general tests
-        run: ./runtests.sh
+        run: ./run_tests.sh
         working-directory: tests
 
   embedded:

HeliosCLI/Makefile

@@ -34,6 +34,14 @@ ifneq ($(INCLUDES),)
     CFLAGS+=$(INCLUDES)
 endif
 
+# Architecture passed from parent Makefile (default to x64 if run standalone)
+ARCH ?= x64
+
+# Build and Output directories relative to this Makefile
+BUILD_DIR = $(ARCH)
+OUTPUT_DIR = output
+FINAL_TARGET = $(OUTPUT_DIR)/helios_cli
+
 # local NONSTANDARD libraries to link with
 # these MUST be exact filenames, cannot be -l syntax
 # for example:
@@ -59,13 +67,19 @@ else
         $(shell find . -type f -name '*.cpp')
 endif
 
-# object files are source files with .c replaced with .o
-OBJS=\
-	$(SRC:.cpp=.o) \
+# Separate source files by directory
+HELIOS_SRC = $(shell find ../Helios -type f -name '*.cpp')
+LOCAL_SRC = $(shell find . -type f -name '*.cpp')
 
-# dependency files are source files with .c replaced with .d
-DFILES=\
-	$(SRC:.cpp=.d) \
+# Generate object file paths using BUILD_DIR
+HELIOS_OBJS = $(patsubst ../Helios/%.cpp,$(BUILD_DIR)/Helios/%.o,$(HELIOS_SRC))
+LOCAL_OBJS = $(patsubst ./%.cpp,$(BUILD_DIR)/%.o,$(LOCAL_SRC))
+OBJS = $(HELIOS_OBJS) $(LOCAL_OBJS)
+
+# dependency files
+HELIOS_DFILES = $(patsubst ../Helios/%.cpp,$(BUILD_DIR)/Helios/%.d,$(HELIOS_SRC))
+LOCAL_DFILES = $(patsubst ./%.cpp,$(BUILD_DIR)/%.d,$(LOCAL_SRC))
+DFILES = $(HELIOS_DFILES) $(LOCAL_DFILES)
 
 # target dependencies
 # this includes any script generated c/h files,
@@ -87,12 +101,18 @@ all: $(TARGETS)
 # unit test target
 tests: $(TESTS)
 
-# target for vortex lib
+# target for helios cli
 helios: compute_version $(DEPS)
-	$(CC) $(CFLAGS) $(DEPS) -o $@ $(LLIBS)
+	@mkdir -p $(OUTPUT_DIR)
+	$(CC) $(CFLAGS) $(OBJS) -o $(FINAL_TARGET) $(LLIBS)
 
-# catch-all make target to generate .o and .d files
-%.o: %.cpp
+# Rules for building object files
+$(BUILD_DIR)/Helios/%.o: ../Helios/%.cpp
+	@mkdir -p $(dir $@)
+	$(CC) $(CFLAGS) -MMD -c $< -o $@
+
+$(BUILD_DIR)/%.o: ./%.cpp
+	@mkdir -p $(dir $@)
 	$(CC) $(CFLAGS) -MMD -c $< -o $@
 
 # catch-all for static libraries in the form of:
@@ -107,7 +127,8 @@ FORCE:
 
 # generic clean target
 clean:
-	@$(RM) $(DFILES) $(OBJS) $(TARGETS) $(TESTS)
+	@$(RM) -rf $(BUILD_DIR) $(OUTPUT_DIR)
+	@$(RM) -f $(DFILES) $(OBJS) $(TESTS)
 
 compute_version:
 	$(eval LATEST_TAG ?= $(shell git fetch --depth=1 origin +refs/tags/*:refs/tags/* &> /dev/null && git tag --list | sort -V | tail -n1))
@@ -121,18 +142,43 @@ compute_version:
 	$(eval HELIOS_BUILD_NUMBER := $(if $(HELIOS_BUILD_NUMBER),$(HELIOS_BUILD_NUMBER),0))
 	$(eval HELIOS_VERSION_NUMBER := $(HELIOS_VERSION_MAJOR).$(HELIOS_VERSION_MINOR).$(HELIOS_BUILD_NUMBER))
 
+# generate bmps
+bmps:
+	./PatternGenerator/generate_bmps.sh -c
+
 # generate svg
 svgs: bmps
-	./generate_svgs.sh
+	./PatternGenerator/generate_svgs.sh
 
 # generate pngs
 pngs: bmps
-	./generate_pngs.sh
+	./PatternGenerator/generate_pngs.sh
 
-# generate pngs
-bmps:
-	./generate_bmps.sh -c
+# record tests
+record_tests: all
+	../tests/record_tests.sh
+
+# record test
+record_test: all
+	../tests/record_test.sh
+
+# run tests
+run_tests: all
+	../tests/run_tests.sh
+
+# create_tests
+create_tests: all
+	../tests/create_test.sh
+
+# export tests
+export_tests: all
+	../tests/export_tests.sh
+
+# import tests
+import_tests: all
+	../tests/import_tests.sh
 
+# clean storage
 clean_storage:
 	@echo "Cleaning Helios storage file..."
 	@$(RM) Helios.storage

HeliosEmbedded/Makefile

@@ -141,18 +141,33 @@ CFLAGS+=$(INCLUDES)
 ### SOURCE FILES ######
 #######################
 
+# Architecture passed from parent Makefile (default to avr if run standalone)
+ARCH ?= avr
+
+# Build and Output directories relative to this Makefile
+BUILD_DIR = $(ARCH)
+LOCAL_OUTPUT_DIR = output
+
 # Source files
 ifeq ($(OS),Windows_NT) # Windows
-SRCS = \
-       $(shell find ../Helios -maxdepth 1 -type f -name '\*.cpp') main.cpp
-else # linux
-SRCS = \
-       $(shell find ../Helios -maxdepth 1 -type f -name \*.cpp) main.cpp
+HELIOS_SRCS = \
+       $(shell find ../Helios -maxdepth 1 -type f -name '\*.cpp')
+LOCAL_SRCS = main.cpp
+else # linux/macos
+HELIOS_SRCS = \
+       $(shell find ../Helios -maxdepth 1 -type f -name \*.cpp)
+LOCAL_SRCS = main.cpp
 endif
 
-OBJS = $(SRCS:.cpp=.o)
+# Generate object file paths using BUILD_DIR
+HELIOS_OBJS = $(patsubst ../Helios/%.cpp,$(BUILD_DIR)/Helios/%.o,$(HELIOS_SRCS))
+LOCAL_OBJS = $(patsubst %.cpp,$(BUILD_DIR)/%.o,$(LOCAL_SRCS))
+OBJS = $(HELIOS_OBJS) $(LOCAL_OBJS)
 
-DFILES = $(SRCS:.cpp=.d)
+# Generate dependency file paths
+HELIOS_DFILES = $(patsubst ../Helios/%.cpp,$(BUILD_DIR)/Helios/%.d,$(HELIOS_SRCS))
+LOCAL_DFILES = $(patsubst %.cpp,$(BUILD_DIR)/%.d,$(LOCAL_SRCS))
+DFILES = $(HELIOS_DFILES) $(LOCAL_DFILES)
 
 #######################
 ### BUILD TARGETS #####
@@ -161,30 +176,50 @@ DFILES = $(SRCS:.cpp=.d)
 # Target name
 TARGET = helios
 
-all: compute_version $(TARGET).hex
+# Define final hex target (still goes to root output)
+ROOT_OUTPUT_DIR = ../output # This needs to stay for the root makefile to copy
+FINAL_HEX_TARGET = $(ROOT_OUTPUT_DIR)/helios_firmware.hex # Keep final target name
+
+# Define targets for intermediate files in local output
+LOCAL_ELF_TARGET = $(LOCAL_OUTPUT_DIR)/$(TARGET).elf
+LOCAL_BIN_TARGET = $(LOCAL_OUTPUT_DIR)/$(TARGET).bin
+LOCAL_EEP_TARGET = $(LOCAL_OUTPUT_DIR)/$(TARGET).eep
+LOCAL_LST_TARGET = $(LOCAL_OUTPUT_DIR)/$(TARGET).lst
+LOCAL_MAP_TARGET = $(LOCAL_OUTPUT_DIR)/$(TARGET).map
+
+all: compute_version $(FINAL_HEX_TARGET)
 	@echo Detected Operating System: $(OS)
-	$(OBJDUMP) --disassemble --source --line-numbers --demangle --section=.text $(TARGET).elf > $(TARGET).lst
-	$(NM) --numeric-sort --line-numbers --demangle --print-size --format=s $(TARGET).elf > $(TARGET).map
+	$(OBJDUMP) --disassemble --source --line-numbers --demangle --section=.text $(LOCAL_ELF_TARGET) > $(LOCAL_LST_TARGET)
+	$(NM) --numeric-sort --line-numbers --demangle --print-size --format=s $(LOCAL_ELF_TARGET) > $(LOCAL_MAP_TARGET)
 	chmod +x avrsize.sh
-	./avrsize.sh $(TARGET).elf
+	./avrsize.sh $(LOCAL_ELF_TARGET)
 	@echo "== Success building Helios v$(HELIOS_VERSION_NUMBER) =="
 
-$(TARGET).hex: $(TARGET).elf
-	$(OBJCOPY) -O binary -R .eeprom $(TARGET).elf $(TARGET).bin
-	$(OBJCOPY) -O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 $(TARGET).elf $(TARGET).eep
-	$(OBJCOPY) -O ihex -R .eeprom $< $@
+$(FINAL_HEX_TARGET): $(LOCAL_ELF_TARGET)
+	@mkdir -p $(dir $@)
+	@mkdir -p $(LOCAL_OUTPUT_DIR)
+	$(OBJCOPY) -O binary -R .eeprom $< $(LOCAL_BIN_TARGET)
+	$(OBJCOPY) -O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 $< $(LOCAL_EEP_TARGET)
+	$(OBJCOPY) -O ihex -R .eeprom $< ../output/helios_firmware.hex
+	@echo "Created final hex: ../output/helios_firmware.hex"
 
-$(TARGET).elf: compute_version $(OBJS)
+$(LOCAL_ELF_TARGET): compute_version $(OBJS)
+	@mkdir -p $(dir $@)
 	$(LD) $(LDFLAGS) $(OBJS) -o $@
 
-%.o: %.S
-	$(CC) $(ASMFLAGS) -c $< -o $@
+# Rules for building object files
+$(BUILD_DIR)/Helios/%.o: ../Helios/%.cpp
+	@mkdir -p $(dir $@)
+	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) -MM -MT "$@" -MF "$(BUILD_DIR)/Helios/$*.d" $<
 
-%.o: %.cpp
+$(BUILD_DIR)/%.o: %.cpp
+	@mkdir -p $(dir $@)
 	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) -MM -MT "$@" -MF "$(BUILD_DIR)/$*.d" $<
 
-upload: set_fuses $(TARGET).hex
-	$(AVRDUDE) $(AVRDUDE_FLAGS) -Uflash:w:$(TARGET).hex:i
+upload: set_fuses $(FINAL_HEX_TARGET)
+	$(AVRDUDE) $(AVRDUDE_FLAGS) -Uflash:w:$(FINAL_HEX_TARGET):i
 
 #######################
 ### LINUX SETUP #######
@@ -284,7 +319,11 @@ extract_hex: helios_firmware.hex
 #####################
 
 clean:
-	rm -f $(OBJS) $(TARGET).elf $(TARGET).hex $(DFILES) $(TARGET).bin $(TARGET).eep $(TARGET).lst $(TARGET).map
+	@echo "Cleaning up HeliosEmbedded..."
+	@$(RM) -rf $(BUILD_DIR) $(LOCAL_OUTPUT_DIR)
+	@$(RM) -f $(OBJS) $(DFILES) # Keep FINAL_HEX_TARGET out of here, root cleans it
+	@$(RM) -f *.d ../Helios/*.d
+	@echo "Cleaned HeliosEmbedded!"
 
 compute_version:
 	$(eval LATEST_TAG ?= $(shell git fetch --depth=1 origin +refs/tags/*:refs/tags/* &> /dev/null && git tag --list | sort -V | tail -n1))

HeliosLib/Makefile

@@ -66,25 +66,36 @@ LLIBS=\
 LIBS=\
 	$(LLIBS) \
 
+# Architecture passed from parent Makefile (default to x64 if run standalone)
+ARCH ?= x64
+
+# Build and Output directories relative to this Makefile
+BUILD_DIR = $(ARCH)
+OUTPUT_DIR = output
+FINAL_LIB_TARGET = $(OUTPUT_DIR)/helios_lib.a
+FINAL_WASM_TARGET = $(OUTPUT_DIR)/helios_wasm.js
+FINAL_WASM_BIN_TARGET = $(OUTPUT_DIR)/helios_wasm.wasm
+
 # source files
-# local source files first, other sources after
 ifeq ($(OS),Windows_NT)
-    SRC = $(shell find ../Helios/ -type f -name \\*.cpp) HeliosLib.cpp
+    HELIOS_SRC = $(shell find ../Helios/ -type f -name \\*.cpp)
+    LOCAL_SRC = HeliosLib.cpp
 else
-    SRC = $(shell find ../Helios/ -type f -name '*.cpp') HeliosLib.cpp
+    HELIOS_SRC = $(shell find ../Helios/ -type f -name '*.cpp')
+    LOCAL_SRC = HeliosLib.cpp
 endif
 
-# object files are source files with .c replaced with .o
-OBJS=\
-	$(SRC:.cpp=.o) \
+# Generate object file paths using BUILD_DIR
+HELIOS_OBJS = $(patsubst ../Helios/%.cpp,$(BUILD_DIR)/Helios/%.o,$(HELIOS_SRC))
+LOCAL_OBJS = $(patsubst %.cpp,$(BUILD_DIR)/%.o,$(LOCAL_SRC))
+OBJS = $(HELIOS_OBJS) $(LOCAL_OBJS)
 
-# dependency files are source files with .c replaced with .d
-DFILES=\
-	$(SRC:.cpp=.d) \
+# Generate dependency file paths
+HELIOS_DFILES = $(patsubst ../Helios/%.cpp,$(BUILD_DIR)/Helios/%.d,$(HELIOS_SRC))
+LOCAL_DFILES = $(patsubst %.cpp,$(BUILD_DIR)/%.d,$(LOCAL_SRC))
+DFILES = $(HELIOS_DFILES) $(LOCAL_DFILES)
 
 # target dependencies
-# this includes any script generated c/h files,
-# the $(LLIBS) list, and the $(OBJS) list
 DEPS=\
 	$(LLIBS) \
 	$(OBJS) \
@@ -94,10 +105,9 @@ TESTS=\
 
 # target files
 ifdef WASM
-TARGETS=HeliosLib.js \
-	helios.a
+TARGETS=$(FINAL_WASM_TARGET) $(FINAL_LIB_TARGET)
 else
-TARGETS=helios.a
+TARGETS=$(FINAL_LIB_TARGET)
 endif
 
 # Default target for 'make' command
@@ -108,25 +118,45 @@ tests: $(TESTS)
 
 # force sub-build of wasm
 wasm: FORCE
-	env WASM=1 $(MAKE)
+	@if command -v em++; then \
+		echo "WebAssembly compiler found, building WASM..."; \
+		env ARCH=wasm WASM=1 $(MAKE) $(FINAL_WASM_TARGET) $(FINAL_LIB_TARGET); \
+	else \
+		echo "WebAssembly compiler (em++) not found, skipping WASM build."; \
+		mkdir -p $(OUTPUT_DIR); \
+		touch $(FINAL_WASM_TARGET); \
+		touch $(FINAL_WASM_BIN_TARGET); \
+	fi
 
 # target for helios lib
-helios.a: compute_version $(DEPS)
+$(FINAL_LIB_TARGET): compute_version $(DEPS)
+	@mkdir -p $(dir $@)
 	$(AR) $@ $(DEPS)
+	@echo "Created $@"
 
-HeliosLib.js: compute_version $(DEPS)
+# target for HeliosLib.js
+$(FINAL_WASM_TARGET): compute_version $(DEPS)
+	@mkdir -p $(dir $@)
 	$(CC) $(LDFLAGS) $(DEPS) -o $@ $(LLIBS)
 
-# catch-all make target to generate .o and .d files
-%.o: %.cpp
+# Rules for building object files
+$(BUILD_DIR)/Helios/%.o: ../Helios/%.cpp
+	@mkdir -p $(dir $@)
+	$(CC) $(CFLAGS) -MMD -c $< -o $@
+
+$(BUILD_DIR)/%.o: %.cpp
+	@mkdir -p $(dir $@)
 	$(CC) $(CFLAGS) -MMD -c $< -o $@
 
-# Empty rule that forces %.a to run all the time
+# Empty rule that forces .a to run all the time
 FORCE:
 
 # generic clean target
 clean:
-	@$(RM) $(DFILES) $(OBJS) $(TARGETS) $(TESTS) HeliosLib.js HeliosLib.wasm
+	@echo "Cleaning up HeliosLib..."
+	@$(RM) -rf $(BUILD_DIR) $(OUTPUT_DIR)
+	@$(RM) -f $(DFILES) $(OBJS) $(TESTS) HeliosLib.js HeliosLib.wasm # Remove old possible output names
+	@echo "Cleaned HeliosLib!"
 
 compute_version:
 	$(eval LATEST_TAG ?= $(shell git fetch --depth=1 origin +refs/tags/*:refs/tags/* &> /dev/null && git tag --list | sort -V | tail -n1))