]> gitweb.factorcode.org Git - factor.git/blobdiff - GNUmakefile
git: fix tests
[factor.git] / GNUmakefile
index a12916cf41db808af90a48d205d860f261bdcfa2..e382714fd6d51fd882feadb5795e901abf613176 100644 (file)
@@ -1,16 +1,26 @@
+# build-macosx-x86-64 or build
+BUILD_DIR ?= build
+
 ifdef CONFIG
-       VERSION = 0.99
+       VERSION = 0.100
        GIT_LABEL = $(shell echo `git describe --all`-`git rev-parse HEAD`)
        BUNDLE = Factor.app
        DEBUG ?= 0
        REPRODUCIBLE ?= 0
 
+       SHELL_CC = $(shell printenv CC)
+       ifeq ($(SHELL_CC),)
+               CC := $(shell which clang cc 2>/dev/null | head -n 1)
+       else
+               CC = $(SHELL_CC)
+       endif
+
        # gmake's default CXX is g++, we prefer c++
        SHELL_CXX = $(shell printenv CXX)
        ifeq ($(SHELL_CXX),)
-               CXX=c++
+               CXX := $(shell which clang++ c++ 2>/dev/null | head -n 1)
        else
-               CXX=$(SHELL_CXX)
+               CXX = $(SHELL_CXX)
        endif
 
        XCODE_PATH ?= /Applications/Xcode.app
@@ -19,6 +29,7 @@ ifdef CONFIG
        include $(CONFIG)
 
        CFLAGS += -Wall \
+               -Wextra \
                -pedantic \
                -DFACTOR_VERSION="$(VERSION)" \
                -DFACTOR_GIT_LABEL="$(GIT_LABEL)" \
@@ -26,10 +37,18 @@ ifdef CONFIG
 
        CXXFLAGS += -std=c++11
 
+       # SANITIZER=address ./build.sh compile
+       # address,thread,undefined,leak
+       ifdef SANITIZER
+               CFLAGS += -fsanitize=$(SANITIZER)
+               CXXFLAGS += -fsanitize=$(SANITIZER)
+       endif
+
        ifneq ($(DEBUG), 0)
                CFLAGS += -g -DFACTOR_DEBUG
        else
                CFLAGS += -O3
+               CFLAGS += $(CC_OPT)
        endif
 
        ifneq ($(REPRODUCIBLE), 0)
@@ -41,47 +60,47 @@ ifdef CONFIG
        CONSOLE_EXECUTABLE = factor$(EXE_SUFFIX)$(CONSOLE_EXTENSION)
 
        DLL_OBJS = $(PLAF_DLL_OBJS) \
-               vm/aging_collector.o \
-               vm/alien.o \
-               vm/arrays.o \
-               vm/bignum.o \
-               vm/byte_arrays.o \
-               vm/callbacks.o \
-               vm/callstack.o \
-               vm/code_blocks.o \
-               vm/code_heap.o \
-               vm/compaction.o \
-               vm/contexts.o \
-               vm/data_heap.o \
-               vm/data_heap_checker.o \
-               vm/debug.o \
-               vm/dispatch.o \
-               vm/entry_points.o \
-               vm/errors.o \
-               vm/factor.o \
-               vm/full_collector.o \
-               vm/gc.o \
-               vm/image.o \
-               vm/inline_cache.o \
-               vm/instruction_operands.o \
-               vm/io.o \
-               vm/jit.o \
-               vm/math.o \
-               vm/mvm.o \
-               vm/nursery_collector.o \
-               vm/object_start_map.o \
-               vm/objects.o \
-               vm/primitives.o \
-               vm/quotations.o \
-               vm/run.o \
-               vm/safepoints.o \
-               vm/sampling_profiler.o \
-               vm/strings.o \
-               vm/to_tenured_collector.o \
-               vm/tuples.o \
-               vm/utilities.o \
-               vm/vm.o \
-               vm/words.o
+               $(BUILD_DIR)/aging_collector.o \
+               $(BUILD_DIR)/alien.o \
+               $(BUILD_DIR)/arrays.o \
+               $(BUILD_DIR)/bignum.o \
+               $(BUILD_DIR)/byte_arrays.o \
+               $(BUILD_DIR)/callbacks.o \
+               $(BUILD_DIR)/callstack.o \
+               $(BUILD_DIR)/code_blocks.o \
+               $(BUILD_DIR)/code_heap.o \
+               $(BUILD_DIR)/compaction.o \
+               $(BUILD_DIR)/contexts.o \
+               $(BUILD_DIR)/data_heap.o \
+               $(BUILD_DIR)/data_heap_checker.o \
+               $(BUILD_DIR)/debug.o \
+               $(BUILD_DIR)/dispatch.o \
+               $(BUILD_DIR)/entry_points.o \
+               $(BUILD_DIR)/errors.o \
+               $(BUILD_DIR)/factor.o \
+               $(BUILD_DIR)/full_collector.o \
+               $(BUILD_DIR)/gc.o \
+               $(BUILD_DIR)/image.o \
+               $(BUILD_DIR)/inline_cache.o \
+               $(BUILD_DIR)/instruction_operands.o \
+               $(BUILD_DIR)/io.o \
+               $(BUILD_DIR)/jit.o \
+               $(BUILD_DIR)/math.o \
+               $(BUILD_DIR)/mvm.o \
+               $(BUILD_DIR)/nursery_collector.o \
+               $(BUILD_DIR)/object_start_map.o \
+               $(BUILD_DIR)/objects.o \
+               $(BUILD_DIR)/primitives.o \
+               $(BUILD_DIR)/quotations.o \
+               $(BUILD_DIR)/run.o \
+               $(BUILD_DIR)/safepoints.o \
+               $(BUILD_DIR)/sampling_profiler.o \
+               $(BUILD_DIR)/strings.o \
+               $(BUILD_DIR)/to_tenured_collector.o \
+               $(BUILD_DIR)/tuples.o \
+               $(BUILD_DIR)/utilities.o \
+               $(BUILD_DIR)/vm.o \
+               $(BUILD_DIR)/words.o
 
        MASTER_HEADERS = $(PLAF_MASTER_HEADERS) \
                vm/assert.hpp \
@@ -141,9 +160,11 @@ ifdef CONFIG
 
        FFI_TEST_LIBRARY = libfactor-ffi-test$(SHARED_DLL_EXTENSION)
 
-       TEST_OBJS = vm/ffi_test.o
+       TEST_OBJS = $(BUILD_DIR)/ffi_test.o
 endif
 
+# if CONFIG is not set, call build.sh and find a CONFIG
+# build.sh will call GNUMakefile again to start the build
 default:
        $(MAKE) `./build.sh make-target`
 
@@ -154,13 +175,14 @@ help:
        @echo "linux-x86-64"
        @echo "linux-ppc-32"
        @echo "linux-ppc-64"
+       @echo "linux-arm-32"
        @echo "linux-arm-64"
        @echo "freebsd-x86-32"
        @echo "freebsd-x86-64"
        @echo "macosx-x86-32"
        @echo "macosx-x86-64"
        @echo "macosx-x86-fat"
-       @echo "macosx-arm64"
+       @echo "macosx-arm-64"
        @echo "windows-x86-32"
        @echo "windows-x86-64"
        @echo ""
@@ -169,61 +191,63 @@ help:
        @echo "DEBUG=1  compile VM with debugging information"
        @echo "REPRODUCIBLE=1  compile VM without timestamp"
        @echo "SITE_CFLAGS=...  additional optimization flags"
+       @echo "LTO=1  compile VM with Link Time Optimization"
        @echo "X11=1  force link with X11 libraries instead of Cocoa (only on Mac OS X)"
 
 ALL = factor factor-ffi-test factor-lib
 
 freebsd-x86-32:
-       $(MAKE) $(ALL) CONFIG=vm/Config.freebsd.x86.32
+       $(MAKE) $(ALL) CONFIG=vm/Config.freebsd.x86.32 BUILD_DIR=build-freebsd-x86-32
 
 freebsd-x86-64:
-       $(MAKE) $(ALL) CONFIG=vm/Config.freebsd.x86.64
+       $(MAKE) $(ALL) CONFIG=vm/Config.freebsd.x86.64 BUILD_DIR=build-freebsd-x86-64
 
 macosx-x86-32:
-       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.x86.32
+       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.x86.32 BUILD_DIR=build-macosx-x86-32
 
 macosx-x86-64:
-       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.x86.64
+       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.x86.64 BUILD_DIR=build-macosx-x86-64
 
 macosx-x86-fat:
-       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.x86.fat
+       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.x86.fat BUILD_DIR=build-macosx-x86-fat
 
-macosx-arm64-64:
-       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.arm64
+macosx-arm-64:
+       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.arm.64 BUILD_DIR=build-macosx-arm-64
+
+linux-arm-32:
+       $(MAKE) $(ALL) CONFIG=vm/Config.linux.arm.32 BUILD_DIR=build-linux-arm-32
 
 linux-arm-64:
-       $(MAKE) $(ALL) CONFIG=vm/Config.linux.arm.64
+       $(MAKE) $(ALL) CONFIG=vm/Config.linux.arm.64 BUILD_DIR=build-linux-arm-64
 
 linux-x86-32:
-       $(MAKE) $(ALL) CONFIG=vm/Config.linux.x86.32
+       $(MAKE) $(ALL) CONFIG=vm/Config.linux.x86.32 BUILD_DIR=build-linux-x86-32
 
 linux-x86-64:
-       $(MAKE) $(ALL) CONFIG=vm/Config.linux.x86.64
+       $(MAKE) $(ALL) CONFIG=vm/Config.linux.x86.64 BUILD_DIR=build-linux-x86-64
 
 linux-ppc-32:
-       $(MAKE) $(ALL) CONFIG=vm/Config.linux.ppc.32
+       $(MAKE) $(ALL) CONFIG=vm/Config.linux.ppc.32 BUILD_DIR=build-linux-ppc-32
 
 linux-ppc-64:
-       $(MAKE) $(ALL) CONFIG=vm/Config.linux.ppc.64
-
-linux-arm:
-       $(MAKE) $(ALL) CONFIG=vm/Config.linux.arm
+       $(MAKE) $(ALL) CONFIG=vm/Config.linux.ppc.64 BUILD_DIR=build-linux-ppc-64
 
 windows-x86-32:
-       $(MAKE) $(ALL) CONFIG=vm/Config.windows.x86.32
-       $(MAKE) factor-console CONFIG=vm/Config.windows.x86.32
+       $(MAKE) $(ALL) CONFIG=vm/Config.windows.x86.32 BUILD_DIR=build-windows-x86-32
+       $(MAKE) factor-console CONFIG=vm/Config.windows.x86.32 BUILD_DIR=build-windows-x86-32
 
 windows-x86-64:
-       $(MAKE) $(ALL) CONFIG=vm/Config.windows.x86.64
-       $(MAKE) factor-console CONFIG=vm/Config.windows.x86.64
+       $(MAKE) $(ALL) CONFIG=vm/Config.windows.x86.64 BUILD_DIR=build-windows-x86-64
+       $(MAKE) factor-console CONFIG=vm/Config.windows.x86.64 BUILD_DIR=build-windows-x86-64
 
+# Actually build Factor
 ifdef CONFIG
 
 macosx.app: factor
        mkdir -p $(BUNDLE)/Contents/MacOS
        mkdir -p $(BUNDLE)/Contents/Frameworks
        mv $(EXECUTABLE) $(BUNDLE)/Contents/MacOS/factor
-       ln -s Factor.app/Contents/MacOS/factor ./factor
+       ln -s $(BUNDLE)/Contents/MacOS/factor ./factor
 
 $(ENGINE): $(DLL_OBJS)
        $(TOOLCHAIN_PREFIX)$(LINKER) $(ENGINE) $(DLL_OBJS)
@@ -240,25 +264,29 @@ factor-console: $(EXE_OBJS) $(DLL_OBJS)
 
 factor-ffi-test: $(FFI_TEST_LIBRARY)
 
-$(FFI_TEST_LIBRARY): vm/ffi_test.o
+$(BUILD_DIR):
+       @echo BUILD_DIR: $(BUILD_DIR)
+       @mkdir -p $(BUILD_DIR)
+
+$(FFI_TEST_LIBRARY): $(BUILD_DIR)/ffi_test.o | $(BUILD_DIR)
        $(TOOLCHAIN_PREFIX)$(CC) $(CFLAGS) $(FFI_TEST_CFLAGS) $(SHARED_FLAG) -o $(FFI_TEST_LIBRARY) $(TEST_OBJS)
 
 vm/resources.o:
-       $(TOOLCHAIN_PREFIX)$(WINDRES) vm/factor.rs vm/resources.o
+       $(TOOLCHAIN_PREFIX)$(WINDRES) --preprocessor=cat vm/factor.rs vm/resources.o
 
-vm/ffi_test.o: vm/ffi_test.c
+$(BUILD_DIR)/ffi_test.o: vm/ffi_test.c | $(BUILD_DIR)
        $(TOOLCHAIN_PREFIX)$(CC) -c $(CFLAGS) $(FFI_TEST_CFLAGS) -std=c99 -o $@ $<
 
-vm/master.hpp.gch: vm/master.hpp $(MASTER_HEADERS)
+$(BUILD_DIR)/master.hpp.gch: vm/master.hpp $(MASTER_HEADERS) | $(BUILD_DIR)
        $(TOOLCHAIN_PREFIX)$(CXX) -c -x c++-header $(CFLAGS) $(CXXFLAGS) -o $@ $<
 
-%.o: %.cpp vm/master.hpp.gch
+$(BUILD_DIR)/%.o: vm/%.cpp $(BUILD_DIR)/master.hpp.gch | $(BUILD_DIR)
        $(TOOLCHAIN_PREFIX)$(CXX) -c $(CFLAGS) $(CXXFLAGS) -o $@ $<
 
-%.o: %.S
+$(BUILD_DIR)/%.o: $(BUILD_DIR)/%.S | $(BUILD_DIR)
        $(TOOLCHAIN_PREFIX)$(CC) -c $(CFLAGS) $(CXXFLAGS) -o $@ $<
 
-%.o: %.mm vm/master.hpp.gch
+$(BUILD_DIR)/%.o: vm/%.mm $(BUILD_DIR)/master.hpp.gch | $(BUILD_DIR)
        $(TOOLCHAIN_PREFIX)$(CXX) -c $(CFLAGS) $(CXXFLAGS) -o $@ $<
 
 .SUFFIXES: .mm
@@ -266,8 +294,14 @@ vm/master.hpp.gch: vm/master.hpp $(MASTER_HEADERS)
 endif
 
 clean:
-       rm -f vm/*.gch
+       @echo make clean CONFIG: \`$(CONFIG)\`
+       @echo make clean BUILD_DIR: \`$(BUILD_DIR)\`
+       if [ -n "$(BUILD_DIR)" ] && [ "$(BUILD_DIR)" != "/" ]; then rm -f $(BUILD_DIR)/*.o; rm -f $(BUILD_DIR)/*.gch; fi
+       rm -f build/*.o
+       rm -f build/*.gch
        rm -f vm/*.o
+       rm -f vm/*.gch
+       rm -f factor
        rm -f factor.dll
        rm -f factor.lib
        rm -f factor.dll.lib
@@ -275,4 +309,5 @@ clean:
        rm -f libfactor-ffi-test.*
        rm -f Factor.app/Contents/Frameworks/libfactor.dylib
 
-.PHONY: factor factor-lib factor-console factor-ffi-test tags clean macosx.app
+.PHONY: factor factor-lib factor-console factor-ffi-test tags clean help macosx.app
+.PHONY: linux-x86-32 linux-x86-64 linux-ppc-32 linux-ppc-64 linux-arm-64 freebsd-x86-32 freebsd-x86-64 macosx-x86-32 macosx-x86-64 macosx-x86-fat macosx-arm64 windows-x86-32 windows-x86-64