Skip to content

Commit 23d0195

Browse files
sadko4usadko4u
committed
Release 1.0.0
* Updated build system.
2 parents de52f0a + 7bbca73 commit 23d0195

File tree

15 files changed

+593
-231
lines changed

15 files changed

+593
-231
lines changed

‎.cproject

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
3+
<storageModule moduleId="org.eclipse.cdt.core.settings">
4+
<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.705626182">
5+
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.705626182" moduleId="org.eclipse.cdt.core.settings" name="Debug">
6+
<externalSettings/>
7+
<extensions>
8+
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
9+
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
10+
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
11+
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
12+
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
13+
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
14+
</extensions>
15+
</storageModule>
16+
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
17+
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.705626182" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
18+
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.705626182." name="/" resourcePath="">
19+
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.2068026832" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
20+
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.171051444" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
21+
<builder buildPath="${workspace_loc:/lsp-r3d-base-lib}/Debug" id="cdt.managedbuild.target.gnu.builder.exe.debug.1724940219" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
22+
<tool id="cdt.managedbuild.tool.gnu.archiver.base.2032604303" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
23+
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.2129546456" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
24+
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.262262231" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
25+
<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="gnu.cpp.compiler.exe.debug.option.debugging.level.1437838868" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
26+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.954036238" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
27+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-common-lib/include}&quot;"/>
28+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-test-fw/include}&quot;"/>
29+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-r3d-iface/include}&quot;"/>
30+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
31+
</option>
32+
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.641013938" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
33+
</tool>
34+
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1381029469" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
35+
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.1318895367" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
36+
<option defaultValue="gnu.c.debugging.level.max" id="gnu.c.compiler.exe.debug.option.debugging.level.1944991086" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
37+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.1070386095" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
38+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-common-lib/include}&quot;"/>
39+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-test-fw/include}&quot;"/>
40+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
41+
</option>
42+
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.736688226" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
43+
</tool>
44+
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1514007439" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
45+
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1664616527" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
46+
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1107016539" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
47+
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
48+
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
49+
</inputType>
50+
</tool>
51+
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.329142891" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
52+
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1562963109" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
53+
</tool>
54+
</toolChain>
55+
</folderInfo>
56+
<sourceEntries>
57+
<entry excluding="modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
58+
</sourceEntries>
59+
</configuration>
60+
</storageModule>
61+
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
62+
</cconfiguration>
63+
<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.522549111">
64+
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.522549111" moduleId="org.eclipse.cdt.core.settings" name="Release">
65+
<externalSettings/>
66+
<extensions>
67+
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
68+
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
69+
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
70+
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
71+
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
72+
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
73+
</extensions>
74+
</storageModule>
75+
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
76+
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.522549111" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
77+
<folderInfo id="cdt.managedbuild.config.gnu.exe.release.522549111." name="/" resourcePath="">
78+
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.819657818" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
79+
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1015609417" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
80+
<builder buildPath="${workspace_loc:/lsp-r3d-base-lib}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.722261237" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
81+
<tool id="cdt.managedbuild.tool.gnu.archiver.base.414296687" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
82+
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1791111980" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
83+
<option id="gnu.cpp.compiler.exe.release.option.optimization.level.984701037" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
84+
<option defaultValue="gnu.cpp.compiler.debugging.level.none" id="gnu.cpp.compiler.exe.release.option.debugging.level.1265681203" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
85+
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1616599406" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
86+
</tool>
87+
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.676858264" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
88+
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.585862832" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
89+
<option defaultValue="gnu.c.debugging.level.none" id="gnu.c.compiler.exe.release.option.debugging.level.2085962841" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
90+
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1200202128" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
91+
</tool>
92+
<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.804882748" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
93+
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.2041804084" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
94+
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1181369357" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
95+
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
96+
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
97+
</inputType>
98+
</tool>
99+
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1687262707" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
100+
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.2075186501" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
101+
</tool>
102+
</toolChain>
103+
</folderInfo>
104+
<sourceEntries>
105+
<entry excluding="modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
106+
</sourceEntries>
107+
</configuration>
108+
</storageModule>
109+
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
110+
</cconfiguration>
111+
</storageModule>
112+
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
113+
<project id="lsp-r3d-base-lib.cdt.managedbuild.target.gnu.exe.109059817" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
114+
</storageModule>
115+
<storageModule moduleId="scannerConfiguration">
116+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
117+
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.705626182;cdt.managedbuild.config.gnu.exe.debug.705626182.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1381029469;cdt.managedbuild.tool.gnu.c.compiler.input.736688226">
118+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
119+
</scannerConfigBuildInfo>
120+
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.522549111;cdt.managedbuild.config.gnu.exe.release.522549111.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.676858264;cdt.managedbuild.tool.gnu.c.compiler.input.1200202128">
121+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
122+
</scannerConfigBuildInfo>
123+
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.522549111;cdt.managedbuild.config.gnu.exe.release.522549111.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1791111980;cdt.managedbuild.tool.gnu.cpp.compiler.input.1616599406">
124+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
125+
</scannerConfigBuildInfo>
126+
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.705626182;cdt.managedbuild.config.gnu.exe.debug.705626182.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.2129546456;cdt.managedbuild.tool.gnu.cpp.compiler.input.641013938">
127+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
128+
</scannerConfigBuildInfo>
129+
</storageModule>
130+
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
131+
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
132+
<storageModule moduleId="refreshScope" versionNumber="2">
133+
<configuration configurationName="Debug">
134+
<resource resourceType="PROJECT" workspacePath="/lsp-r3d-base-lib"/>
135+
</configuration>
136+
<configuration configurationName="Release">
137+
<resource resourceType="PROJECT" workspacePath="/lsp-r3d-base-lib"/>
138+
</configuration>
139+
</storageModule>
140+
</cproject>

‎.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-r3d-base-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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
* RECENT CHANGES
33
*******************************************************************************
44

5+
=== 1.0.0 ===
6+
* Updated build system.
7+
58
=== 0.5.5 ===
69
* Updated build system.
710

‎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: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,15 @@
1818
# along with lsp-r3d-base-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 := hdr
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 \
25+
LSP_R3D_IFACE
2626

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
27+
TEST_DEPENDENCIES = \
28+
LSP_TEST_FW
3129

32-
LSP_R3D_IFACE_VERSION := 0.5.2
33-
LSP_R3D_IFACE_NAME := lsp-r3d-iface
34-
LSP_R3D_IFACE_TYPE := src
35-
LSP_R3D_IFACE_URL := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git
36-
37-
LIBPTHREAD_VERSION := system
38-
LIBPTHREAD_NAME := libpthread
39-
LIBPTHREAD_TYPE := opt
40-
LIBPTHREAD_LDFLAGS := -lpthread
30+
ALL_DEPENDENCIES = \
31+
$(DEPENDENCIES) \
32+
$(TEST_DEPENDENCIES)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#ifndef LSP_PLUG_IN_R3D_VERSION_H_
2323
#define LSP_PLUG_IN_R3D_VERSION_H_
2424

25-
#define LSP_R3D_BASE_LIB_MAJOR 0
26-
#define LSP_R3D_BASE_LIB_MINOR 5
27-
#define LSP_R3D_BASE_LIB_MICRO 5
25+
#define LSP_R3D_BASE_LIB_MAJOR 1
26+
#define LSP_R3D_BASE_LIB_MINOR 0
27+
#define LSP_R3D_BASE_LIB_MICRO 0
2828

2929
#ifdef LSP_R3D_BASE_LIB_BUILTIN
3030
#define LSP_R3D_BASE_LIB_EXPORT

0 commit comments

Comments
 (0)