Skip to content

Commit 1709fd7

Browse files
sadko4usadko4u
committed
Release 1.0.0
* Updated build scripts. * Added Eclipse project files.
2 parents 5d9024e + e1e88f1 commit 1709fd7

File tree

15 files changed

+684
-241
lines changed

15 files changed

+684
-241
lines changed

‎.cproject‎

Lines changed: 221 additions & 0 deletions
Large diffs are not rendered by default.

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
/.test/*
55
/Debug/*
66
/Release/*
7-
/.cproject
8-
/.project
97
/Debug/
108
/Release
119
*.log

‎.project‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>lsp-dsp-lib</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
10+
<triggers>clean,full,incremental,</triggers>
11+
<arguments>
12+
</arguments>
13+
</buildCommand>
14+
<buildCommand>
15+
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
16+
<triggers>full,incremental,</triggers>
17+
<arguments>
18+
</arguments>
19+
</buildCommand>
20+
</buildSpec>
21+
<natures>
22+
<nature>org.eclipse.cdt.core.cnature</nature>
23+
<nature>org.eclipse.cdt.core.ccnature</nature>
24+
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
25+
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
26+
</natures>
27+
</projectDescription>

‎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.0 ===
6+
* Updated build scripts.
7+
* Added Eclipse project files.
8+
59
=== 0.5.14 ===
610
* Updated build system.
711

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ include $(BASEDIR)/project.mk
4242

4343
# Setup paths
4444
CHK_CONFIG = test -f "$(CONFIG)" || (echo "System not properly configured. Please launch 'make config' first" && exit 1)
45-
DISTSRC_PATH = $(BUILDDIR)/.distsrc
45+
DISTSRC_PATH = $(BUILDDIR)/distsrc
4646
DISTSRC = $(DISTSRC_PATH)/$(ARTIFACT_NAME)
4747

4848
.DEFAULT_GOAL := all

‎dependencies.mk‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,22 @@
1818
# along with lsp-dsp-lib. If not, see <https://www.gnu.org/licenses/>.
1919
#
2020

21-
# Variables that describe dependencies
22-
LSP_COMMON_LIB_VERSION := 1.0.14
23-
LSP_COMMON_LIB_NAME := lsp-common-lib
24-
LSP_COMMON_LIB_TYPE := src
25-
LSP_COMMON_LIB_URL := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
21+
# List of dependencies
22+
DEPENDENCIES = \
23+
LIBPTHREAD \
24+
LSP_COMMON_LIB
2625

27-
LSP_TEST_FW_VERSION := 1.0.8
28-
LSP_TEST_FW_NAME := lsp-test-fw
29-
LSP_TEST_FW_TYPE := src
30-
LSP_TEST_FW_URL := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git
26+
TEST_DEPENDENCIES = \
27+
LSP_TEST_FW
3128

32-
LIBPTHREAD_VERSION := system
33-
LIBPTHREAD_NAME := libpthread
34-
LIBPTHREAD_TYPE := opt
35-
LIBPTHREAD_LDFLAGS := -lpthread
29+
# Platform-dependent
30+
ifeq ($(PLATFORM),Windows)
31+
TEST_DEPENDENCIES += \
32+
LIBSHLWAPI
33+
endif
3634

37-
LIBSHLWAPI_VERSION := system
38-
LIBSHLWAPI_NAME := libshlwapi
39-
LIBSHLWAPI_TYPE := opt
40-
LIBSHLWAPI_LDFLAGS := -lshlwapi
35+
# Overall system dependencies
36+
ALL_DEPENDENCIES = \
37+
$(DEPENDENCIES) \
38+
$(TEST_DEPENDENCIES) \
39+
LIBSHLWAPI

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#define LSP_PLUG_IN_DSP_VERSION_H_
2424

2525
// Define version of headers
26-
#define LSP_DSP_LIB_MAJOR 0
27-
#define LSP_DSP_LIB_MINOR 5
28-
#define LSP_DSP_LIB_MICRO 14
26+
#define LSP_DSP_LIB_MAJOR 1
27+
#define LSP_DSP_LIB_MINOR 0
28+
#define LSP_DSP_LIB_MICRO 0
2929

3030
#ifdef LSP_DSP_LIB_BUILTIN
3131
#define LSP_DSP_LIB_CPPEXPORT

‎make/configure.mk‎

Lines changed: 131 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,41 @@ endif
2525
PREFIX := /usr/local
2626
LIBDIR := $(PREFIX)/lib
2727
BINDIR := $(PREFIX)/bin
28+
SHAREDDIR := $(PREFIX)/share
2829
INCDIR := $(PREFIX)/include
30+
ETCDIR := /etc
2931
BASEDIR := $(CURDIR)
32+
ROOTDIR := $(CURDIR)
3033
BUILDDIR := $(BASEDIR)/.build
34+
TARGET_BUILDDIR := $(BUILDDIR)/target
35+
HOST_BUILDDIR := $(BUILDDIR)/host
3136
MODULES := $(BASEDIR)/modules
3237
CONFIG := $(BASEDIR)/.config.mk
3338
TEST := 0
3439
DEBUG := 0
3540
PROFILE := 0
3641
TRACE := 0
3742

43+
ifeq ($(DEVEL),1)
44+
X_URL_SUFFIX = _RW
45+
else
46+
X_URL_SUFFIX = _RO
47+
endif
48+
3849
include $(BASEDIR)/make/functions.mk
3950
include $(BASEDIR)/make/system.mk
4051
include $(BASEDIR)/make/tools.mk
41-
include $(BASEDIR)/dependencies.mk
52+
include $(BASEDIR)/modules.mk
4253
include $(BASEDIR)/project.mk
54+
include $(BASEDIR)/dependencies.mk
4355

4456
# Compute the full list of dependencies
45-
UNIQ_DEPENDENCIES := $(call uniq, $(DEPENDENCIES) $(TEST_DEPENDENCIES))
46-
DEPENDENCIES = $(UNIQ_DEPENDENCIES)
57+
MERGED_DEPENDENCIES := \
58+
$(DEPENDENCIES) \
59+
$(TEST_DEPENDENCIES)
60+
UNIQ_MERGED_DEPENDENCIES := $(call uniq, $(MERGED_DEPENDENCIES))
61+
DEPENDENCIES = $(UNIQ_MERGED_DEPENDENCIES)
62+
FEATURES := $(call uniq, $(call subtraction,$(SUB_FEATURES),$(DEFAULT_FEATURES) $(ADD_FEATURES)))
4763

4864
# Determine versions
4965
ifeq ($(findstring -devel,$(ARTIFACT_VERSION)),-devel)
@@ -61,54 +77,104 @@ endif
6177

6278
define pkgconfig =
6379
$(eval name=$(1))
80+
6481
$(if $($(name)_NAME), \
65-
$(if $($(name)_CFLAGS),, $(eval $(name)_CFLAGS := $(shell pkg-config --cflags "$($(name)_NAME)"))) \
82+
$(if $($(name)_CFLAGS),, $(eval $(name)_CFLAGS := $(shell $(PKG_CONFIG) --cflags "$($(name)_NAME)"))) \
83+
$(if $($(name)_LDLAGS),, $(eval $(name)_LDFLAGS := $(shell $(PKG_CONFIG) --libs "$($(name)_NAME)"))) \
84+
\
85+
$(if $(HOST_$(name)_CFLAGS),, $(eval HOST_$(name)_CFLAGS := $(shell $(HOST_PKG_CONFIG) --cflags "$($(name)_NAME)"))) \
86+
$(if $(HOST_$(name)_LDLAGS),, $(eval HOST_$(name)_LDFLAGS := $(shell $(HOST_PKG_CONFIG) --libs "$($(name)_NAME)"))) \
6687
)
67-
$(if $($(name)_NAME), \
68-
$(if $($(name)_LDLAGS),, $(eval $(name)_LDFLAGS := $(shell pkg-config --libs "$($(name)_NAME)"))) \
69-
)
70-
$(if $($(name)_OBJ),, $(eval $(name)_OBJ :=))
88+
89+
$(if $($(name)_OBJ),, $(eval $(name)_OBJ :=))
90+
$(if $(HOST_$(name)_OBJ),, $(eval HOST_$(name)_OBJ :=))
7191
endef
7292

7393
define libconfig =
7494
$(eval name=$(1))
95+
7596
$(if $($(name)_NAME), \
76-
$(if $($(name)_LDLAGS),, $(eval $(name)_LDFLAGS := -l$($(name)_NAME))) \
97+
$(if $($(name)_LDLAGS),, $(eval $(name)_LDFLAGS := -l$($(name)_NAME))) \
98+
\
99+
$(if $(HOST_$(name)_LDLAGS),, $(eval HOST_$(name)_LDFLAGS := -l$($(name)_NAME))) \
77100
)
78-
$(if $($(name)_OBJ),, $(eval $(name)_OBJ :=))
101+
102+
$(if $($(name)_OBJ),, $(eval $(name)_OBJ :=))
103+
$(if $(HOST_$(name)_OBJ),, $(eval HOST_$(name)_OBJ :=))
79104
endef
80105

81106
define optconfig =
82107
$(eval name=$(1))
83-
$(if $($(name)_OBJ),, $(eval $(name)_OBJ :=))
108+
109+
$(if $($(name)_NAME), \
110+
$(if $(HOST_$(name)_LDLAGS),, $(eval HOST_$(name)_LDFLAGS := $($(name)_LDFLAGS))) \
111+
)
112+
113+
$(if $($(name)_OBJ),, $(eval $(name)_OBJ :=))
114+
$(if $(HOST_$(name)_OBJ),, $(eval HOST_$(name)_OBJ :=))
115+
endef
116+
117+
define _modconfig =
118+
$(eval name=$(1))
119+
$(eval builtin=$(2))
120+
121+
$(if $($(name)_DESC),, $(eval $(name)_DESC := $($(name)_DESC)))
122+
$(if $($(name)_URL),, $(eval $(name)_URL := $($(name)_URL$(X_URL_SUFFIX))))
123+
124+
$(if $($(name)_PATH),, $(eval $(name)_PATH := $(MODULES)/$($(name)_NAME)))
125+
$(if $($(name)_INC),, $(eval $(name)_INC := $($(name)_PATH)/include))
126+
$(if $($(name)_SRC),, $(eval $(name)_SRC := $($(name)_PATH)/src))
127+
$(if $($(name)_TEST),, $(eval $(name)_TEST := $($(name)_PATH)/test))
128+
$(if $($(name)_TESTING),, $(eval $(name)_TESTING := 0))
129+
$(if $($(name)_BIN),, $(eval $(name)_BIN := $(TARGET_BUILDDIR)/$($(name)_NAME)))
130+
$(if $($(name)_CFLAGS),, $(eval $(name)_CFLAGS := "-I\"$($(name)_INC)\""$(if $(builtin)," -D$(name)_BUILTIN")))
131+
$(if $($(name)_LDLAGS),, $(eval $(name)_LDFLAGS :=))
132+
$(if $($(name)_OBJ),, $(eval $(name)_OBJ := "$($(name)_BIN)/$($(name)_NAME).o"))
133+
$(if $($(name)_OBJ_TEST),, $(eval $(name)_OBJ_TEST := "$($(name)_BIN)/$($(name)_NAME)-test.o"))
134+
$(if $($(name)_MFLAGS),, $(eval $(name)_MFLAGS := $(if $(builtin),"-D$(name)_BUILTIN -fvisibility=hidden")))
135+
136+
$(if $(HOST_$(name)_PATH),, $(eval HOST_$(name)_PATH := $(MODULES)/$($(name)_NAME)))
137+
$(if $(HOST_$(name)_INC),, $(eval HOST_$(name)_INC := $(HOST_$(name)_PATH)/include))
138+
$(if $(HOST_$(name)_SRC),, $(eval HOST_$(name)_SRC := $(HOST_$(name)_PATH)/src))
139+
$(if $(HOST_$(name)_TEST),, $(eval HOST_$(name)_TEST := $(HOST_$(name)_PATH)/test))
140+
$(if $(HOST_$(name)_TESTING),, $(eval HOST_$(name)_TESTING := 0))
141+
$(if $(HOST_$(name)_BIN),, $(eval HOST_$(name)_BIN := $(HOST_BUILDDIR)/$($(name)_NAME)))
142+
$(if $(HOST_$(name)_CFLAGS),, $(eval HOST_$(name)_CFLAGS := "-I\"$(HOST_$(name)_INC)\""$(if $(builtin)," -D$(name)_BUILTIN")))
143+
$(if $(HOST_$(name)_LDLAGS),, $(eval HOST_$(name)_LDFLAGS :=))
144+
$(if $(HOST_$(name)_OBJ),, $(eval HOST_$(name)_OBJ := "$(HOST_$(name)_BIN)/$($(name)_NAME).o"))
145+
$(if $(HOST_$(name)_OBJ_TEST),,$(eval HOST_$(name)_OBJ_TEST:= "$(HOST_$(name)_BIN)/$($(name)_NAME)-test.o"))
146+
$(if $(HOST_$(name)_MFLAGS),, $(eval HOST_$(name)_MFLAGS := $(if $(builtin),"-D$(name)_BUILTIN -fvisibility=hidden")))
84147
endef
85148

86149
define srcconfig =
87150
$(eval name=$(1))
88151
$(eval builtin=$(patsubst $(ARTIFACT_NAME),,$($(name)_NAME)))
89-
$(if $($(name)_PATH),, $(eval $(name)_PATH := $(MODULES)/$($(name)_NAME)))
90-
$(if $($(name)_DESC),, $(eval $(name)_DESC := $($(name)_DESC)))
91-
$(if $($(name)_INC),, $(eval $(name)_INC := $($(name)_PATH)/include))
92-
$(if $($(name)_SRC),, $(eval $(name)_SRC := $($(name)_PATH)/src))
93-
$(if $($(name)_TEST),, $(eval $(name)_TEST := $($(name)_PATH)/test))
94-
$(if $($(name)_TESTING),, $(eval $(name)_TESTING := 0))
95-
$(if $($(name)_BIN),, $(eval $(name)_BIN := $(BUILDDIR)/$($(name)_NAME)))
96-
$(if $($(name)_CFLAGS),, $(eval $(name)_CFLAGS := "-I\"$($(name)_INC)\"" $(if $(builtin),"-D$(name)_BUILTIN")))
97-
$(if $($(name)_LDLAGS),, $(eval $(name)_LDFLAGS :=))
98-
$(if $($(name)_OBJ),, $(eval $(name)_OBJ := "$($(name)_BIN)/$($(name)_NAME).o"))
99-
$(if $($(name)_OBJ_TEST),,$(eval $(name)_OBJ_TEST:= "$($(name)_BIN)/$($(name)_NAME)-test.o"))
100-
$(if $($(name)_MFLAGS),, $(eval $(name)_MFLAGS := $(if $(builtin),"-D$(name)_BUILTIN -fvisibility=hidden")))
152+
$(eval $(call _modconfig,$(name),$(builtin)))
153+
endef
154+
155+
define binconfig =
156+
$(eval name=$(1))
157+
$(eval $(call _modconfig,$(1),))
101158
endef
102159

103160
define hdrconfig =
104161
$(eval name=$(1))
105162
$(eval builtin=$(patsubst $(ARTIFACT_NAME),,$($(name)_NAME)))
106-
$(if $($(name)_PATH),, $(eval $(name)_PATH := $(MODULES)/$($(name)_NAME)))
107-
$(if $($(name)_DESC),, $(eval $(name)_DESC := $($(name)_DESC)))
108-
$(if $($(name)_INC),, $(eval $(name)_INC := $($(name)_PATH)/include))
109-
$(if $($(name)_TESTING),, $(eval $(name)_TESTING := 0))
110-
$(if $($(name)_CFLAGS),, $(eval $(name)_CFLAGS := "-I\"$($(name)_INC)\"" $(if $(builtin),"-D$(name)_BUILTIN")))
111-
$(if $($(name)_MFLAGS),, $(eval $(name)_MFLAGS := $(if $(builtin),"-D$(name)_BUILTIN -fvisibility=hidden")))
163+
164+
$(if $($(name)_DESC),, $(eval $(name)_DESC := $($(name)_DESC)))
165+
$(if $($(name)_URL),, $(eval $(name)_URL := $($(name)_URL$(X_URL_SUFFIX))))
166+
167+
$(if $($(name)_PATH),, $(eval $(name)_PATH := $(MODULES)/$($(name)_NAME)))
168+
$(if $($(name)_INC),, $(eval $(name)_INC := $($(name)_PATH)/include))
169+
$(if $($(name)_TESTING),, $(eval $(name)_TESTING := 0))
170+
$(if $($(name)_CFLAGS),, $(eval $(name)_CFLAGS := "-I\"$($(name)_INC)\""$(if $(builtin)," -D$(name)_BUILTIN")))
171+
$(if $($(name)_MFLAGS),, $(eval $(name)_MFLAGS := $(if $(builtin),"-D$(name)_BUILTIN -fvisibility=hidden")))
172+
173+
$(if $(HOST_$(name)_PATH),, $(eval HOST_$(name)_PATH := $(MODULES)/$($(name)_NAME)))
174+
$(if $(HOST_$(name)_INC),, $(eval HOST_$(name)_INC := $(HOST_$(name)_PATH)/include))
175+
$(if $(HOST_$(name)_TESTING),, $(eval HOST_$(name)_TESTING := 0))
176+
$(if $(HOST_$(name)_CFLAGS),, $(eval HOST_$(name)_CFLAGS := "-I\"$(HOST_$(name)_INC)\""$(if $(builtin)," -D$(name)_BUILTIN")))
177+
$(if $(HOST_$(name)_MFLAGS),, $(eval HOST_$(name)_MFLAGS := $(if $(builtin),"-D$(name)_BUILTIN -fvisibility=hidden")))
112178
endef
113179

114180
define vardef =
@@ -118,13 +184,21 @@ define vardef =
118184
$(if $(findstring src,$($(name)_TYPE)), $(eval $(call srcconfig, $(name))))
119185
$(if $(findstring hdr,$($(name)_TYPE)), $(eval $(call hdrconfig, $(name))))
120186
$(if $(findstring lib,$($(name)_TYPE)), $(eval $(call libconfig, $(name))))
187+
$(if $(findstring bin,$($(name)_TYPE)), $(eval $(call binconfig, $(name))))
121188
$(if $(findstring opt,$($(name)_TYPE)), $(eval $(call optconfig, $(name))))
122189
endef
123190

124191
# Define predefined variables
192+
ifndef ARTIFACT_TYPE
193+
ARTIFACT_TYPE := src
194+
endif
195+
125196
ifndef $(ARTIFACT_ID)_NAME
126197
$(ARTIFACT_ID)_NAME := $(ARTIFACT_NAME)
127198
endif
199+
ifndef $(ARTIFACT_ID)_TYPE
200+
$(ARTIFACT_ID)_TYPE := $(ARTIFACT_TYPE)
201+
endif
128202
ifndef $(ARTIFACT_ID)_DESC
129203
$(ARTIFACT_ID)_DESC := $(ARTIFACT_DESC)
130204
endif
@@ -134,11 +208,14 @@ endif
134208
ifndef $(ARTIFACT_ID)_PATH
135209
$(ARTIFACT_ID)_PATH := $(BASEDIR)
136210
endif
211+
ifndef HOST_$(ARTIFACT_ID)_PATH
212+
HOST_$(ARTIFACT_ID)_PATH := $(BASEDIR)
213+
endif
137214

215+
ROOT_ARTIFACT_ID := $(ARTIFACT_ID)
138216
$(ARTIFACT_ID)_TESTING = $(TEST)
139-
$(ARTIFACT_ID)_TYPE := src
140217

141-
OVERALL_DEPS := $(DEPENDENCIES) $(ARTIFACT_ID)
218+
OVERALL_DEPS := $(call uniq,$(DEPENDENCIES) $(ARTIFACT_ID))
142219
__tmp := $(foreach dep,$(OVERALL_DEPS),$(call vardef, $(dep)))
143220

144221
CONFIG_VARS = \
@@ -149,19 +226,32 @@ CONFIG_VARS = \
149226
$(name)_DESC \
150227
$(name)_VERSION \
151228
$(name)_TYPE \
229+
$(name)_URL \
152230
$(name)_BRANCH \
231+
\
153232
$(name)_PATH \
154233
$(name)_INC \
155234
$(name)_SRC \
156235
$(name)_TEST \
157236
$(name)_TESTING \
158-
$(name)_URL \
159237
$(name)_BIN \
160238
$(name)_CFLAGS \
161239
$(name)_MFLAGS \
162240
$(name)_LDFLAGS \
163241
$(name)_OBJ \
164242
$(name)_OBJ_TEST \
243+
\
244+
HOST_$(name)_PATH \
245+
HOST_$(name)_INC \
246+
HOST_$(name)_SRC \
247+
HOST_$(name)_TEST \
248+
HOST_$(name)_TESTING \
249+
HOST_$(name)_BIN \
250+
HOST_$(name)_CFLAGS \
251+
HOST_$(name)_MFLAGS \
252+
HOST_$(name)_LDFLAGS \
253+
HOST_$(name)_OBJ \
254+
HOST_$(name)_OBJ_TEST \
165255
)
166256

167257
.DEFAULT_GOAL := config
@@ -176,6 +266,8 @@ $(CONFIG_VARS): prepare
176266
echo "$(@)=$($(@))" >> "$(CONFIG)"
177267

178268
config: $(CONFIG_VARS)
269+
echo "Architecture: $(ARCHITECTURE) ($(ARCHITECTURE_CFLAGS))"
270+
echo "Features: $(FEATURES)"
179271
echo "Configured OK"
180272

181273
help: | toolvars sysvars
@@ -194,14 +286,15 @@ help: | toolvars sysvars
194286
echo " <ARTIFACT>_SRC path to source code files of the artifact"
195287
echo " <ARTIFACT>_TEST location of test files of the artifact"
196288
echo " <ARTIFACT>_TYPE artifact usage type"
197-
echo " - src - use sources and headers from git"
198-
echo " - hdr - use headers only from git"
199-
echo " - pkg - use pkgconfig for configuration"
200-
echo " - lib - use system headers and -l<libname> flags"
201-
echo " - opt - use optional configuration"
289+
echo " - bin - binaries build from source code"
290+
echo " - hdr - use headers only from git"
291+
echo " - lib - use system headers and -l<libname> flags"
292+
echo " - opt - use optional configuration"
293+
echo " - pkg - use pkgconfig for configuration"
294+
echo " - src - use sources and headers from git"
202295
echo " <ARTIFACT>_URL location of the artifact git repoisitory"
203296
echo " <ARTIFACT>_VERSION version of the artifact used for building"
204297
echo ""
205298
echo "Artifacts used for build:"
206299
echo " $(DEPENDENCIES)"
207-
300+
echo ""

0 commit comments

Comments
 (0)