Skip to content

Commit bb8723d

Browse files
brndnmtthwsbrndnmtthws
authored
Add toluapp subtree (brndnmtthws#712)
* First commit! * Import to git * Droping down CMake requirement * Corrected installation of libraries * Adding travis build * Updated cmake macros * Fixed find package * Updated travis hook * Updated travis hook * Patch to support Lua 5.3. * Fix Lua header include directives in tolua++.h Use angle bracket rather than double quotes when including Lua headers in the tolua++ header. This fixes a problem on systems that default to a Lua version newer than 5.1 and install the tolua++ header to the same directory as newer Lua headers. As there are (usually) no Lua headers in the same directory when building tolua++ itself, the preprocessor will look to the include directories passed to the compiler, one of which would be the Lua 5.1 include directory, and tolua++ will build with those (correct) headers. Then the tolua++ header is usually installed in the default include directory, alongside the newer Lua headers, which you wouldn't expect to cause any trouble. But it does cause trouble when trying to build other programs that include the tolua++ header, because now the preprocessor does find Lua headers in the same directory as the tolua++ header, which are the newer (incorrect) headers. Now the program will either fail to compile, because it doesn't support the newer headers, or fail to link with the tolua++ shared object because they were compiled against different Lua headers. Using angle brackets instead of double quotes in the include directives will fix the problem, because then the preprocessor will look to the include directories passed to the compiler first. See http://www.cegui.org.uk/forum/viewtopic.php?f=10&t=7195 * Remove email notifications. * Update travis build. * Build shared and static libs. * Patch toluapp to support Lua 5.3. With this change, support for Lua 5.1 is dropped. This resolve brndnmtthws#116. * Add some comments to clarify the toluapp handling. * Add minor sonar fix.
1 parent 3a30929 commit bb8723d

File tree

131 files changed

+31223
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+31223
-177
lines changed

‎.travis.yml

Lines changed: 43 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ matrix:
1717
- libglib2.0-dev
1818
- libxml2-dev
1919
- libcurl4-gnutls-dev
20-
- liblua5.1-0-dev
21-
- libtolua++5.1-dev
20+
- liblua5.3-dev
2221
- libcairo2-dev
2322
- libimlib2-dev
2423
- libxinerama-dev
@@ -28,7 +27,6 @@ matrix:
2827
- libcairo2-dev
2928
- libmicrohttpd-dev
3029
- ncurses-dev
31-
- liblua5.1-dev
3230
- librsvg2-dev
3331
- libaudclient-dev
3432
- libxmmsclient-dev
@@ -37,7 +35,6 @@ matrix:
3735
- audacious-dev
3836
- libsystemd-dev
3937
- libxml2-dev
40-
- tolua++
4138
- gawk
4239
env:
4340
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
@@ -57,8 +54,7 @@ matrix:
5754
- libglib2.0-dev
5855
- libxml2-dev
5956
- libcurl4-gnutls-dev
60-
- liblua5.1-0-dev
61-
- libtolua++5.1-dev
57+
- liblua5.3-dev
6258
- libcairo2-dev
6359
- libimlib2-dev
6460
- libxinerama-dev
@@ -68,7 +64,6 @@ matrix:
6864
- libcairo2-dev
6965
- libmicrohttpd-dev
7066
- ncurses-dev
71-
- liblua5.1-dev
7267
- librsvg2-dev
7368
- libaudclient-dev
7469
- libxmmsclient-dev
@@ -77,7 +72,6 @@ matrix:
7772
- audacious-dev
7873
- libsystemd-dev
7974
- libxml2-dev
80-
- tolua++
8175
- gawk
8276
env:
8377
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
@@ -97,8 +91,7 @@ matrix:
9791
- libglib2.0-dev
9892
- libxml2-dev
9993
- libcurl4-gnutls-dev
100-
- liblua5.1-0-dev
101-
- libtolua++5.1-dev
94+
- liblua5.3-dev
10295
- libcairo2-dev
10396
- libimlib2-dev
10497
- libxinerama-dev
@@ -108,7 +101,6 @@ matrix:
108101
- libcairo2-dev
109102
- libmicrohttpd-dev
110103
- ncurses-dev
111-
- liblua5.1-dev
112104
- librsvg2-dev
113105
- libaudclient-dev
114106
- libxmmsclient-dev
@@ -117,7 +109,6 @@ matrix:
117109
- audacious-dev
118110
- libsystemd-dev
119111
- libxml2-dev
120-
- tolua++
121112
- gawk
122113
env:
123114
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
@@ -137,8 +128,7 @@ matrix:
137128
- libglib2.0-dev
138129
- libxml2-dev
139130
- libcurl4-gnutls-dev
140-
- liblua5.1-0-dev
141-
- libtolua++5.1-dev
131+
- liblua5.3-dev
142132
- libcairo2-dev
143133
- libimlib2-dev
144134
- libxinerama-dev
@@ -148,7 +138,6 @@ matrix:
148138
- libcairo2-dev
149139
- libmicrohttpd-dev
150140
- ncurses-dev
151-
- liblua5.1-dev
152141
- librsvg2-dev
153142
- libaudclient-dev
154143
- libxmmsclient-dev
@@ -157,7 +146,6 @@ matrix:
157146
- audacious-dev
158147
- libsystemd-dev
159148
- libxml2-dev
160-
- tolua++
161149
- gawk
162150
env:
163151
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
@@ -177,8 +165,7 @@ matrix:
177165
- libglib2.0-dev
178166
- libxml2-dev
179167
- libcurl4-gnutls-dev
180-
- liblua5.1-0-dev
181-
- libtolua++5.1-dev
168+
- liblua5.3-dev
182169
- libcairo2-dev
183170
- libimlib2-dev
184171
- libxinerama-dev
@@ -188,7 +175,6 @@ matrix:
188175
- libcairo2-dev
189176
- libmicrohttpd-dev
190177
- ncurses-dev
191-
- liblua5.1-dev
192178
- librsvg2-dev
193179
- libaudclient-dev
194180
- libxmmsclient-dev
@@ -197,7 +183,6 @@ matrix:
197183
- audacious-dev
198184
- libsystemd-dev
199185
- libxml2-dev
200-
- tolua++
201186
- gawk
202187
env:
203188
- MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
@@ -218,8 +203,7 @@ matrix:
218203
- libglib2.0-dev
219204
- libxml2-dev
220205
- libcurl4-gnutls-dev
221-
- liblua5.1-0-dev
222-
- libtolua++5.1-dev
206+
- liblua5.3-dev
223207
- libcairo2-dev
224208
- libimlib2-dev
225209
- libxinerama-dev
@@ -229,7 +213,6 @@ matrix:
229213
- libcairo2-dev
230214
- libmicrohttpd-dev
231215
- ncurses-dev
232-
- liblua5.1-dev
233216
- librsvg2-dev
234217
- libaudclient-dev
235218
- libxmmsclient-dev
@@ -238,7 +221,6 @@ matrix:
238221
- audacious-dev
239222
- libsystemd-dev
240223
- libxml2-dev
241-
- tolua++
242224
- gawk
243225
sonarcloud:
244226
organization: "brndnmtthws-github"
@@ -256,8 +238,7 @@ before_install:
256238
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then eval "${MATRIX_EVAL}" ; fi
257239
- |
258240
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
259-
brew update;
260-
brew install freetype gettext lua imlib2 ccache;
241+
HOMEBREW_NO_AUTO_UPDATE=1 brew install freetype gettext lua imlib2 librsvg ccache;
261242
export PATH="/usr/local/opt/ccache/libexec:$PATH";
262243
fi
263244
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link gettext --force ; fi
@@ -266,58 +247,60 @@ before_script:
266247
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
267248
mkdir build && cd build
268249
269-
cmake \
250+
cmake \
270251
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
271-
-DBUILD_MYSQL=ON \
272-
-DBUILD_LUA_CAIRO=ON \
273-
-DBUILD_LUA_IMLIB2=ON \
274-
-DBUILD_LUA_RSVG=ON \
275-
-DBUILD_LUA_CAIRO=ON \
276-
-DBUILD_AUDACIOUS=ON \
277-
-DBUILD_XMMS2=ON \
278-
-DBUILD_ICAL=ON \
279-
-DBUILD_IRC=ON \
280-
-DBUILD_HTTP=ON \
281-
-DBUILD_ICONV=ON \
282-
-DBUILD_PULSEAUDIO=ON \
283-
-DBUILD_JOURNAL=ON \
284-
-DBUILD_RSS=ON \
252+
-DBUILD_MYSQL=ON \
253+
-DBUILD_LUA_IMLIB2=ON \
254+
-DBUILD_LUA_RSVG=ON \
255+
-DBUILD_LUA_CAIRO=ON \
256+
-DBUILD_AUDACIOUS=ON \
257+
-DBUILD_XMMS2=ON \
258+
-DBUILD_ICAL=ON \
259+
-DBUILD_IRC=ON \
260+
-DBUILD_HTTP=ON \
261+
-DBUILD_ICONV=ON \
262+
-DBUILD_PULSEAUDIO=ON \
263+
-DBUILD_JOURNAL=ON \
264+
-DBUILD_RSS=ON \
285265
..
286266
cd ..
287267
mkdir build-no-x11
288268
cd build-no-x11
289269
290-
cmake \
270+
cmake \
291271
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
292-
-DBUILD_X11=OFF \
293-
-DBUILD_MYSQL=ON \
294-
-DBUILD_LUA_CAIRO=ON \
295-
-DBUILD_LUA_IMLIB2=ON \
296-
-DBUILD_LUA_RSVG=ON \
297-
-DBUILD_LUA_CAIRO=ON \
298-
-DBUILD_AUDACIOUS=ON \
299-
-DBUILD_XMMS2=ON \
300-
-DBUILD_ICAL=ON \
301-
-DBUILD_IRC=ON \
302-
-DBUILD_HTTP=ON \
303-
-DBUILD_ICONV=ON \
304-
-DBUILD_PULSEAUDIO=ON \
305-
-DBUILD_JOURNAL=ON \
306-
-DBUILD_RSS=ON \
272+
-DBUILD_X11=OFF \
273+
-DBUILD_MYSQL=ON \
274+
-DBUILD_LUA_CAIRO=ON \
275+
-DBUILD_LUA_IMLIB2=ON \
276+
-DBUILD_LUA_RSVG=ON \
277+
-DBUILD_AUDACIOUS=ON \
278+
-DBUILD_XMMS2=ON \
279+
-DBUILD_ICAL=ON \
280+
-DBUILD_IRC=ON \
281+
-DBUILD_HTTP=ON \
282+
-DBUILD_ICONV=ON \
283+
-DBUILD_PULSEAUDIO=ON \
284+
-DBUILD_JOURNAL=ON \
285+
-DBUILD_RSS=ON \
307286
..
308287
cd ..
309288
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
310289
mkdir build && cd build
311-
cmake \
290+
cmake \
312291
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
292+
-DBUILD_LUA_RSVG=ON \
293+
-DBUILD_LUA_IMLIB2=ON \
313294
..
314295
cd ..
315296
316297
mkdir build-no-x11
317298
cd build-no-x11
318-
cmake \
319-
-DBUILD_X11=OFF \
299+
cmake \
320300
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
301+
-DBUILD_X11=OFF \
302+
-DBUILD_LUA_RSVG=ON \
303+
-DBUILD_LUA_IMLIB2=ON \
321304
..
322305
cd ..
323306
fi

‎3rdparty/toluapp/.travis.yml

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
language: cpp
2+
cache: ccache
3+
dist: xenial
4+
matrix:
5+
include:
6+
- os: linux
7+
addons:
8+
apt:
9+
sources:
10+
- ubuntu-toolchain-r-test
11+
packages:
12+
- g++-5
13+
- liblua5.3-dev
14+
env:
15+
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
16+
- os: linux
17+
addons:
18+
apt:
19+
sources:
20+
- ubuntu-toolchain-r-test
21+
packages:
22+
- g++-6
23+
- liblua5.3-dev
24+
env:
25+
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
26+
- os: linux
27+
addons:
28+
apt:
29+
sources:
30+
- ubuntu-toolchain-r-test
31+
packages:
32+
- g++-7
33+
- liblua5.3-dev
34+
env:
35+
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
36+
- os: linux
37+
addons:
38+
apt:
39+
sources:
40+
- ubuntu-toolchain-r-test
41+
packages:
42+
- g++-8
43+
- liblua5.3-dev
44+
env:
45+
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
46+
- os: linux
47+
addons:
48+
apt:
49+
sources:
50+
- llvm-toolchain-xenial-6.0
51+
packages:
52+
- clang-6.0
53+
- liblua5.3-dev
54+
env:
55+
- MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
56+
- os: linux
57+
addons:
58+
apt:
59+
sources:
60+
- llvm-toolchain-xenial-7
61+
packages:
62+
- clang-7
63+
- liblua5.3-dev
64+
env:
65+
- MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
66+
- os: osx
67+
osx_image: xcode9.4
68+
- os: osx
69+
osx_image: xcode10
70+
- os: osx
71+
osx_image: xcode10.1
72+
73+
before_install:
74+
- |
75+
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
76+
brew update;
77+
brew install lua ccache;
78+
export PATH="/usr/local/opt/ccache/libexec:$PATH";
79+
fi
80+
- eval "${MATRIX_EVAL}"
81+
# Combine global build options with OS/compiler-dependent options
82+
- export CMAKE_OPTIONS="${CMAKE_OPTIONS} ${ENV_CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
83+
- export CXX_FLAGS="${CXX_FLAGS} ${ENV_CXX_FLAGS}"
84+
85+
install:
86+
- echo ${PATH}
87+
- echo ${CXX}
88+
- ${CXX} --version
89+
- ${CXX} -v
90+
91+
script:
92+
- mkdir -p build
93+
- cd build
94+
- cmake ${CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS=${CXX_FLAGS} ..
95+
- make -j4
96+
97+
# Only watch the master branch
98+
branches:
99+
only:
100+
- master

0 commit comments

Comments
 (0)