Skip to content

Commit 3fd05d3

Browse files
committed
Release 1.0.9
* Updated build scripts.
2 parents 11e8697 + b89b4ce commit 3fd05d3

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

CHANGELOG

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

5+
=== 1.0.9 ===
6+
* Updated build scripts.
7+
58
=== 1.0.8 ===
69
* Fixed improper export definitions (typo in macro).
710

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

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

2525
#define LSP_RUNTIME_LIB_MAJOR 1
2626
#define LSP_RUNTIME_LIB_MINOR 0
27-
#define LSP_RUNTIME_LIB_MICRO 8
27+
#define LSP_RUNTIME_LIB_MICRO 9
2828

2929
#if defined(LSP_RUNTIME_LIB_PUBLISHER)
3030
#define LSP_RUNTIME_LIB_PUBLIC LSP_EXPORT_MODIFIER

make/configure.mk

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,8 @@ endef
154154

155155
define binconfig =
156156
$(eval name=$(1))
157-
<<<<<<< Updated upstream
158-
$(eval $(call _modconfig,$(1),$(1)))
159-
=======
160157
$(eval publisher=1)
161-
$(eval $(call _modconfig,$(1),))
162-
>>>>>>> Stashed changes
158+
$(eval $(call _modconfig,$(name),$(publisher)))
163159
endef
164160

165161
define hdrconfig =

make/modules.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ $(ALL_SRC_MODULES) $(ALL_HDR_MODULES):
7878
test -f "$($(@)_PATH)/.git/config" || $(GIT) clone "$($(@)_URL)" "$($(@)_PATH)"
7979
mkdir -p $(dir $($(@)_PATH))
8080
$(GIT) -C "$($(@)_PATH)" reset --hard
81-
$(GIT) -C "$($(@)_PATH)" fetch origin --force
82-
$(GIT) -C "$($(@)_PATH)" fetch origin '+refs/heads/*:refs/tags/*' --force
81+
$(GIT) -C "$($(@)_PATH)" fetch origin --force --prune --prune-tags
82+
$(GIT) -C "$($(@)_PATH)" fetch origin 'refs/tags/*:refs/tags/*' --force
8383
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_BRANCH)" "origin/$($(@)_BRANCH)" || \
8484
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_BRANCH)" || \
8585
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_NAME)-$($(@)_BRANCH)" "origin/$($(@)_NAME)-$($(@)_BRANCH)" || \

modules.mk

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

2121
# Variables that describe dependencies
22-
LSP_COMMON_LIB_VERSION := 1.0.21
22+
LSP_COMMON_LIB_VERSION := 1.0.22
2323
LSP_COMMON_LIB_NAME := lsp-common-lib
2424
LSP_COMMON_LIB_TYPE := src
2525
LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2626
LSP_COMMON_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2727

28-
LSP_LLTL_LIB_VERSION := 1.0.5
28+
LSP_LLTL_LIB_VERSION := 1.0.6
2929
LSP_LLTL_LIB_NAME := lsp-lltl-lib
3030
LSP_LLTL_LIB_TYPE := src
3131
LSP_LLTL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git
3232
LSP_LLTL_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_LLTL_LIB_NAME).git
3333

34-
LSP_TEST_FW_VERSION := 1.0.15
34+
LSP_TEST_FW_VERSION := 1.0.16
3535
LSP_TEST_FW_NAME := lsp-test-fw
3636
LSP_TEST_FW_TYPE := src
3737
LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_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_RUNTIME_LIB
2323
ARTIFACT_NAME = lsp-runtime-lib
2424
ARTIFACT_DESC = Runtime library used by LSP Project for plugin development
2525
ARTIFACT_HEADERS = lsp-plug.in
26-
ARTIFACT_VERSION = 1.0.8
26+
ARTIFACT_VERSION = 1.0.9
2727
ARTIFACT_EXPORT_SYMBOLS = 1

0 commit comments

Comments
 (0)