Updated build

sadko4u · sadko4u · commit 072f12e77991 · 2022-01-10T02:37:13.000+03:00
diff --git a/make/configure.mk b/make/configure.mk
@@ -27,6 +27,7 @@ LIBDIR                     := $(PREFIX)/lib
 BINDIR                     := $(PREFIX)/bin
 INCDIR                     := $(PREFIX)/include
 BASEDIR                    := $(CURDIR)
+ROOTDIR                    := $(CURDIR)
 BUILDDIR                   := $(BASEDIR)/.build
 TARGET_BUILDDIR            := $(BUILDDIR)/target
 HOST_BUILDDIR              := $(BUILDDIR)/host
@@ -50,8 +51,11 @@ include $(BASEDIR)/dependencies.mk
 include $(BASEDIR)/project.mk
 
 # Compute the full list of dependencies
-UNIQ_DEPENDENCIES          := $(call uniq, $(DEPENDENCIES) $(TEST_DEPENDENCIES))
-DEPENDENCIES                = $(UNIQ_DEPENDENCIES)
+MERGED_DEPENDENCIES        := \
+  $(DEPENDENCIES) \
+  $(TEST_DEPENDENCIES)
+UNIQ_MERGED_DEPENDENCIES   := $(call uniq, $(MERGED_DEPENDENCIES))
+DEPENDENCIES                = $(UNIQ_MERGED_DEPENDENCIES)
 
 # Determine versions
 ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
@@ -106,9 +110,9 @@ define optconfig =
   $(if $(HOST_$(name)_OBJ),,     $(eval HOST_$(name)_OBJ :=))
 endef
 
-define srcconfig =
+define _modconfig =
   $(eval name=$(1))
-  $(eval builtin=$(patsubst $(ARTIFACT_NAME),,$($(name)_NAME)))
+  $(eval builtin=$(2))
   
   $(if $($(name)_DESC),,         $(eval $(name)_DESC         := $($(name)_DESC)))
   $(if $($(name)_URL),,          $(eval $(name)_URL          := $($(name)_URL$(X_URL_SUFFIX))))
@@ -119,7 +123,7 @@ define srcconfig =
   $(if $($(name)_TEST),,         $(eval $(name)_TEST         := $($(name)_PATH)/test))
   $(if $($(name)_TESTING),,      $(eval $(name)_TESTING      := 0))
   $(if $($(name)_BIN),,          $(eval $(name)_BIN          := $(TARGET_BUILDDIR)/$($(name)_NAME)))
-  $(if $($(name)_CFLAGS),,       $(eval $(name)_CFLAGS       := "-I\"$($(name)_INC)\"" $(if $(builtin),"-D$(name)_BUILTIN")))
+  $(if $($(name)_CFLAGS),,       $(eval $(name)_CFLAGS       := "-I\"$($(name)_INC)\""$(if $(builtin)," -D$(name)_BUILTIN")))
   $(if $($(name)_LDLAGS),,       $(eval $(name)_LDFLAGS      :=))
   $(if $($(name)_OBJ),,          $(eval $(name)_OBJ          := "$($(name)_BIN)/$($(name)_NAME).o"))
   $(if $($(name)_OBJ_TEST),,     $(eval $(name)_OBJ_TEST     := "$($(name)_BIN)/$($(name)_NAME)-test.o"))
@@ -131,13 +135,24 @@ define srcconfig =
   $(if $(HOST_$(name)_TEST),,    $(eval HOST_$(name)_TEST    := $(HOST_$(name)_PATH)/test))
   $(if $(HOST_$(name)_TESTING),, $(eval HOST_$(name)_TESTING := 0))
   $(if $(HOST_$(name)_BIN),,     $(eval HOST_$(name)_BIN     := $(HOST_BUILDDIR)/$($(name)_NAME)))
-  $(if $(HOST_$(name)_CFLAGS),,  $(eval HOST_$(name)_CFLAGS  := "-I\"$(HOST_$(name)_INC)\"" $(if $(builtin),"-D$(name)_BUILTIN")))
+  $(if $(HOST_$(name)_CFLAGS),,  $(eval HOST_$(name)_CFLAGS  := "-I\"$(HOST_$(name)_INC)\""$(if $(builtin)," -D$(name)_BUILTIN")))
   $(if $(HOST_$(name)_LDLAGS),,  $(eval HOST_$(name)_LDFLAGS :=))
   $(if $(HOST_$(name)_OBJ),,     $(eval HOST_$(name)_OBJ     := "$(HOST_$(name)_BIN)/$($(name)_NAME).o"))
   $(if $(HOST_$(name)_OBJ_TEST),,$(eval HOST_$(name)_OBJ_TEST:= "$(HOST_$(name)_BIN)/$($(name)_NAME)-test.o"))
   $(if $(HOST_$(name)_MFLAGS),,  $(eval HOST_$(name)_MFLAGS  := $(if $(builtin),"-D$(name)_BUILTIN -fvisibility=hidden")))
 endef
 
+define srcconfig =
+  $(eval name=$(1))
+  $(eval builtin=$(patsubst $(ARTIFACT_NAME),,$($(name)_NAME)))
+  $(eval $(call _modconfig,$(name),$(builtin)))
+endef 
+
+define binconfig =
+  $(eval name=$(1))
+  $(eval $(call _modconfig,$(1),))
+endef
+
 define hdrconfig =
   $(eval name=$(1))
   $(eval builtin=$(patsubst $(ARTIFACT_NAME),,$($(name)_NAME)))
@@ -148,13 +163,13 @@ define hdrconfig =
   $(if $($(name)_PATH),,         $(eval $(name)_PATH         := $(MODULES)/$($(name)_NAME)))
   $(if $($(name)_INC),,          $(eval $(name)_INC          := $($(name)_PATH)/include))
   $(if $($(name)_TESTING),,      $(eval $(name)_TESTING      := 0))
-  $(if $($(name)_CFLAGS),,       $(eval $(name)_CFLAGS       := "-I\"$($(name)_INC)\"" $(if $(builtin),"-D$(name)_BUILTIN")))
+  $(if $($(name)_CFLAGS),,       $(eval $(name)_CFLAGS       := "-I\"$($(name)_INC)\""$(if $(builtin)," -D$(name)_BUILTIN")))
   $(if $($(name)_MFLAGS),,       $(eval $(name)_MFLAGS       := $(if $(builtin),"-D$(name)_BUILTIN -fvisibility=hidden")))
   
   $(if $(HOST_$(name)_PATH),,    $(eval HOST_$(name)_PATH    := $(MODULES)/$($(name)_NAME)))
   $(if $(HOST_$(name)_INC),,     $(eval HOST_$(name)_INC     := $(HOST_$(name)_PATH)/include))
   $(if $(HOST_$(name)_TESTING),, $(eval HOST_$(name)_TESTING := 0))
-  $(if $(HOST_$(name)_CFLAGS),,  $(eval HOST_$(name)_CFLAGS  := "-I\"$(HOST_$(name)_INC)\"" $(if $(builtin),"-D$(name)_BUILTIN")))
+  $(if $(HOST_$(name)_CFLAGS),,  $(eval HOST_$(name)_CFLAGS  := "-I\"$(HOST_$(name)_INC)\""$(if $(builtin)," -D$(name)_BUILTIN")))
   $(if $(HOST_$(name)_MFLAGS),,  $(eval HOST_$(name)_MFLAGS  := $(if $(builtin),"-D$(name)_BUILTIN -fvisibility=hidden")))
 endef
 
@@ -165,6 +180,7 @@ define vardef =
   $(if $(findstring src,$($(name)_TYPE)), $(eval $(call srcconfig, $(name))))
   $(if $(findstring hdr,$($(name)_TYPE)), $(eval $(call hdrconfig, $(name))))
   $(if $(findstring lib,$($(name)_TYPE)), $(eval $(call libconfig, $(name))))
+  $(if $(findstring bin,$($(name)_TYPE)), $(eval $(call binconfig, $(name))))
   $(if $(findstring opt,$($(name)_TYPE)), $(eval $(call optconfig, $(name))))
 endef
 
@@ -185,6 +201,7 @@ ifndef HOST_$(ARTIFACT_ID)_PATH
   HOST_$(ARTIFACT_ID)_PATH   := $(BASEDIR)
 endif
 
+ROOT_ARTIFACT_ID           := $(ARTIFACT_ID)
 $(ARTIFACT_ID)_TESTING      = $(TEST)
 $(ARTIFACT_ID)_TYPE        := src
 
@@ -257,11 +274,12 @@ help: | toolvars sysvars
 	echo "  <ARTIFACT>_SRC            path to source code files of the artifact"
 	echo "  <ARTIFACT>_TEST           location of test files of the artifact"
 	echo "  <ARTIFACT>_TYPE           artifact usage type"
-	echo "                            - src - use sources and headers from git"
-	echo "                            - hdr - use headers only from git"
-	echo "                            - pkg - use pkgconfig for configuration"
-	echo "                            - lib - use system headers and -l<libname> flags"
-	echo "                            - opt - use optional configuration"
+	echo "                            - bin  - binaries build from source code"
+	echo "                            - hdr  - use headers only from git"
+	echo "                            - lib  - use system headers and -l<libname> flags"
+	echo "                            - opt  - use optional configuration"
+	echo "                            - pkg  - use pkgconfig for configuration"
+	echo "                            - src  - use sources and headers from git"
 	echo "  <ARTIFACT>_URL            location of the artifact git repoisitory"
 	echo "  <ARTIFACT>_VERSION        version of the artifact used for building"
 	echo ""
diff --git a/make/functions.mk b/make/functions.mk
@@ -26,7 +26,7 @@ uniq                    = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(fir
 # Recursively lookup directory for specific file pattern
 # $(call rwildcard, <path>, <file-name-pattern>)
 # $(call rwildcard, main, *.cpp)
-rwildcard               = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
+rwildcard               = $(foreach d,$(wildcard $1/*),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
 
 # Fetch different flags from symbolic dependencies
 # $(call query, <field>, <list>)
@@ -42,3 +42,10 @@ dquery                  = $(foreach d,$(call uniq, $2),$(if $($(d)_$(strip $1)),
 # $(call cquery, <test-field>, <return-field>, <list>)
 # $(call cquery, OBJ_META, BIN, $(DEPENDENCIES))
 cquery                  = $(foreach d,$(call uniq, $3),$(if $($(d)_$(strip $1)),$($(d)_$(strip $2))))
+
+# Fetch different versions from version string
+# $(call vmajor, <version-string>)
+vmajor                  = $(shell echo "$(strip $1)" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-(.*))?/\1/')
+vminor                  = $(shell echo "$(strip $1)" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-(.*))?/\2/')
+vmicro                  = $(shell echo "$(strip $1)" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-(.*))?/\3/')
+vbranch                 = $(shell echo "$(strip $1)" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-(.*))?/\5/')
diff --git a/make/modules.mk b/make/modules.mk
@@ -32,16 +32,24 @@ ifeq ($(TREE),1)
 else
   -include $(CONFIG)
 endif
+
 include $(PROJECT)
 
-UNIQ_DEPENDENCIES       = $(call uniq,$(DEPENDENCIES) $(TEST_DEPENDENCIES))
-UNIQ_ALL_DEPENDENCIES  := $(call uniq,$(ALL_DEPENDENCIES))
+MERGED_DEPENDENCIES        := \
+  $(DEPENDENCIES) \
+  $(TEST_DEPENDENCIES)
+UNIQ_MERGED_DEPENDENCIES   := $(call uniq, $(MERGED_DEPENDENCIES))
+UNIQ_ALL_DEPENDENCIES      := $(call uniq, $(ALL_DEPENDENCIES) $(PLUGIN_DEPENDENCIES))
 
 # Find the proper branch of the GIT repository
 ifeq ($(TREE),1)
   MODULES                := $(BASEDIR)/modules
   GIT                    := git
   
+  $(foreach dep,$(UNIQ_ALL_DEPENDENCIES), \
+    $(eval $(dep)_URL=$($(dep)_URL_RO)) \
+  )
+  
   ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
     $(foreach dep, $(UNIQ_ALL_DEPENDENCIES), \
       $(eval $(dep)_BRANCH=devel) \
@@ -56,8 +64,8 @@ ifeq ($(TREE),1)
 endif
 
 # Form list of modules, exclude all modules that have 'system' version
-SRC_MODULES         = $(foreach dep, $(UNIQ_DEPENDENCIES), $(if $(findstring src,$($(dep)_TYPE)),$(dep)))
-HDR_MODULES         = $(foreach dep, $(UNIQ_DEPENDENCIES), $(if $(findstring hdr,$($(dep)_TYPE)),$(dep)))
+SRC_MODULES         = $(foreach dep, $(UNIQ_MERGED_DEPENDENCIES), $(if $(findstring src,$($(dep)_TYPE)),$(dep)))
+HDR_MODULES         = $(foreach dep, $(UNIQ_MERGED_DEPENDENCIES), $(if $(findstring hdr,$($(dep)_TYPE)),$(dep)))
 ALL_SRC_MODULES     = $(foreach dep, $(UNIQ_ALL_DEPENDENCIES), $(if $(findstring src,$($(dep)_TYPE)),$(dep)))
 ALL_HDR_MODULES     = $(foreach dep, $(UNIQ_ALL_DEPENDENCIES), $(if $(findstring hdr,$($(dep)_TYPE)),$(dep)))
 ALL_PATHS           = $(foreach dep, $(ALL_SRC_MODULES) $(ALL_HDR_MODULES), $($(dep)_PATH))
diff --git a/make/system.mk b/make/system.mk
@@ -207,6 +207,8 @@ TEST                       := 0
 
 # Set-up list of common variables
 COMMON_VARS = \
+    ROOTDIR \
+    ROOT_ARTIFACT_ID \
 	PLATFORM \
 	ARCHITECTURE \
 	ARCHITECTURE_CFLAGS \
@@ -233,6 +235,7 @@ sysvars:
 	echo "  ARCHITECTURE_CFLAGS       compiler flags to specify architecture"
 	echo "  BINDIR                    location of the binaries"
 	echo "  DEBUG                     build with debug options"
+	echo "  DEVEL                     build with modules checked out for read/write URL"
 	echo "  EXECUTABLE_EXT            file extension for executable files"
 	echo "  INCDIR                    location of the header files"
 	echo "  LIBDIR                    location of the library"
diff --git a/make/tools.mk b/make/tools.mk
@@ -112,6 +112,8 @@ CFLAGS             := \
   -fno-asynchronous-unwind-tables \
   -pipe \
   -Wall
+
+CDEFS              += -DLSP_INSTALL_PREFIX=\\\"$(PREFIX)\\\"
   
 CXXFLAGS           := \
   $(CXXFLAGS_EXT) \
@@ -124,14 +126,18 @@ CXXFLAGS           := \
   -pipe \
   -Wall
 
+CXXDEFS            += -DLSP_INSTALL_PREFIX=\\\"$(PREFIX)\\\"
+
 INCLUDE            :=
 LDFLAGS            := $(LDFLAGS_EXT) -r
 EXE_FLAGS          := $(EXE_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections
 SO_FLAGS           := $(SO_FLAGS_EXT) $(FLAG_RELRO) -Wl,--gc-sections -shared -Llibrary $(FLAG_STDLIB) -fPIC 
 
 # Define flags for host build
 HOST_CFLAGS        := $(CFLAGS)
+HOST_CDEFS         := $(CDEFS)
 HOST_CXXFLAGS      := $(CXXFLAGS)
+HOST_CXXDEFS       := $(CXXDEFS)
 HOST_LDFLAGS       := $(LDFLAGS)
 HOST_EXE_FLAGS     := $(EXE_FLAGS)
 HOST_SO_FLAGS      := $(SO_FLAGS)
@@ -140,10 +146,10 @@ HOST_SO_FLAGS      := $(SO_FLAGS)
 TOOL_VARS := \
   GIT INSTALL \
   PKG_CONFIG AS AR CC CXX LD \
-  CFLAGS CXXFLAGS LDFLAGS EXE_FLAGS SO_FLAGS \
+  CFLAGS CDEFS CXXFLAGS CXXDEFS LDFLAGS EXE_FLAGS SO_FLAGS \
   INCLUDE \
   HOST_PKG_CONFIG HOST_AS HOST_AR HOST_CC HOST_CXX HOST_LD \
-  HOST_CFLAGS HOST_CXXFLAGS HOST_LDFLAGS HOST_EXE_FLAGS HOST_SO_FLAGS \
+  HOST_CFLAGS HOST_CDEFS HOST_CXXFLAGS HOST_CXXDEFS HOST_LDFLAGS HOST_EXE_FLAGS HOST_SO_FLAGS \
   
 
 .PHONY: toolvars
@@ -152,17 +158,21 @@ toolvars:
 	echo "  AR                        Archiver tool for target build"
 	echo "  AS                        Assembler tool for target build"
 	echo "  CC                        C compiler execution command line for target build"
+	echo "  CDEFS                     C compiler build macro definitions for target build"
 	echo "  CFLAGS                    C compiler build flags for target build"
 	echo "  CXX                       C++ compiler execution command line for target build"
+	echo "  CXXDEFS                   C++ compiler build defiintions for target build"
 	echo "  CXXFLAGS                  C++ compiler build flags for target build"
 	echo "  EXE_FLAGS                 Flags to link executable files for target build"
 	echo "  GIT                       The name of the Git version control tool"
 	echo "  HOST_AR                   Archiver tool for host build"
 	echo "  HOST_AS                   Assembler tool for host build"
 	echo "  HOST_CC                   C compiler execution command line for host build"
-	echo "  HOST_CFLAGS               C compiler build flags for target build"
+	echo "  HOST_CDEFS                C compiler macro definitions for host build"
+	echo "  HOST_CFLAGS               C compiler build flags for host build"
 	echo "  HOST_CXX                  C++ compiler execution command line for target build"
-	echo "  HOST_CXXFLAGS             C++ compiler build flags for target build"
+	echo "  HOST_CXXDEFS              C++ compiler macro definitions for host build"
+	echo "  HOST_CXXFLAGS             C++ compiler build flags for host build"
 	echo "  HOST_EXE_FLAGS            Flags to link executable files for target build"
 	echo "  HOST_CXX                  C++ compiler execution command line for host build"
 	echo "  HOST_LD                   Linker execution command line for host build "
diff --git a/src/Makefile b/src/Makefile
@@ -22,10 +22,11 @@ ifneq ($(VERBOSE),1)
 endif
 
 BASEDIR                 = $(CURDIR)
-CONFIG                 := $(CURDIR)/.config.mk
+CONFIG                 := $(BASEDIR)/../.config.mk
+PROJECT                := $(BASEDIR)/../project.mk
 
 include $(CONFIG)
-include $(BASEDIR)/../project.mk
+include $(PROJECT)
 include $(BASEDIR)/../make/functions.mk
 
 ifeq ($(TEST),1)
@@ -65,12 +66,14 @@ ARTIFACT_TARGETS        = $(ARTIFACT_LIB) $(ARTIFACT_SLIB) $(ARTIFACT_PC)
 
 # Source code
 CXX_SRC_MAIN            = $(call rwildcard, main, *.cpp)
+CXX_SRC_EXPORT          = $(call rwildcard, export, *.cpp)
 CXX_SRC_TEST            = $(call rwildcard, test, *.cpp)
 CXX_SRC_NOTEST          =
 CXX_SRC_EXT             =
 CXX_SRC                 = $(CXX_SRC_MAIN) $(CXX_SRC_EXT)
 
 CXX_OBJ_MAIN            = $(patsubst %.cpp, $(ARTIFACT_BIN)/%.o, $(CXX_SRC_MAIN))
+CXX_OBJ_EXPORT          = $(patsubst %.cpp, $(ARTIFACT_BIN)/%.o, $(CXX_SRC_EXPORT))
 CXX_OBJ_TEST            = $(patsubst %.cpp, $(ARTIFACT_BIN)/%.o, $(CXX_SRC_TEST))
 CXX_OBJ_NOTEST          = $(patsubst %.cpp, $(ARTIFACT_BIN)/%.o, $(CXX_SRC_NOTEST))
 CXX_OBJ_EXT             = $(patsubst %.cpp, $(ARTIFACT_BIN)/%.o, $(CXX_SRC_EXT))
@@ -93,7 +96,7 @@ ifeq ($($(ARTIFACT_ID)_TESTING),1)
   ARTIFACT_TARGETS       += $(ARTIFACT_TEST_BIN)
 endif
 
-DEP_CXX                 = $(foreach src,$(CXX_SRC_MAIN) $(CXX_SRC_EXT) $(CXX_SRC_TEST),$(patsubst %.cpp,$(ARTIFACT_BIN)/%.d,$(src)))
+DEP_CXX                 = $(foreach src,$(CXX_SRC_MAIN) $(CXX_SRC_EXPORT) $(CXX_SRC_EXT) $(CXX_SRC_TEST),$(patsubst %.cpp,$(ARTIFACT_BIN)/%.d,$(src)))
 DEP_CXX_FILE            = $(patsubst $(ARTIFACT_BIN)/%.d,%.cpp,$(@))
 DEP_DEP_FILE            = $(patsubst $(ARTIFACT_BIN)/%.d,%.o,$(@))
 
@@ -127,7 +130,7 @@ $(ARTIFACT_DEPS):
 # Compilation
 compile: $(ARTIFACT_OBJ)
 
-$(CXX_OBJ_MAIN) $(CXX_OBJ_EXT) $(CXX_OBJ_TEST) $(CXX_OBJ_NOTEST):
+$(CXX_OBJ_MAIN) $(CXX_OBJ_EXPORT) $(CXX_OBJ_EXT) $(CXX_OBJ_TEST) $(CXX_OBJ_NOTEST):
 	echo "  $($(HOST)CXX)  [$(ARTIFACT_NAME)] $(CXX_FILE)"
 	mkdir -p $(dir $@)
 	$($(HOST)CXX) -o $(@) -c $(CXX_FILE) -fPIC $($(HOST)CXXFLAGS) $(ARTIFACT_MFLAGS) $($(HOST)EXT_FLAGS) $(INCLUDE) $(ARTIFACT_CFLAGS)
@@ -144,9 +147,9 @@ $(ARTIFACT_OBJ_TEST): $(CXX_OBJ_TEST)
 # Linking
 all: $(ARTIFACT_TARGETS)
 
-$(ARTIFACT_LIB): $(ARTIFACT_DEPS) $(ARTIFACT_OBJ) $(CXX_OBJ_NOTEST)
+$(ARTIFACT_LIB): $(ARTIFACT_DEPS) $(ARTIFACT_OBJ) $(CXX_OBJ_EXPORT) $(CXX_OBJ_NOTEST)
 	echo "  $($(HOST)CXX)  [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_LIB))"
-	$($(HOST)CXX) -o $(ARTIFACT_LIB) $(ARTIFACT_OBJFILES) $(CXX_OBJ_NOTEST) $($(HOST)SO_FLAGS) $(ARTIFACT_LDFLAGS)
+	$($(HOST)CXX) -o $(ARTIFACT_LIB) $(ARTIFACT_OBJFILES) $(CXX_OBJ_EXPORT) $(CXX_OBJ_NOTEST) $($(HOST)SO_FLAGS) $(ARTIFACT_LDFLAGS)
 	
 $(ARTIFACT_SLIB): $(ARTIFACT_DEPS) $(ARTIFACT_OBJ) $(CXX_OBJ_NOTEST)
 	echo "  $($(HOST)AR)   [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_SLIB))"
