Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 108664a

Browse files
livecodeianlivecodeian
committed
Merge branch 'canvas_path_svg_parse' into feature-canvas_path_arc_to
2 parents b50fbd1 + 42da855 commit 108664a

File tree

291 files changed

+11345
-4555
lines changed

Some content is hidden

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

291 files changed

+11345
-4555
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ xcuserdata/
8686
_build/
8787
_cache/
8888
build/
89+
/_tests/
8990

9091
# SDKs #
9192
#################

‎.travis.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Very basic Travis CI (http://travis-ci.org) control file that allows
2+
# some basic Linux-based continuous integration testing (for free).
3+
4+
language: c++
5+
6+
# Environment variables
7+
env:
8+
global:
9+
# The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
10+
# via the "travis encrypt" command using the project repo's public key
11+
- secure: "R/JfoBMrkhCGWhfWM1m3gPHuLtMBlp2SIK1R9BaPbRsbGBUJmAg9V0g0YXSaw8SVxoyuiL/jsLtHPfDeub9oTxrYydew+6/4KaoQdG7EGXQJfBhH2f0ag/hTKJfXnmZX9jMMnTxPf5Axjq+w4E6sKkU2+d1oAJRhrqzYNwDhVlc="
12+
13+
# Before setting up the source tree, install necessary development
14+
# headers
15+
before_install:
16+
- sudo apt-get install -y libx11-dev libxext-dev libxrender-dev libxft-dev libxinerama-dev libxv-dev libxcursor-dev libfreetype6-dev libgtk2.0-dev libpopt-dev libesd0-dev liblcms-dev
17+
18+
# Set up the source tree by fetching Linux-specific prebuilt objects
19+
install: (cd prebuilt && ./fetch-libraries.sh linux)
20+
21+
# Bootstrap the LCB compiler, build the default target set and run a
22+
# the default test suite.
23+
script: >
24+
if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then
25+
make -s bootstrap && make -s all && make -s check;
26+
fi
27+
28+
# Configuration for Coverity Scan integration
29+
#
30+
# In order to trigger a scan with Coverity, push to the
31+
# 'coverity_scan' branch.
32+
#
33+
addons:
34+
coverity_scan:
35+
project:
36+
name: "runrev/livecode"
37+
description: "Build submitted via Travis CI"
38+
notification_email: [email protected]
39+
build_command_prepend: "make -s thirdparty"
40+
build_command: "make -s bootstrap all"
41+
branch_pattern: coverity_scan

‎Makefile‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ libexternal:
1717
libexternalv1:
1818
$(MAKE) -C ./libexternalv1 libexternalv1
1919

20+
libffi:
21+
$(MAKE) -C ./thirdparty/libffi libffi
22+
2023
libz:
2124
$(MAKE) -C ./thirdparty/libz libz
2225

@@ -38,7 +41,7 @@ libopenssl:
3841
libskia:
3942
$(MAKE) -C ./thirdparty/libskia libskia
4043

41-
libfoundation:
44+
libfoundation: libffi
4245
$(MAKE) -C ./libfoundation libfoundation
4346

4447
libscript:
@@ -193,28 +196,35 @@ libstdscript: lc-compile
193196
$(MAKE) -C ./libscript libstdscript
194197

195198
########## Compiler
196-
lc-compile: libscript libfoundation
199+
lc-compile: libscript libfoundation libffi
197200
$(MAKE) -C ./toolchain lc-compile
198201

199-
lc-bootstrap-compile: libscript libfoundation
202+
lc-bootstrap-compile: libscript libfoundation libffi
200203
$(MAKE) -C ./toolchain bootstrap
201204

202205
lc-compile-clean:
203206
$(MAKE) -C ./toolchain clean
204207

208+
########## Module runner
209+
210+
lc-run: libstdscript libfoundation
211+
$(MAKE) -C ./toolchain lc-run
212+
205213
########## Test runner
206214
lc-test: libstdscript libfoundation
207215
$(MAKE) -C ./toolchain lc-test
208216

209217
########## Tests
210-
lc-test-check: lc-test
218+
lc-run-check: lc-compile lc-run
219+
$(MAKE) -C ./tests/lc-run check
220+
lc-test-check: lc-compile lc-test
211221
$(MAKE) -C ./toolchain lc-test-check
212-
.PHONY: mlc-check
222+
.PHONY: lc-run-check lc-test-check
213223

214224
###############################################################################
215225
# All Targets
216226

217-
.PHONY: all bootstrap clean
227+
.PHONY: all bootstrap thirdparty clean
218228
.DEFAULT_GOAL := all
219229

220230
all: revzip server-revzip
@@ -223,11 +233,15 @@ all: revdb dbodbc dbsqlite dbmysql dbpostgresql
223233
all: server-revdb server-dbodbc server-dbsqlite server-dbmysql server-dbpostgresql
224234
all: development standalone installer server
225235
all: revpdfprinter revandroid
226-
all: lc-test
236+
all: lc-run lc-test
227237

228238
bootstrap: lc-bootstrap-compile
229239

230-
check: lc-test-check
240+
thirdparty: libffi libz libjpeg libpcre libpng libgif libopenssl libskia
241+
thirdparty: libcairopdf libpq libmysql libsqlite libiodbc libxml libxslt
242+
thirdparty: libzip
243+
244+
check: lc-run-check lc-test-check
231245

232246
clean:
233247
-rm -rf _build/linux _cache/linux

0 commit comments

Comments
 (0)