Skip to content

Commit d1fd1fb

Browse files
peter-bpeter-b
committed
Merge branch 'develop' into develop-js.
Initial (highly broken) merge of emscripten support with LiveCode 8 development branch.
2 parents aa1450c + 639e941 commit d1fd1fb

File tree

5,904 files changed

+227491
-113930
lines changed

Some content is hidden

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

5,904 files changed

+227491
-113930
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
*.xml text
1616
*.md text
1717
*.livecodescript text
18+
*.lcdoc text
19+
*.mlc text
20+
*.lcb text
1821

1922
# Declare files that will always have CRLF line endings on checkout.
2023
*.sln text eol=crlf

‎.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ encryptedstack.cpp
2020
encryptedstack.h
2121
stacksecurity_encrypted.cpp
2222
util/perfect/perfect.linux-*
23+
extensions/*/*/*.xml
24+
extensions/*/*/*.lci
25+
extensions/*/*/*.lcm
26+
extensions/*/*/*.lce
2327

2428
# Compiled source and intermediates #
2529
###################
@@ -98,6 +102,7 @@ xcprojects/
98102
_build/
99103
_cache/
100104
build/
105+
/_tests/
101106
*-bin/
102107
build-*/
103108

@@ -112,3 +117,8 @@ prebuilt/lib
112117
prebuilt/build
113118
prebuilt/packaged
114119
prebuilt/fetched
120+
121+
# Stamp files and generated C files
122+
###################################
123+
stamp-mlc*
124+
_mlc

‎.travis.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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+
# Skip vulcan CI branches
7+
branches:
8+
only:
9+
- /^develop.*$/
10+
- /^release.*$/
11+
12+
# Environment variables
13+
env:
14+
global:
15+
# The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
16+
# via the "travis encrypt" command using the project repo's public key
17+
- secure: "R/JfoBMrkhCGWhfWM1m3gPHuLtMBlp2SIK1R9BaPbRsbGBUJmAg9V0g0YXSaw8SVxoyuiL/jsLtHPfDeub9oTxrYydew+6/4KaoQdG7EGXQJfBhH2f0ag/hTKJfXnmZX9jMMnTxPf5Axjq+w4E6sKkU2+d1oAJRhrqzYNwDhVlc="
18+
- CXX_STD: "gnu++98"
19+
20+
# Before setting up the source tree, install necessary development
21+
# headers
22+
before_install:
23+
- sudo apt-get update && 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
24+
25+
# Set up the source tree by fetching Linux-specific prebuilt objects
26+
install: (cd prebuilt && ./fetch-libraries.sh linux)
27+
28+
# Bootstrap the LCB compiler, build the default target set and run a
29+
# the default test suite.
30+
script: >
31+
if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then
32+
make all-linux
33+
fi
34+
35+
# Configuration for Coverity Scan integration
36+
#
37+
# In order to trigger a scan with Coverity, push to the
38+
# 'coverity_scan' branch.
39+
#
40+
addons:
41+
coverity_scan:
42+
project:
43+
name: "runrev/livecode"
44+
description: "Build submitted via Travis CI"
45+
notification_email: [email protected]
46+
build_command: "make all-linux"
47+
branch_pattern: coverity_scan

‎Makefile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ EMMAKE ?= emmake
2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
2828
IPHONEOS_VERSIONS ?= 8.2 8.4
29-
IPHONESIMULATOR_VERSIONS ?= 5.1 6.1 7.1 8.2 8.4
29+
IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 8.4
3030

3131
IOS_SDKS ?= \
3232
$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \
@@ -138,6 +138,12 @@ config-ios-%:
138138
compile-ios-%:
139139
$(XCODEBUILD) -project "build-ios-$*$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE)
140140

141+
# Dummy targets to prevent our build system from building iOS 5.1 simulator
142+
config-ios-iphonesimulator5.1:
143+
@echo "Skipping iOS simulator 5.1 (no longer supported)"
144+
compile-ios-iphonesimulator5.1:
145+
@echo "Skipping iOS simulator 5.1 (no longer supported)"
146+
141147
# Provide some synonyms for "latest iOS SDK"
142148
$(addsuffix -ios-iphoneos,all config compile): %: %8.4
143149
@true

‎builder/commercial.png‎

-18 KB
Loading

‎builder/community.png‎

-17.1 KB
Loading

‎builder/markdown_compiler.rev‎

143 KB
Binary file not shown.

‎builder/tools_installer_resources.rev‎

-17.1 KB
Binary file not shown.

‎common.gypi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
'config/perl.gypi',
1111
'config/target_os.gypi',
1212
'config/thirdparty.gypi',
13+
'config/warnings.gypi',
14+
'config/yacc.gypi',
1315
],
1416
}
1517

‎config/android-settings.gypi‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
{
2+
'cflags':
3+
[
4+
'-Wall',
5+
'-Wextra',
6+
'-fstrict-aliasing',
7+
'-fvisibility=hidden',
8+
],
9+
10+
'cflags_c':
11+
[
12+
'-std=gnu99',
13+
'-Wstrict-prototypes',
14+
],
15+
16+
'cflags_cc':
17+
[
18+
'-std=c++03',
19+
'-fno-exceptions',
20+
'-fno-rtti',
21+
],
22+
23+
'target_conditions':
24+
[
25+
[
26+
'silence_warnings == 0',
27+
{
28+
'cflags':
29+
[
30+
'-Wall',
31+
'-Wextra',
32+
'-Wno-unused-parameter', # Just contributes build noise
33+
],
34+
35+
'cflags_c':
36+
[
37+
'-Werror=declaration-after-statement', # Ensure compliance with C89
38+
],
39+
},
40+
{
41+
'cflags':
42+
[
43+
'-w', # Disable warnings
44+
'-fpermissive', # Be more lax with old code
45+
],
46+
},
47+
],
48+
],
49+
50+
'configurations':
51+
{
52+
'Debug':
53+
{
54+
'cflags':
55+
[
56+
'-O0',
57+
'-g3',
58+
],
59+
60+
'defines':
61+
[
62+
'_DEBUG',
63+
],
64+
},
65+
66+
'Release':
67+
{
68+
'cflags':
69+
[
70+
'-O3',
71+
'-g3',
72+
],
73+
74+
'defines':
75+
[
76+
'_RELEASE',
77+
'NDEBUG',
78+
],
79+
},
80+
81+
'Fast':
82+
{
83+
'cflags':
84+
[
85+
'-O0',
86+
'-g0',
87+
],
88+
89+
'defines':
90+
[
91+
'_RELEASE',
92+
'NDEBUG',
93+
],
94+
},
95+
},
96+
97+
'defines':
98+
[
99+
'TARGET_PLATFORM_MOBILE',
100+
'TARGET_SUBPLATFORM_ANDROID',
101+
'ANDROID',
102+
'_MOBILE',
103+
'ANDROID_NDK',
104+
],
105+
}

0 commit comments

Comments
 (0)