Skip to content

Commit 0849d17

Browse files
committed
Release 1.0.19
* Updated build scripts. * Updated module versions in dependencies.
2 parents 8192bbe + a2bb8a1 commit 0849d17

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

CHANGELOG

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
* RECENT CHANGES
33
*******************************************************************************
44

5+
=== 1.0.19 ===
6+
* Updated build scripts.
7+
* Updated module versions in dependencies.
8+
59
=== 1.0.18 ===
610
* Updated build scripts.
711
* Updated module versions in dependencies.

include/lsp-plug.in/r3d/base/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#define LSP_R3D_BASE_LIB_MAJOR 1
2626
#define LSP_R3D_BASE_LIB_MINOR 0
27-
#define LSP_R3D_BASE_LIB_MICRO 18
27+
#define LSP_R3D_BASE_LIB_MICRO 19
2828

2929
#if defined(LSP_R3D_BASE_LIB_PUBLISHER)
3030
#define LSP_R3D_BASE_LIB_PUBLIC LSP_EXPORT_MODIFIER

make/modules.mk

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,15 @@ $(ALL_SRC_MODULES) $(ALL_HDR_MODULES):
8080
$(GIT) -C "$($(@)_PATH)" reset --hard
8181
$(GIT) -C "$($(@)_PATH)" fetch origin --force --prune --prune-tags
8282
$(GIT) -C "$($(@)_PATH)" fetch origin 'refs/tags/*:refs/tags/*' --force
83-
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_BRANCH)" "origin/$($(@)_BRANCH)" || \
84-
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_BRANCH)" || \
85-
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_NAME)-$($(@)_BRANCH)" "origin/$($(@)_NAME)-$($(@)_BRANCH)" || \
86-
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_NAME)-$($(@)_BRANCH)"
83+
if $(GIT) -C "$($(@)_PATH)" rev-parse -q --verify "origin/$($(@)_BRANCH)" >/dev/null; then \
84+
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_BRANCH)" "origin/$($(@)_BRANCH)" >/dev/null; \
85+
elif $(GIT) -C "$($(@)_PATH)" rev-parse -q --verify "refs/tags/$($(@)_BRANCH)" >/dev/null; then \
86+
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_BRANCH)"; \
87+
elif $(GIT) -C "$($(@)_PATH)" rev-parse -q --verify "origin/$($(@)_NAME)-$($(@)_BRANCH)" >/dev/null; then \
88+
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_NAME)-$($(@)_BRANCH)" "origin/$($(@)_NAME)-$($(@)_BRANCH)"; \
89+
else \
90+
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_NAME)-$($(@)_BRANCH)"; \
91+
fi
8792

8893
fetch: $(SRC_MODULES) $(HDR_MODULES)
8994

modules.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020

2121
#------------------------------------------------------------------------------
2222
# Variables that describe source code dependencies
23-
LSP_COMMON_LIB_VERSION := 1.0.36
23+
LSP_COMMON_LIB_VERSION := 1.0.37
2424
LSP_COMMON_LIB_NAME := lsp-common-lib
2525
LSP_COMMON_LIB_TYPE := src
2626
LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2727
LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2828

29-
LSP_TEST_FW_VERSION := 1.0.25
29+
LSP_TEST_FW_VERSION := 1.0.26
3030
LSP_TEST_FW_NAME := lsp-test-fw
3131
LSP_TEST_FW_TYPE := src
3232
LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git
3333
LSP_TEST_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git
3434

35-
LSP_R3D_IFACE_VERSION := 1.0.18
35+
LSP_R3D_IFACE_VERSION := 1.0.19
3636
LSP_R3D_IFACE_NAME := lsp-r3d-iface
3737
LSP_R3D_IFACE_TYPE := src
3838
LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git

project.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ ARTIFACT_ID = LSP_R3D_BASE_LIB
2323
ARTIFACT_NAME = lsp-r3d-base-lib
2424
ARTIFACT_DESC = Base library for implementing and loading 3D rendering backend
2525
ARTIFACT_HEADERS = lsp-plug.in
26-
ARTIFACT_VERSION = 1.0.18
26+
ARTIFACT_VERSION = 1.0.19
2727
ARTIFACT_EXPORT_SYMBOLS = 0

0 commit comments

Comments
 (0)