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

Commit 97b61d1

Browse files
peter-bpeter-b
committed
Merge branch 'develop' into nothrow_new
The following conflicts, due to Coverity defect fixes by @montegoulding that touched some of the same lines, were resolved by taking the `develop` version and adding `(nothrow)` as applicable: engine/src/hc.cpp engine/src/opensslsocket.cpp
2 parents 6a8e2e0 + 1964694 commit 97b61d1

File tree

168 files changed

+1308
-844
lines changed

Some content is hidden

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

168 files changed

+1308
-844
lines changed

‎.travis.yml‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ os:
1111
- linux
1212
- osx
1313

14+
# Use a Travis image containing an Xcode we support
15+
# This prevents surprise upgrades!
16+
osx_image: xcode7.3
17+
1418
language: c++
1519

1620
# Skip vulcan CI branches
@@ -30,7 +34,11 @@ env:
3034

3135
# Install any required tools
3236
before_install:
33-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then sudo gem install xcpretty ; fi
37+
- |
38+
if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then
39+
rvm --default use 2.2.1
40+
gem install xcpretty
41+
fi
3442
3543
# Set up the source tree by fetching Linux-specific prebuilt objects
3644
install:
@@ -39,19 +47,20 @@ install:
3947

4048
# Bootstrap the LCB compiler, build the default target set and run a
4149
# the default test suite.
42-
script: >
50+
script: |
4351
case "${TRAVIS_OS_NAME}" in
4452
linux)
45-
BUILD_PLATFORM=linux ;
46-
CHECK_COMMAND=xvfb-run ;
47-
LICENSE_DIR="${HOME}/.runrev/licenses" ;
53+
BUILD_PLATFORM=linux
54+
CHECK_COMMAND=xvfb-run
55+
LICENSE_DIR="${HOME}/.runrev/licenses"
4856
;;
4957
osx)
50-
BUILD_PLATFORM=mac ;
51-
CHECK_COMMAND= ;
52-
LICENSE_DIR="${HOME}/Library/Application Support/RunRev/Licenses" ;
53-
export XCODEBUILD="set -o pipefail && xcodebuild" ;
54-
export XCODEBUILD_FILTER="| xcpretty" ;
58+
BUILD_PLATFORM=mac
59+
CHECK_COMMAND=
60+
LICENSE_DIR="${HOME}/Library/Application Support/RunRev/Licenses"
61+
export XCODE_TARGET_SDK=macosx10.11
62+
export XCODEBUILD="set -o pipefail && xcodebuild"
63+
export XCODEBUILD_FILTER="| xcpretty"
5564
;;
5665
esac
5766
@@ -90,4 +99,4 @@ addons:
9099
- libpopt-dev
91100
- libesd0-dev
92101
- liblcms-dev
93-
- xvfb
102+
- xvfb

‎Makefile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,7 @@ else
4545
endif
4646

4747
# Prettifying output for CI builds
48-
ifeq ($(TRAVIS),true)
49-
XCODEBUILD := set -o pipefail && $(XCODEBUILD)
50-
XCODEBUILD_FILTER := | xcpretty
51-
else
52-
XCODEBUILD_FILTER :=
53-
endif
48+
XCODEBUILD_FILTER ?=
5449

5550
include Makefile.common
5651

‎builder/builder_utilities.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
script "BuilderUtilities"
22

3-
constant kMergExtVersion = "2016-9-19"
3+
constant kMergExtVersion = "2016-10-3"
44
constant kTSNetVersion = "1.2.3"
55

66
local sEngineDir

‎builder/business.png‎

6.87 KB
Loading

‎builder/[email protected]‎

10.5 KB
Loading

‎builder/tools_builder.livecodescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private command toolsBuilderFilterExternals pFolder, pPlatform
106106
filter tArchiveFiles with "Android/External-*"
107107
revZipCloseArchive pFolder & slash & tLCExt
108108

109-
if tArchiveFiles is not empty then
109+
if tArchiveFiles is empty then
110110
get shell(merge("rm -fv '[[ tLCExt ]]'"))
111111
end if
112112
end repeat

‎builder/tools_installer_resources.rev‎

100644100755
-1.48 KB
Binary file not shown.

‎docs/contributing_to_docs.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Requests' menu item at the top of the GitHub website.
264264

265265
**Sign the CLA if you haven't already**
266266

267-
Go to the list of pull requests and click on the the link to your pull request.
267+
Go to the list of pull requests and click on the link to your pull request.
268268
If you have not signed the Contributor's Agreement, livecode-vulcan will have commented (or will soon!)
269269
to ask you to:
270270
1. Sign the LiveCode CLA

‎docs/dictionary/command/choose.lcdoc‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,29 @@ choose tSavedTool tool
2222
Parameters:
2323
toolName (enum):
2424

25-
- select: select a rectangle in an image * pencil: draw freehand in
26-
an image * bucket: fill a shape in an image * brush: draw
27-
brushstrokes in an image * eraser: erase an area in an image * spray
28-
can: draw airbrush strokes in an image * rectangle: draw a rectangle
29-
or square shape * line: draw a straight line in an image * round
30-
rect: draw a rectangle with rounded corners in an image * oval: draw
31-
an oval or circle shape in an image * polygon: draw a polygon in an
32-
image * curve: draw a curved line in an image * regular polygon:
33-
draw a regular polygon shape in an image * dropper: pick up a color
34-
from an image
35-
- "browse": perform actions such as clicking buttons and typing in
25+
- select: select a rectangle in an image
26+
- pencil: draw freehand in an image
27+
- bucket: fill a shape in an image
28+
- brush: draw brushstrokes in an image
29+
- eraser: erase an area in an image
30+
- spray can: draw airbrush strokes in an image
31+
- rectangle: draw a rectangle or square shape
32+
- line: draw a straight line in an image
33+
- round rect: draw a rectangle with rounded corners in an image
34+
- oval: draw an oval or circle shape in an image
35+
- polygon: draw a polygon in an image
36+
- curve: draw a curved line in an image
37+
- regular polygon: draw a regular polygon shape in an image
38+
- dropper: pick up a color from an image
39+
- browse: perform actions such as clicking buttons and typing in
3640
fields
37-
- "pointer": select, move, or resize objects
38-
- "button": create all styles of button objects
39-
- "field": create all styles of field objects
40-
- "scrollbar": create all styles of scrollbar objects
41-
- "graphic": create all styles of graphic objects
42-
- "image": create paint images
43-
- "player": create sound and video player objects
41+
- pointer: select, move, or resize objects
42+
- button: create all styles of button objects
43+
- field: create all styles of field objects
44+
- scrollbar: create all styles of scrollbar objects
45+
- graphic: create all styles of graphic objects
46+
- image: create paint images
47+
- player: create sound and video player objects
4448

4549

4650
Description:

‎docs/dictionary/command/constant.lcdoc‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ OS: mac, windows, linux, ios, android
1414
Platforms: desktop, server, mobile
1515

1616
Example:
17-
constant defaultName="Jones"
17+
constant kDefaultName="Jones"
1818

1919
Example:
20-
constant entryA="EF9993333WX786",entryB="GJ773281YX342"
20+
constant kEntryA="EF9993333WX786",kEntryB="GJ773281YX342"
2121

2222
Parameters:
23-
constantsList (enum):
24-
The constantsList consists of one or more name=value pairs, separated by
25-
commas:
23+
constantsList:
24+
The constantsList consists of one or more 'name=value' pairs,
25+
separated by commas:
2626

27-
- The name is any string.
28-
- The value is any literal string.
27+
- The 'name' is any string.
28+
- The 'value' is any literal string.
2929

3030

3131
Description:
@@ -39,7 +39,9 @@ A constant cannot be defined as an array, only as a single value.
3939
>*Note:* Choose easy-to-understand names for
4040
> <constant(glossary)|constants> to improve the readability of your
4141
> code. Use <constant(glossary)|constants> as substitutes for long or
42-
> convoluted <string|strings>.
42+
> convoluted <string|strings>. Use the prefix letter k for your constant
43+
> names to follow convention and make it easy to recognise. See the
44+
> Tips For Writing Good Code in the Livecode Script Guide.
4345

4446
If you place the <constant> <statement> in a <handler>, you can use the
4547
<constant(command)> anywhere in the <handler>. If you place the

0 commit comments

Comments
 (0)