Skip to content

Commit 5536521

Browse files
committed
Release 1.0.1
* Updated build scripts.
2 parents 23d0195 + 7ae2a4e commit 5536521

File tree

8 files changed

+23
-19
lines changed

8 files changed

+23
-19
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.1 ===
6+
* Updated build scripts.
7+
58
=== 1.0.0 ===
69
* Updated build system.
710

Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,10 @@ distsrc:
9494
$(MAKE) -f "$(BASEDIR)/make/modules.mk" tree VERBOSE="$(VERBOSE)" BASEDIR="$(BASEDIR)" MODULES="$(DISTSRC)/modules" TREE="1"
9595
cp -R $(BASEDIR)/include $(BASEDIR)/make $(BASEDIR)/src "$(DISTSRC)/"
9696
cp $(BASEDIR)/CHANGELOG $(BASEDIR)/COPYING* $(BASEDIR)/Makefile $(BASEDIR)/*.mk "$(DISTSRC)/"
97-
find "$(DISTSRC)" -iname '.git' | xargs -exec rm -rf {}
98-
find "$(DISTSRC)" -iname '.gitignore' | xargs -exec rm -rf {}
99-
tar -C $(DISTSRC_PATH) -czf "$(BUILDDIR)/$(ARTIFACT_NAME)-$(ARTIFACT_VERSION)-src.tar.gz" "$(ARTIFACT_NAME)"
100-
echo "Created archive: $(BUILDDIR)/$(ARTIFACT_NAME)-$(ARTIFACT_VERSION)-src.tar.gz"
101-
ln -sf "$(ARTIFACT_NAME)-$(ARTIFACT_VERSION)-src.tar.gz" "$(BUILDDIR)/$(ARTIFACT_NAME)-src.tar.gz"
102-
echo "Created symlink: $(BUILDDIR)/$(ARTIFACT_NAME)-src.tar.gz"
97+
find "$(DISTSRC)" -iname '.git' | xargs rm -rf {}
98+
find "$(DISTSRC)" -iname '.gitignore' | xargs rm -rf {}
99+
tar -C $(DISTSRC_PATH) -czf "$(BUILDDIR)/$(ARTIFACT_NAME)-src-$(ARTIFACT_VERSION).tar.gz" "$(ARTIFACT_NAME)"
100+
echo "Created archive: $(BUILDDIR)/$(ARTIFACT_NAME)-src-$(ARTIFACT_VERSION).tar.gz"
103101
rm -rf $(DISTSRC_PATH)
104102
echo "Build OK"
105103

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 0
27+
#define LSP_R3D_BASE_LIB_MICRO 1
2828

2929
#ifdef LSP_R3D_BASE_LIB_BUILTIN
3030
#define LSP_R3D_BASE_LIB_EXPORT

make/system.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ COMMON_VARS = \
183183
PLATFORM \
184184
ARCHITECTURE \
185185
ARCHITECTURE_CFLAGS \
186+
BUILDDIR \
186187
FEATURES \
187188
LIBRARY_EXT \
188189
LIBRARY_PREFIX \
@@ -208,7 +209,9 @@ sysvars:
208209
echo " ADD_FEATURES list of features enabled in the build as an addition to default"
209210
echo " ARCHITECTURE target architecture to perform build"
210211
echo " ARCHITECTURE_CFLAGS compiler flags to specify architecture"
212+
echo " ARCHITECTURE_LDFLAGS linker flags to specify architecture"
211213
echo " BINDIR location of the binaries"
214+
echo " BUILDDIR location of the build directory"
212215
echo " DEBUG build with debug options"
213216
echo " DEVEL build with modules checked out for read/write URL"
214217
echo " ETCDIR location of system configuration files"

make/tools.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ FLAG_RELRO = -Wl,-z,relro,-z,now
6666
FLAG_STDLIB = -lc
6767
CFLAGS_EXT = $(ARCHITECTURE_CFLAGS)
6868
CXXFLAGS_EXT = $(ARCHITECTURE_CFLAGS)
69-
LDFLAGS_EXT =
69+
EXE_FLAGS_EXT = $(ARCHITECTURE_CFLAGS)
70+
SO_FLAGS_EXT = $(ARCHITECTURE_CFLAGS)
71+
LDFLAGS_EXT = $(ARCHITECTURE_LDFLAGS)
7072

7173
ifeq ($(PLATFORM),Solaris)
7274
FLAG_RELRO =

modules.mk

Lines changed: 4 additions & 4 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.15
22+
LSP_COMMON_LIB_VERSION := 1.0.16
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 := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
2727

28-
LSP_TEST_FW_VERSION := 1.0.9
28+
LSP_TEST_FW_VERSION := 1.0.10
2929
LSP_TEST_FW_NAME := lsp-test-fw
3030
LSP_TEST_FW_TYPE := src
3131
LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git
3232
LSP_TEST_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git
3333

34-
LSP_R3D_IFACE_VERSION := 1.0.0
34+
LSP_R3D_IFACE_VERSION := 1.0.1
3535
LSP_R3D_IFACE_NAME := lsp-r3d-iface
3636
LSP_R3D_IFACE_TYPE := src
3737
LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git
@@ -40,4 +40,4 @@ LSP_R3D_IFACE_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).g
4040
LIBPTHREAD_VERSION := system
4141
LIBPTHREAD_NAME := libpthread
4242
LIBPTHREAD_TYPE := opt
43-
LIBPTHREAD_LDFLAGS := -lpthread
43+
LIBPTHREAD_LDFLAGS := -lpthread

project.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ ARTIFACT_NAME = lsp-r3d-base-lib
2424
ARTIFACT_DESC = Base library for implementing and loading 3D rendering backend
2525
ARTIFACT_HEADERS = lsp-plug.in
2626
ARTIFACT_EXPORT_ALL = 0
27-
ARTIFACT_VERSION = 1.0.0
27+
ARTIFACT_VERSION = 1.0.1

src/Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ $(CXX_OBJ_MAIN) $(CXX_OBJ_EXPORT) $(CXX_OBJ_EXT) $(CXX_OBJ_TEST) $(CXX_OBJ_NOTES
138138
# Producing large object files
139139
$(ARTIFACT_OBJ): $(CXX_OBJ)
140140
@echo " $($(HOST)LD) [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_OBJ))"
141-
@$($(HOST)LD) -o $(ARTIFACT_OBJ) -r $(CXX_OBJ)
141+
@$($(HOST)LD) -o $(ARTIFACT_OBJ) $($(HOST)LDFLAGS) $(CXX_OBJ)
142142

143143
$(ARTIFACT_OBJ_TEST): $(CXX_OBJ_TEST)
144144
echo " $($(HOST)LD) [$(ARTIFACT_NAME)] $(notdir $(ARTIFACT_OBJ_TEST))"
145-
$($(HOST)LD) -o $(ARTIFACT_OBJ_TEST) -r $(CXX_OBJ_TEST)
145+
$($(HOST)LD) -o $(ARTIFACT_OBJ_TEST) $($(HOST)LDFLAGS) $(CXX_OBJ_TEST)
146146

147147
# Linking
148148
all: $(ARTIFACT_TARGETS)
@@ -179,10 +179,8 @@ install: all
179179
$(if $(CXX_INSTALL_HEADERS), mkdir -p "$(DESTDIR)$(INCDIR)")
180180
$(if $(CXX_INSTALL_HEADERS), cp -r "$(CXX_HDR_PATHS)" "$(DESTDIR)$(INCDIR)/")
181181
cp $(ARTIFACT_PC) "$(DESTDIR)$(LIBDIR)/pkgconfig/"
182-
echo $(INSTALL) $(ARTIFACT_LIB) -t "$(DESTDIR)$(LIBDIR)"
183-
$(INSTALL) $(ARTIFACT_LIB) -t "$(DESTDIR)$(LIBDIR)"
184-
echo cp $(ARTIFACT_SLIB) -t "$(DESTDIR)$(LIBDIR)"
185-
cp $(ARTIFACT_SLIB) -t "$(DESTDIR)$(LIBDIR)"
182+
$(INSTALL) $(ARTIFACT_LIB) "$(DESTDIR)$(LIBDIR)/"
183+
cp $(ARTIFACT_SLIB) "$(DESTDIR)$(LIBDIR)/"
186184
ln -sf $(notdir $(ARTIFACT_LIB)) "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_LIBLINK)"
187185
ln -sf $(notdir $(ARTIFACT_SLIB)) "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_SLIBLINK)"
188186
echo "Install OK"

0 commit comments

Comments
 (0)