Skip to content

Commit 55cbdef

Browse files
livecodeianlivecodeian
committed
Merge branch 'develop' of https://github.com/livecode/livecode into feature-libbrowser_standalone
2 parents 215aa96 + 4981787 commit 55cbdef

File tree

332 files changed

+14232
-9412
lines changed

Some content is hidden

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

332 files changed

+14232
-9412
lines changed

‎.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ install: (cd prebuilt && ./fetch-libraries.sh linux)
2828
# the default test suite.
2929
script: >
3030
if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then
31-
make all-linux && make -C tests/lcb && make -C tests/lcs
31+
make all-linux && make check-linux
3232
fi
3333
3434
addons:

‎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.

‎Installer/package.txt‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -772,21 +772,21 @@ component Runtime.iOS
772772
file ios:iphonesimulator8.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
773773
file ios:iphonesimulator8.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
774774
file ios:iphonesimulator8.4/fontmap as "fontmap"
775-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_0" place
776-
executable ios:iphonesimulator9.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
777-
executable ios:iphonesimulator9.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
778-
executable ios:iphonesimulator9.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
779-
executable ios:iphonesimulator9.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
780-
executable ios:iphonesimulator9.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
781-
executable ios:iphonesimulator9.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
782-
executable ios:iphonesimulator9.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
783-
executable ios:iphonesimulator9.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
784-
file ios:iphonesimulator9.0/mobile-template.plist as "Settings.plist"
785-
file ios:iphonesimulator9.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
786-
file ios:iphonesimulator9.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
787-
file ios:iphonesimulator9.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
788-
file ios:iphonesimulator9.0/[email protected] as "Default4InchSplash.png" base ios:[email protected]
789-
file ios:iphonesimulator9.0/fontmap as "fontmap"
775+
into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_1" place
776+
executable ios:iphonesimulator9.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
777+
executable ios:iphonesimulator9.1/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
778+
executable ios:iphonesimulator9.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
779+
executable ios:iphonesimulator9.1/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
780+
executable ios:iphonesimulator9.1/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
781+
executable ios:iphonesimulator9.1/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
782+
executable ios:iphonesimulator9.1/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
783+
executable ios:iphonesimulator9.1/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
784+
file ios:iphonesimulator9.1/mobile-template.plist as "Settings.plist"
785+
file ios:iphonesimulator9.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
786+
file ios:iphonesimulator9.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
787+
file ios:iphonesimulator9.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
788+
file ios:iphonesimulator9.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
789+
file ios:iphonesimulator9.1/fontmap as "fontmap"
790790
into "[[ToolsFolder]]/Runtime/iOS/Device-8_2" place
791791
executable ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
792792
executable ios:iphoneos8.2/revsecurity.ios-extension as RevSecurity
@@ -827,26 +827,26 @@ component Runtime.iOS
827827
file ios:iphoneos8.4/template-ResourceRules.plist as "ResourceRules.plist"
828828
file ios:iphoneos8.4/[email protected] as "Default4InchSplash.png" base ios:[email protected]
829829
file ios:iphoneos8.4/fontmap as "fontmap"
830-
into "[[ToolsFolder]]/Runtime/iOS/Device-9_0" place
831-
executable ios:iphoneos9.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
832-
executable ios:iphoneos9.0/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
833-
executable ios:iphoneos9.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
834-
executable ios:iphoneos9.0/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
835-
executable ios:iphoneos9.0/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
836-
executable ios:iphoneos9.0/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
837-
executable ios:iphoneos9.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
838-
executable ios:iphoneos9.0/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
839-
file ios:iphoneos9.0/mobile-device-template.plist as "Settings.plist"
840-
file ios:iphoneos9.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
841-
file ios:iphoneos9.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
842-
file ios:iphoneos9.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
843-
file ios:iphoneos9.0/template-entitlements.xcent as "Entitlements.xcent"
844-
file ios:iphoneos9.0/template-store-entitlements.xcent as "StoreEntitlements.xcent"
845-
file ios:iphoneos9.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
846-
file ios:iphoneos9.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
847-
file ios:iphoneos9.0/template-ResourceRules.plist as "ResourceRules.plist"
848-
file ios:iphoneos9.0/[email protected] as "Default4InchSplash.png" base ios:[email protected]
849-
file ios:iphoneos9.0/fontmap as "fontmap"
830+
into "[[ToolsFolder]]/Runtime/iOS/Device-9_1" place
831+
executable ios:iphoneos9.1/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos8.2/standalone-mobile[[BaseEditionTagLower]].lcext
832+
executable ios:iphoneos9.1/revsecurity.ios-extension as RevSecurity base ios:iphoneos8.2/revsecurity.lcext
833+
executable ios:iphoneos9.1/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos8.2/revpdfprinter.lcext
834+
executable ios:iphoneos9.1/revzip.ios-extension as RevZip base ios:iphoneos8.2/revzip.lcext
835+
executable ios:iphoneos9.1/revxml.ios-extension as RevXml base ios:iphoneos8.2/revxml.lcext
836+
executable ios:iphoneos9.1/revdb.ios-extension as RevDb base ios:iphoneos8.2/revdb.lcext
837+
executable ios:iphoneos9.1/dbsqlite.ios-extension as DbSqlite base ios:iphoneos8.2/dbsqlite.lcext
838+
executable ios:iphoneos9.1/dbmysql.ios-extension as DbMysql base ios:iphoneos8.2/dbmysql.lcext
839+
file ios:iphoneos9.1/mobile-device-template.plist as "Settings.plist"
840+
file ios:iphoneos9.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
841+
file ios:iphoneos9.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
842+
file ios:iphoneos9.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
843+
file ios:iphoneos9.1/template-entitlements.xcent as "Entitlements.xcent"
844+
file ios:iphoneos9.1/template-store-entitlements.xcent as "StoreEntitlements.xcent"
845+
file ios:iphoneos9.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
846+
file ios:iphoneos9.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
847+
file ios:iphoneos9.1/template-ResourceRules.plist as "ResourceRules.plist"
848+
file ios:iphoneos9.1/[email protected] as "Default4InchSplash.png" base ios:[email protected]
849+
file ios:iphoneos9.1/fontmap as "fontmap"
850850

851851
////////////////////////////////////////////////////////////////////////////////
852852

0 commit comments

Comments
 (0)