Skip to content

Commit b4355d2

Browse files
author
livecodeali
committed
Merge branch 'develop' of github.com:livecode/livecode into bugfix-16434
2 parents f07bbd0 + 21539aa commit b4355d2

6,345 files changed

Lines changed: 278767 additions & 127702 deletions

File tree

Some content is hidden

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

‎.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: 13 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
###################
@@ -92,12 +96,16 @@ xcuserdata/
9296
make-*_*/
9397
vsprojects/
9498
xcprojects/
99+
GPATH
100+
GRTAGS
101+
GTAGS
95102

96103
# Build folders #
97104
#################
98105
_build/
99106
_cache/
100107
build/
108+
/_tests/
101109
*-bin/
102110
build-*/
103111

@@ -112,3 +120,8 @@ prebuilt/lib
112120
prebuilt/build
113121
prebuilt/packaged
114122
prebuilt/fetched
123+
124+
# Stamp files and generated C files
125+
###################################
126+
stamp-mlc*
127+
_mlc

‎.gitmodules‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
[submodule "ide"]
22
path = ide
33
url = https://github.com/runrev/livecode-ide
4+
branch = develop
45
[submodule "thirdparty"]
56
path = thirdparty
67
url = https://github.com/runrev/livecode-thirdparty
8+
branch = develop
9+
[submodule "libcpptest/googletest"]
10+
path = libcpptest/googletest
11+
url = https://github.com/google/googletest.git
12+
branch = master
13+

‎.travis.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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+
# Use container-based infrastructure
7+
sudo: false
8+
9+
# Skip vulcan CI branches
10+
branches:
11+
only:
12+
- /^develop.*$/
13+
- /^release.*$/
14+
- coverity_scan
15+
16+
# Environment variables
17+
env:
18+
global:
19+
# The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
20+
# via the "travis encrypt" command using the project repo's public key
21+
- secure: "R/JfoBMrkhCGWhfWM1m3gPHuLtMBlp2SIK1R9BaPbRsbGBUJmAg9V0g0YXSaw8SVxoyuiL/jsLtHPfDeub9oTxrYydew+6/4KaoQdG7EGXQJfBhH2f0ag/hTKJfXnmZX9jMMnTxPf5Axjq+w4E6sKkU2+d1oAJRhrqzYNwDhVlc="
22+
- CXX_STD: "gnu++98"
23+
24+
# Set up the source tree by fetching Linux-specific prebuilt objects
25+
install: (cd prebuilt && ./fetch-libraries.sh linux)
26+
27+
# Bootstrap the LCB compiler, build the default target set and run a
28+
# the default test suite.
29+
script: >
30+
if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then
31+
make all-linux && make check-linux
32+
fi
33+
34+
addons:
35+
# Configuration for Coverity Scan integration
36+
#
37+
# In order to trigger a scan with Coverity, push to the
38+
# 'coverity_scan' branch.
39+
coverity_scan:
40+
project:
41+
name: "runrev/livecode"
42+
description: "Build submitted via Travis CI"
43+
notification_email: engineteam@livecode.com
44+
build_command: "make all-linux"
45+
branch_pattern: coverity_scan
46+
47+
# Packages needed for building LiveCode
48+
apt:
49+
packages:
50+
- libx11-dev
51+
- libxext-dev
52+
- libxrender-dev
53+
- libxft-dev
54+
- libxinerama-dev
55+
- libxv-dev
56+
- libxcursor-dev
57+
- libfreetype6-dev
58+
- libgtk2.0-dev
59+
- libpopt-dev
60+
- libesd0-dev
61+
- liblcms-dev

HACKING.md renamed to CONTRIBUTING.md

File renamed without changes.

‎INSTALL-emscripten.md‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Compiling LiveCode to JavaScript for HTML5
2+
3+
![LiveCode Community Logo](http://livecode.com/wp-content/uploads/2015/02/livecode-logo.png)
4+
5+
Copyright © 2015 LiveCode Ltd., Edinburgh, UK
6+
7+
**Warning**: Emscripten (HTML5) platform support for LiveCode is experimental and not recommended for production use.
8+
9+
## Dependencies
10+
11+
You will need a 64-bit Linux machine or VM with at least 4 GB of RAM
12+
(8 GB is recommended).
13+
14+
### Emscripten SDK
15+
16+
Unsurprisingly, the Emscripten SDK must be installed in order to build
17+
an Emscripten engine.
18+
19+
1. Download the portable Emscripten SDK from <https://kripken.github.io/emscripten/site>. Put it in `/opt/emsdk_portable`, for example.
20+
21+
2. Check what SDKs are available by running:
22+
23+
/opt/emsdk_portable/emsdk list
24+
25+
3. Install and activate the "incoming" SDK by running:
26+
27+
/opt/emsdk_portable/emsdk install sdk-incoming-64bit
28+
/opt/emsdk_portable/emsdk activate sdk-incoming-64bit
29+
30+
This will take a really long time and use an insane amount of RAM.
31+
32+
## Build environment
33+
34+
Before building for Emscripten, source the Emscripten SDK script that sets up the environment correctly. You need to source it with the `.` or `source` command rather than just running it.
35+
36+
source /opt/emsdk_protable/emsdk_env.sh
37+
38+
## Configuring LiveCode
39+
40+
To configure LiveCode, run:
41+
42+
make config-emscripten
43+
44+
This will generate make control files in the `build-emscripten` directory. You can also run `config.sh` directly.
45+
46+
## Compiling LiveCode
47+
48+
LiveCode currently requires some special setup steps to enable building on Emscripten.
49+
50+
To compile LiveCode, run:
51+
52+
make compile-emscripten
53+
54+
This will generate outputs in the `emscripten-bin` directory.
55+
56+
## Running LiveCode
57+
58+
**Note**: See also the "HTML5 Deployment" guide, available in the in-IDE dictionary.
59+
60+
Use the desktop build of the LiveCode IDE to run the standalone builder and create an "HTML5" standalone.
61+
62+
Once you've created a standalone, you can open the HTML file in a web browser to try out the engine.
63+
64+
Some web browsers (including Google Chrome) have JavaScript security policies that won't allow you to run the engine from a local filesystem. For these browsers, you will need to run a local web server. You can use the following steps to launch a local-only webserver listening on port 8080:
65+
66+
cd /path/to/my/standalone
67+
python -m SimpleHTTPServer 8080
68+
69+
You can then load http://localhost:8080/ in a web browser to view your standalone HTML5 engine.
70+

‎INSTALL-linux.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ The following additional packages are installed:
7373
* liblcms-dev
7474
* pkg-config
7575
* libgtk2.0-dev
76+
* zip
7677

7778
### Linux x86
7879

@@ -108,6 +109,7 @@ The following additional packages are installed:
108109
* libesd0-dev
109110
* liblcms-dev
110111
* pkgconfig
112+
* zip
111113

112114
In addition, LiveCode requires a more modern version of GTK+ than is available in the Debian Squeeze repositories. The following packages are compiled and installed from source:
113115

‎INSTALL-win.md‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# Compiling LiveCode for Windows
2+
3+
![LiveCode Community Logo](http://livecode.com/wp-content/uploads/2015/02/livecode-logo.png)
4+
5+
Copyright © 2015 LiveCode Ltd., Edinburgh, UK
6+
7+
## Dependencies
8+
9+
The Windows build scripts currently don't have any ability to auto-discover tools, so you need to **install all of the build dependencies to their default locations**.
10+
11+
### git
12+
13+
You will need to install [git for Windows](https://git-scm.com/download/win) in order to obtain the LiveCode source code from GitHub.
14+
15+
### Microsoft Visual Studio
16+
17+
You will need to download & install [Microsoft Visual Studio 2010 Express](http://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso) (or Professional, if available).
18+
19+
In addition, you should install:
20+
21+
* [Microsoft Speech SDK 5.1](https://www.microsoft.com/en-gb/download/details.aspx?id=10121)
22+
* Microsoft Speech SDK 4.0 - this can be harder to find, but [this link](ftp://ftp.boulder.ibm.com/software/viavoicesdk/sapi4sdk.exe) may work
23+
24+
### Cygwin
25+
26+
The build currently requires the use of some tools from the Cygwin distribution of GNU and other open source tools.
27+
28+
You need to [install Cygwin](https://cygwin.com/install.html), along with the following additional packages:
29+
30+
* make
31+
* bash
32+
* bison
33+
* flex
34+
* curl
35+
* zip
36+
* unzip
37+
38+
### Other tools
39+
40+
The build process also requires:
41+
42+
* [ActiveState Perl](https://www.activestate.com/activeperl/downloads) Community Edition
43+
* [Python 2.7](https://www.python.org/) (Python 3 isn't supported)
44+
* [QuickTime 7.3 SDK for Windows](https://developer.apple.com/downloads)
45+
46+
## Configuring LiveCode
47+
48+
Once you have checked out the source code from git, you can run:
49+
50+
````
51+
cmd /C configure.bat
52+
````
53+
54+
(Or just run `configure.bat` by double-clicking on it from Windows Explorer)
55+
56+
This will generate a set of Visual Studio project files in the `build-win-x86/livecode` directory.
57+
58+
## Compiling LiveCode
59+
60+
To compile LiveCode, you can either open the `build-win-x86/livecode/livecode.sln` solution file in Visual Studio, or you can run:
61+
62+
````
63+
cd build-win-x86
64+
cmd /C ..\make.cmd
65+
````
66+
67+
Note that if you are using Visual Studio 2010 Express you won't be able to compile the revbrowser extension.

0 commit comments

Comments
 (0)