Release 1.0.5

* Updated build scripts.

Author: sadko4u

CHANGELOG

@@ -2,6 +2,9 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 1.0.5 ===
+* Updated build scripts.
+
 === 1.0.4 ===
 * Added support of Windows operating system.
 * Added support of modern C++ 11 standard and above.

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

@@ -22,9 +22,9 @@
 #ifndef LSP_PLUG_IN_TK_VERSION_H_
 #define LSP_PLUG_IN_TK_VERSION_H_
 
-#define LSP_TK_MAJOR                1
-#define LSP_TK_MINOR                0
-#define LSP_TK_MICRO                4
+#define LSP_TK_LIB_MAJOR            1
+#define LSP_TK_LIB_MINOR            0
+#define LSP_TK_LIB_MICRO            5
 
 #if defined(LSP_TK_LIB_PUBLISHER)
     #define LSP_TK_LIB_PUBLIC               LSP_EXPORT_MODIFIER

make/configure.mk

@@ -154,12 +154,8 @@ endef
 
 define binconfig =
   $(eval name=$(1))
-<<<<<<< Updated upstream
-  $(eval $(call _modconfig,$(1),$(1)))
-=======
   $(eval publisher=1)
-  $(eval $(call _modconfig,$(1),))
->>>>>>> Stashed changes
+  $(eval $(call _modconfig,$(name),$(publisher)))
 endef
 
 define hdrconfig =

make/modules.mk

@@ -78,8 +78,8 @@ $(ALL_SRC_MODULES) $(ALL_HDR_MODULES):
 	test -f "$($(@)_PATH)/.git/config" || $(GIT) clone "$($(@)_URL)" "$($(@)_PATH)"
 	mkdir -p $(dir $($(@)_PATH))
 	$(GIT) -C "$($(@)_PATH)" reset --hard
-	$(GIT) -C "$($(@)_PATH)" fetch origin --force
-	$(GIT) -C "$($(@)_PATH)" fetch origin '+refs/heads/*:refs/tags/*' --force
+	$(GIT) -C "$($(@)_PATH)" fetch origin --force --prune --prune-tags
+	$(GIT) -C "$($(@)_PATH)" fetch origin 'refs/tags/*:refs/tags/*' --force
 	$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_BRANCH)" "origin/$($(@)_BRANCH)" || \
 	$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_BRANCH)" || \
 	$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_NAME)-$($(@)_BRANCH)" "origin/$($(@)_NAME)-$($(@)_BRANCH)" || \

modules.mk

@@ -19,61 +19,61 @@
 #
 
 # Variables that describe dependencies
-LSP_COMMON_LIB_VERSION     := 1.0.21
+LSP_COMMON_LIB_VERSION     := 1.0.22
 LSP_COMMON_LIB_NAME        := lsp-common-lib
 LSP_COMMON_LIB_TYPE        := src
 LSP_COMMON_LIB_URL_RO      := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
 LSP_COMMON_LIB_URL_RW      := [email protected]:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
 
-LSP_TEST_FW_VERSION        := 1.0.15
+LSP_TEST_FW_VERSION        := 1.0.16
 LSP_TEST_FW_NAME           := lsp-test-fw
 LSP_TEST_FW_TYPE           := src
 LSP_TEST_FW_URL_RO         := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git
 LSP_TEST_FW_URL_RW         := [email protected]:lsp-plugins/$(LSP_TEST_FW_NAME).git
 
-LSP_LLTL_LIB_VERSION       := 1.0.5
+LSP_LLTL_LIB_VERSION       := 1.0.6
 LSP_LLTL_LIB_NAME          := lsp-lltl-lib
 LSP_LLTL_LIB_TYPE          := src
 LSP_LLTL_LIB_URL_RO        := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git
 LSP_LLTL_LIB_URL_RW        := [email protected]:lsp-plugins/$(LSP_LLTL_LIB_NAME).git
 
-LSP_RUNTIME_LIB_VERSION    := 1.0.8
+LSP_RUNTIME_LIB_VERSION    := 1.0.9
 LSP_RUNTIME_LIB_NAME       := lsp-runtime-lib
 LSP_RUNTIME_LIB_TYPE       := src
 LSP_RUNTIME_LIB_URL_RO     := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
 LSP_RUNTIME_LIB_URL_RW     := [email protected]:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
 
-LSP_R3D_IFACE_VERSION      := 1.0.5
+LSP_R3D_IFACE_VERSION      := 1.0.6
 LSP_R3D_IFACE_NAME         := lsp-r3d-iface
 LSP_R3D_IFACE_TYPE         := src
 LSP_R3D_IFACE_URL_RO       := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git
 LSP_R3D_IFACE_URL_RW       := [email protected]:lsp-plugins/$(LSP_R3D_IFACE_NAME).git
 
-LSP_R3D_BASE_LIB_VERSION   := 1.0.5
+LSP_R3D_BASE_LIB_VERSION   := 1.0.6
 LSP_R3D_BASE_LIB_NAME      := lsp-r3d-base-lib
 LSP_R3D_BASE_LIB_TYPE      := src
 LSP_R3D_BASE_LIB_URL_RO    := https://github.com/lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
 LSP_R3D_BASE_LIB_URL_RW    := [email protected]:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
 
-LSP_R3D_GLX_LIB_VERSION    := 1.0.5
+LSP_R3D_GLX_LIB_VERSION    := 1.0.6
 LSP_R3D_GLX_LIB_NAME       := lsp-r3d-glx-lib
 LSP_R3D_GLX_LIB_TYPE       := src
 LSP_R3D_GLX_LIB_URL_RO     := https://github.com/lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
 LSP_R3D_GLX_LIB_URL_RW     := [email protected]:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
 
-LSP_R3D_WGL_LIB_VERSION    := 1.0.0
+LSP_R3D_WGL_LIB_VERSION    := 1.0.1
 LSP_R3D_WGL_LIB_NAME       := lsp-r3d-wgl-lib
 LSP_R3D_WGL_LIB_TYPE       := src
 LSP_R3D_WGL_LIB_URL_RO     := https://github.com/lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git
 LSP_R3D_WGL_LIB_URL_RW     := [email protected]:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git
 
-LSP_WS_LIB_VERSION         := 1.0.4
+LSP_WS_LIB_VERSION         := 1.0.5
 LSP_WS_LIB_NAME            := lsp-ws-lib
 LSP_WS_LIB_TYPE            := src
 LSP_WS_LIB_URL_RO          := https://github.com/lsp-plugins/$(LSP_WS_LIB_NAME).git
 LSP_WS_LIB_URL_RW          := [email protected]:lsp-plugins/$(LSP_WS_LIB_NAME).git
 
-LSP_DSP_LIB_VERSION        := 1.0.5
+LSP_DSP_LIB_VERSION        := 1.0.6
 LSP_DSP_LIB_NAME           := lsp-dsp-lib
 LSP_DSP_LIB_TYPE           := src
 LSP_DSP_LIB_URL_RO         := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git

project.mk

@@ -23,5 +23,5 @@ ARTIFACT_ID                 = LSP_TK_LIB
 ARTIFACT_NAME               = lsp-tk-lib
 ARTIFACT_DESC               = Graphical toolkit library for Linux Studio Plugins Project
 ARTIFACT_HEADERS            = lsp-plug.in
-ARTIFACT_VERSION            = 1.0.4
+ARTIFACT_VERSION            = 1.0.5
 ARTIFACT_EXPORT_ALL         = 1