Updated build scripts that now use tags without prefixes first.

Author: sadko4u

CHANGELOG

@@ -3,6 +3,7 @@
 *******************************************************************************
 
 === 0.5.9 ===
+* Updated build scripts that now use tags without prefixes first.
 
 === 0.5.8 ===
 * Fixed excessive header installation with proper one.

dependencies.mk

@@ -19,12 +19,12 @@
 #
 
 # Variables that describe dependencies
-LSP_COMMON_LIB_VERSION     := 1.0.7
+LSP_COMMON_LIB_VERSION     := 1.0.8
 LSP_COMMON_LIB_NAME        := lsp-common-lib
 LSP_COMMON_LIB_TYPE        := src
 LSP_COMMON_LIB_URL         := https://github.com/sadko4u/$(LSP_COMMON_LIB_NAME).git
 
-LSP_TEST_FW_VERSION        := 1.0.5
+LSP_TEST_FW_VERSION        := 1.0.6
 LSP_TEST_FW_NAME           := lsp-test-fw
 LSP_TEST_FW_TYPE           := src
 LSP_TEST_FW_URL            := https://github.com/sadko4u/$(LSP_TEST_FW_NAME).git

make/configure.mk

@@ -49,7 +49,7 @@ ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
 else
   $(foreach dep, $(DEPENDENCIES), \
     $(eval \
-      $(dep)_BRANCH="$($(dep)_NAME)-$($(dep)_VERSION)" \
+      $(dep)_BRANCH="$($(dep)_VERSION)" \
     ) \
   )
 endif

make/modules.mk

@@ -41,7 +41,7 @@ ifeq ($(TREE),1)
     )
   else
     $(foreach dep, $(ALL_DEPENDENCIES), \
-      $(eval $(dep)_BRANCH="$($(dep)_NAME)-$($(dep)_VERSION)") \
+      $(eval $(dep)_BRANCH="$($(dep)_VERSION)") \
       $(eval $(dep)_PATH=$(MODULES)/$($(dep)_NAME)) \
     )
   endif
@@ -65,7 +65,9 @@ $(ALL_SRC_MODULES) $(ALL_HDR_MODULES):
 	@$(GIT) -C "$($(@)_PATH)" fetch origin --force
 	@$(GIT) -C "$($(@)_PATH)" fetch origin '+refs/heads/*:refs/tags/*' --force
 	@$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout origin/$($(@)_BRANCH) || \
-	 $(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout refs/tags/$($(@)_BRANCH)
+	 $(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout refs/tags/$($(@)_BRANCH) || \
+	 $(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout origin/$($(@)_NAME)-$($(@)_BRANCH) || \
+	 $(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout refs/tags/$($(@)_NAME)-$($(@)_BRANCH)
 
 $(ALL_PATHS):
 	@echo "Removing $(notdir $(@))"

project.mk

@@ -19,11 +19,11 @@
 #
 
 # Package version
-ARTIFACT_DESC               = DSP library for digital signal processing
 ARTIFACT_NAME               = lsp-dsp-lib
+ARTIFACT_DESC               = DSP library for digital signal processing
 ARTIFACT_VARS               = LSP_DSP_LIB
 ARTIFACT_HEADERS            = lsp-plug.in
-ARTIFACT_VERSION            = 0.5.9-devel
+ARTIFACT_VERSION            = 0.5.9
 
 # List of dependencies
 DEPENDENCIES = \