Release 0.5.7

* Updated makefiles: added `make tree` target.

Author: sadko4u

CHANGELOG

@@ -2,6 +2,9 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 0.5.7 ===
+* Updated makefiles: added `make tree` target.
+
 === 0.5.6 ===
 * Added build of static library.
 * Source code now more properly references LGPL3+ license.

Makefile

@@ -39,7 +39,7 @@ include $(BASEDIR)/project.mk
 CHK_CONFIG                  = test -f "$(CONFIG)" || (echo "System not properly configured. Please launch 'make config' first" && exit 1)
 
 .DEFAULT_GOAL              := all
-.PHONY: all compile install uninstall depend clean
+.PHONY: all compile install uninstall depend clean chkconfig
 
 compile all install uninstall depend:
 	@$(CHK_CONFIG)
@@ -51,15 +51,22 @@ clean:
 	@echo "Clean OK"
 
 # Module-related tasks
-.PHONY: fetch prune
+.PHONY: fetch tree prune
 fetch:
-	@echo "Fetching source code dependencies"
+	@$(CHK_CONFIG)
+	@echo "Fetching desired source code dependencies"
 	@$(MAKE) -s -f "make/modules.mk" $(@) BASEDIR="$(BASEDIR)" CONFIG="$(CONFIG)"
 	@echo "Fetch OK"
+	
+tree:
+	@echo "Fetching all possible source code dependencies"
+	@$(MAKE) -s -f "make/modules.mk" $(@) BASEDIR="$(BASEDIR)" CONFIG="$(CONFIG)" TREE="1"
+	@echo "Fetch OK"
 
 prune: clean
 	@echo "Pruning the whole project tree"
 	@$(MAKE) -s -f "make/modules.mk" prune BASEDIR="$(BASEDIR)" CONFIG="$(CONFIG)"
+	@$(MAKE) -s -f "make/modules.mk" prune BASEDIR="$(BASEDIR)" TREE="1"
 	@-rm -rf "$(CONFIG)"
 	@echo "Prune OK"
 
@@ -78,10 +85,13 @@ help:
 	@echo "  clean                     Clean all build files and configuration file"
 	@echo "  config                    Configure build"
 	@echo "  depend                    Update build dependencies for current project"
-	@echo "  fetch                     Fetch all source code dependencies from git"
+	@echo "  fetch                     Fetch all desired source code dependencies from git"
 	@echo "  help                      Print this help message"
 	@echo "  info                      Output build configuration"
 	@echo "  install                   Install all binaries into the system"
+	@echo "  prune                     Cleanup build and all fetched dependencies from git"
+	@echo "  tree                      Fetch all possible source code dependencies from git"
+	@echo "                            to make source code portable between machines"
 	@echo "  uninstall                 Uninstall binaries"
 	@echo ""
 	@$(MAKE) -s -f "$(BASEDIR)/make/configure.mk" $(@)

README.md

@@ -98,6 +98,13 @@ To clean the whole project tree including configuration files, run:
 make prune
 ```
 
+To fetch all possible dependencies and make the source code tree portable between
+different architectures and platforms, run:
+
+```bash
+make tree
+```
+
 Usage
 ======
 

include/lsp-plug.in/dsp/version.h

@@ -25,7 +25,7 @@
 // Define version of headers
 #define LSP_DSP_LIB_MAJOR           0
 #define LSP_DSP_LIB_MINOR           5
-#define LSP_DSP_LIB_MICRO           6
+#define LSP_DSP_LIB_MICRO           7
 
 #ifdef LSP_DSP_LIB_BUILTIN
     #define LSP_DSP_LIB_CPPEXPORT

make/modules.mk

@@ -21,20 +21,42 @@
 BASEDIR            := $(CURDIR)
 CONFIG             := $(CURDIR)/.config.mk
 
-include $(CONFIG)
+include $(BASEDIR)/dependencies.mk
+-include $(CONFIG)
 include $(BASEDIR)/project.mk
 
-DEPENDENCIES       += $(TEST_DEPENDENCIES)
+SYS_DEPENDENCIES    = $(DEPENDENCIES) $(TEST_DEPENDENCIES)
+
+# Find the proper branch of the GIT repository
+ifeq ($(TREE),1)
+  MODULES            := $(BASEDIR)/modules
+  GIT                := git
+  
+  ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
+    $(foreach dep, $(ALL_DEPENDENCIES), \
+      $(eval $(dep)_BRANCH=devel) \
+      $(eval $(dep)_PATH=$(MODULES)/$($(dep)_NAME)) \
+    )
+  else
+    $(foreach dep, $(ALL_DEPENDENCIES), \
+      $(eval $(dep)_BRANCH="$($(dep)_NAME)-$($(dep)_VERSION)") \
+      $(eval $(dep)_PATH=$(MODULES)/$($(dep)_NAME)) \
+    )
+  endif
+endif
 
 # Form list of modules, exclude all modules that have 'system' version
-SRC_MODULES         = $(foreach dep, $(DEPENDENCIES), $(if $(findstring src,$($(dep)_TYPE)),$(dep)))
-HDR_MODULES         = $(foreach dep, $(DEPENDENCIES), $(if $(findstring hdr,$($(dep)_TYPE)),$(dep)))
+SRC_MODULES         = $(foreach dep, $(SYS_DEPENDENCIES), $(if $(findstring src,$($(dep)_TYPE)),$(dep)))
+HDR_MODULES         = $(foreach dep, $(SYS_DEPENDENCIES), $(if $(findstring hdr,$($(dep)_TYPE)),$(dep)))
+ALL_SRC_MODULES     = $(foreach dep, $(ALL_DEPENDENCIES), $(if $(findstring src,$($(dep)_TYPE)),$(dep)))
+ALL_HDR_MODULES     = $(foreach dep, $(ALL_DEPENDENCIES), $(if $(findstring hdr,$($(dep)_TYPE)),$(dep)))
+ALL_PATHS           = $(foreach dep, $(ALL_SRC_MODULES) $(ALL_HDR_MODULES), $($(dep)_PATH))
 
 # Branches
-.PHONY: $(SRC_MODULES) $(HDR_MODULES)
+.PHONY: $(ALL_SRC_MODULES) $(ALL_HDR_MODULES) $(ALL_PATHS)
 .PHONY: fetch prune clean
 
-$(SRC_MODULES) $(HDR_MODULES):
+$(ALL_SRC_MODULES) $(ALL_HDR_MODULES):
 	@echo "Cloning $($(@)_URL) -> $($(@)_PATH) [$($(@)_BRANCH)]"
 	@test -f "$($(@)_PATH)/.git/config" || $(GIT) clone "$($(@)_URL)" "$($(@)_PATH)"
 	@$(GIT) -C "$($(@)_PATH)" reset --hard
@@ -43,12 +65,17 @@ $(SRC_MODULES) $(HDR_MODULES):
 	@$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout origin/$($(@)_BRANCH) || \
 	 $(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout refs/tags/$($(@)_BRANCH)
 
+$(ALL_PATHS):
+	@echo "Removing $(notdir $(@))"
+	@-rm -rf $(@)
+
 fetch: $(SRC_MODULES) $(HDR_MODULES)
 
+tree: $(ALL_SRC_MODULES) $(ALL_HDR_MODULES)
+
 clean:
 	@echo rm -rf "$($(ARTIFACT_VARS)_BIN)/$(ARTIFACT_NAME)"
 	@-rm -rf "$($(ARTIFACT_VARS)_BIN)/$(ARTIFACT_NAME)"
 
-prune:
-	@-find 'modules' -mindepth 1 -maxdepth 1 -type d -exec rm -rf '{}' \;
+prune: $(ALL_PATHS)
 

project.mk

@@ -23,13 +23,18 @@ ARTIFACT_DESC               = DSP library for digital signal processing
 ARTIFACT_NAME               = lsp-dsp-lib
 ARTIFACT_VARS               = LSP_DSP_LIB
 ARTIFACT_HEADERS            = lsp-plug.in
-ARTIFACT_VERSION            = 0.5.6
+ARTIFACT_VERSION            = 0.5.7
 
 # List of dependencies
+DEPENDENCIES = \
+  STDLIB \
+  LSP_COMMON_LIB
+
 TEST_DEPENDENCIES = \
   TEST_STDLIB \
   LSP_TEST_FW
 
-DEPENDENCIES = \
-  STDLIB \
-  LSP_COMMON_LIB
+# All possible dependencies
+ALL_DEPENDENCIES = \
+  $(DEPENDENCIES) \
+  $(TEST_DEPENDENCIES)