Merge pull request #2 from montegoulding/meiradarocha-patch-1

Merge patch 1

builder/builder_utilities.livecodescript

@@ -1,6 +1,7 @@
 script "BuilderUtilities"
-constant kMergExtVersion = "2016-7-4"
-constant kTSNetVersion = "1.2"
+
+constant kMergExtVersion = "2016-7-28"
+constant kTSNetVersion = "1.2.1"
 
 local sEngineDir
 local sWorkDir

builder/release_notes_builder.livecodescript

@@ -1006,8 +1006,13 @@ private command DictionaryScan @xAdded, @xModified
 end DictionaryScan
 
 private command DictionaryScanFile pFile, @xAdded, @xModified
-   local tContents
-   put FileGetUTF8Contents(pFile) into tContents
+   local tContents, tError
+   try
+      put FileGetUTF8Contents(pFile) into tContents
+   catch tError
+      BuilderLog "report", tError
+      exit DictionaryScanFile
+   end try
 
    -- Extract basic metadata from the dictionary entry
    local tName, tType, tVersion

builder/tools_builder.livecodescript

@@ -78,7 +78,13 @@ end toolsBuilderRunBundle
 
 private command toolsBuilderFilterExternals pFolder, pPlatform
    -- Enter the extension directory
+   local tOldFolder
+   put the defaultFolder into tOldFolder
    set the defaultFolder to pFolder
+   if the result is not empty then
+      builderLog "error", merge("Failed to enter '[[pFolder]]': [[the result]]")
+      exit toolsBuilderFilterExternals
+   end if
 
    local tFiles
    -- Remove any iOS code if we're not building the OSX installer
@@ -89,17 +95,32 @@ private command toolsBuilderFilterExternals pFolder, pPlatform
       -- Don't remove lcext files ith Android externals in them
       local tLCExt
       repeat for each line tLCExt in tFiles
-         get shell(merge("unzip -l '[[ tLCExt ]]'"))
-         if "Android/External-" is not in it then
-            get shell(merge("rm -rf '[[ tLCExt ]]'"))
+         revZipOpenArchive pFolder & slash & tLCExt, "read"
+         if the result is not empty then
+            builderLog "error", "Cannot open lcext file" && tLCExt
+            exit toolsBuilderFilterExternals
+         end if
+
+         local tArchiveFiles
+         put revZipEnumerateItems(pFolder & slash & tLCExt) into tArchiveFiles
+         filter tArchiveFiles with "Android/External-*"
+         revZipCloseArchive pFolder & slash & tLCExt
+
+         if tArchiveFiles is not empty then
+            get shell(merge("rm -fv '[[ tLCExt ]]'"))
          end if
       end repeat
    end if
 
    -- If the directory contains no code any more, remove it
    put the files & return & the folders into tFiles
    filter lines of tFiles with regex pattern "^.*\.(so|dylib|bundle|dll|lcext)$"
-
+
+   set the defaultFolder to tOldFolder
+   if the result is not empty then
+      builderLog "error", merge("Failed to enter '[[tOldFolder]]': [[the result]]")
+   end if
+
    return tFiles is not empty
 end toolsBuilderFilterExternals
 
@@ -856,4 +877,3 @@ function loadTextFile pFile
    replace numToChar(13) with return in it
    return it
 end loadTextFile
-

config/ios.gypi

@@ -195,7 +195,7 @@
 							'-Werror=uninitialized',
 							'-Werror=return-type',
 							'-Werror=tautological-compare',
-							'-Werror=logical-not-paretheses',
+							'-Werror=logical-not-parentheses',
 						],
 					},
 				},

config/linux-settings.gypi

@@ -8,8 +8,7 @@
 		'exe_suffix': '',
 		'debug_info_suffix': '.dbg',
 
-		# Note: using old name for compatibility with older compilers (like GCC 4.4)
-		'c++_std': '<!(echo ${CXX_STD:-c++0x})',
+		'c++_std': '<!(echo ${CXX_STD:-c++11})',
 	},
 
 	'defines':
@@ -76,8 +75,7 @@
 
 				'cflags_cc':
 				[
-					# Needs GCC 4.7
-					#'-Werror=delete-non-virtual-dtor',
+					'-Werror=delete-non-virtual-dtor',
 				],
 			},
 			{

docs/dictionary/command/XBrowser_Focus.lcdoc

@@ -4,11 +4,12 @@ Type: command
 
 Syntax: XBrowser_Focus [<instanceId>]
 
-Summary: Has no affect, included for backwards comptability
+Summary:
+Has no affect, included for backwards comptability
 
 Introduced: 2.8.1
 
-OS: mac,windows
+OS: mac, windows
 
 Platforms: desktop
 
@@ -18,13 +19,19 @@ Example:
 XBrowser_Focus tBrowserId
 
 Parameters:
-instanceId: The integer identifier of a browser object
+instanceId:
+The integer identifier of a browser object
 
-The result: The XBrowser_Focus command puts empty into the <result>.
+The result:
+The XBrowser_Focus command puts empty into the <result>.
 
 Description:
-The <XBrowser_Focus> command has no effect and is included for backwards compatibility with older applications.
+The <XBrowser_Focus> command has no effect and is included for backwards
+compatibility with older applications.
 
->*Note:* For general information on using the browser library, see the notes in the <revBrowserOpen function> reference.
+>*Note:* For general information on using the browser library, see the
+> notes in the <revBrowserOpen function> reference.
+
+References: XBrowser_Unfocus (command), revBrowserOpen (function),
+revBrowserOpen function (function), result (function)
 
-References: XBrowser_Unfocus (command), revBrowserOpen (function), revBrowserOpen function (function), result (function)

docs/dictionary/command/XBrowser_Init.lcdoc

@@ -2,13 +2,14 @@ Name: XBrowser_Init
 
 Type: command
 
-Syntax: XBrowser_Init <username>, <password> 
+Syntax: XBrowser_Init <username>, <password>
 
-Summary: Is included for backwards compatibility and does nothing.
+Summary:
+Is included for backwards compatibility and does nothing.
 
 Introduced: 2.8.1
 
-OS: mac,windows
+OS: mac, windows
 
 Platforms: desktop
 
@@ -18,12 +19,19 @@ Example:
 XBrowser_Init "myUsername", "myPassword"
 
 Parameters:
-username: 
-password: 
+username:
+
+
+password:
+
 
 Description:
-The <XBrowser_Init> command is included for backwards compatibility with altBrowser 2.x and 1.x. The command is no longer needed and calling it has no affect.
+The <XBrowser_Init> command is included for backwards compatibility with
+altBrowser 2.x and 1.x. The command is no longer needed and calling it
+has no affect.
 
->*Note:* For general information on using the browser library, see the notes in the <revBrowserOpen function> reference.
+>*Note:* For general information on using the browser library, see the
+> notes in the <revBrowserOpen function> reference.
 
 References: revBrowserOpen (function), revBrowserOpen function (function)
+

docs/dictionary/command/XBrowser_Unfocus.lcdoc

@@ -4,11 +4,12 @@ Type: command
 
 Syntax: XBrowser_Unfocus [<instanceId>]
 
-Summary: Has no affect, included for backwards compatibility
+Summary:
+Has no affect, included for backwards compatibility
 
 Introduced: 2.8.1
 
-OS: mac,windows
+OS: mac, windows
 
 Platforms: desktop
 
@@ -18,13 +19,19 @@ Example:
 XBrowser_Unfocus tBrowserId
 
 Parameters:
-instanceId: The integer identifier of a browser object
+instanceId:
+The integer identifier of a browser object
 
-The result: The <XBrowser_Unfocus> command puts empty into the <result>.
+The result:
+The <XBrowser_Unfocus> command puts empty into the <result>.
 
 Description:
-The <XBrowser_Unfocus> command has no affect and is included for backwards compatibility with older applications.
+The <XBrowser_Unfocus> command has no affect and is included for
+backwards compatibility with older applications.
 
->*Note:* For general information on using the browser library, see the notes in the <revBrowserOpen function> reference.
+>*Note:* For general information on using the browser library, see the
+> notes in the <revBrowserOpen function> reference.
+
+References: XBrowser_Focus (command), result (function),
+revBrowserOpen function (function)
 
-References: XBrowser_Focus (command), result (function), revBrowserOpen function (function)

docs/dictionary/command/accept.lcdoc

@@ -2,15 +2,17 @@ Name: accept
 
 Type: command
 
-Syntax: accept [datagram] connections on port <portNumber> with message <callbackMessage> 
+Syntax: accept [datagram] connections on port <portNumber> with message <callbackMessage>
 
-Summary: Accepts an internet connection and creates a <socket> for that connection.
+Summary:
+Accepts an internet connection and creates a <socket> for that
+connection. 
 
 Introduced: 1.0
 
-OS: mac,windows,linux,iOS,android
+OS: mac, windows, linux, ios, android
 
-Platforms: desktop,server,web,mobile
+Platforms: desktop, server, mobile
 
 Security: network
 
@@ -30,28 +32,56 @@ on connectionMade pIPAddress
 end connectionMade
 
 Parameters:
-callbackMessage: The name of a message to be sent when a connection is made or a datagram is received.
-portNumber: The TCP port number on which to accept connections.
+callbackMessage:
+The name of a message to be sent when a connection is made or a datagram
+is received.
 
-Description:
-Use the <accept> <command> when running a <server>, to accept <TCP> connections or <UDP> <datagram|datagrams> from other systems (or other <process|processes> on the same system).
-Use the datagram option if you want to accept UDP datagrams.
-
-When a connection is made or a datagram is received, the <accept> <command> creates a new <socket> that can be used to communicate with the other system (or <process>). When using the <close socket>, <read from socket>, or <write to socket> <command|commands>, you can refer to this <socket> with a socket identifier that looks like this:
-host:port[|connectionID]
-where the connectionID is a number assigned by the <accept> <command>. (You only need to specify the connection number if there is more than one <socket> connected to a particular <port> and <host>.)
+portNumber:
+The TCP port number on which to accept connections.
 
-The <callbackMessage> is sent to the <object(glossary)> whose <script> contains the <accept> <command>. Either one or two <parameter|parameters> are sent with this <message>. The first <parameter> is the <IP address> of the system or <process> making the connection. If a <datagram> is being accepted, the second <parameter> is the contents of the <datagram>.
+Description:
+Use the <accept> <command> when running a <server>, to accept <TCP>
+connections or <UDP> <datagram|datagrams> from other systems (or other
+<process|processes> on the same system). Use the datagram option if you
+want to accept UDP datagrams.
+
+When a connection is made or a datagram is received, the <accept>
+<command> creates a new <socket> that can be used to communicate with
+the other system (or <process>). When using the <close socket>, <read
+from socket>, or <write to socket> <command|commands>, you can refer to
+this <socket> with a socket identifier that looks like this:
+host:port[|connectionID] where the connectionID is a number assigned by
+the <accept> <command>. (You only need to specify the connection number
+if there is more than one <socket> connected to a particular <port> and
+<host>.) 
+
+The <callbackMessage> is sent to the <object(glossary)> whose <script>
+contains the <accept> <command>. Either one or two
+<parameter|parameters> are sent with this <message>. The first
+<parameter> is the <IP address> of the system or <process> making the
+connection. If a <datagram> is being accepted, the second <parameter> is
+the contents of the <datagram>.
 
 - For technical information about sockets, see [RFC
   147](https://tools.ietf.org/html/rfc147)
 - For technical information about UDP datagrams, see [RFC
   768](https://tools.ietf.org/html/rfc768)
 - For technical information about the numbers used to designate
   standard ports, see the
-  [official IANA list of port assignments](https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml)
+  [official IANA list of port
+  assignments](https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml)
   and [RFC 6335](https://tools.ietf.org/html/rfc6335)
 
-References: HTTPProxy (property), script (property), read from socket (command), write to socket (command), close socket (command), open socket (command), openSockets (function), hostAddressToName (function), hostName (function), hostAddress (function), peerAddress (function), hostNameToAddress (function), datagram (glossary), IP address (glossary), TCP (glossary), port (glossary), command (glossary), socket (glossary), UDP (glossary), host (glossary), server (glossary), message (glossary), parameter (glossary), process (glossary), object (glossary)
+
+References: read from socket (command), write to socket (command),
+close socket (command), open socket (command), openSockets (function),
+hostAddressToName (function), hostName (function), hostAddress (function),
+peerAddress (function), hostNameToAddress (function), datagram (glossary),
+IP address (glossary), TCP (glossary), port (glossary),
+command (glossary), socket (glossary), UDP (glossary), host (glossary),
+server (glossary), message (glossary), parameter (glossary),
+process (glossary), object (glossary), HTTPProxy (property),
+script (property)
 
 Tags: networking
+

docs/dictionary/command/add.lcdoc

@@ -2,17 +2,19 @@ Name: add
 
 Type: command
 
-Syntax: add <number> to [<chunk> of] <container> 
+Syntax: add <number> to [<chunk> of] <container>
 
-Syntax: add {<number> | <array>} to <arrayContainer> 
+Syntax: add {<number> | <array>} to <arrayContainer>
 
-Summary: Adds a number to a <container> and places the resulting <value> in the <container>.
+Summary:
+Adds a number to a <container> and places the resulting <value> in the
+<container>. 
 
 Introduced: 1.0
 
-OS: mac,windows,linux,ios,android
+OS: mac, windows, linux, ios, android
 
-Platforms: desktop,server,web
+Platforms: desktop, server
 
 Example:
 add 7 to field 1
@@ -42,11 +44,22 @@ on mouseUp
 end mouseUp
 
 Parameters:
-number: An expression that evaluates to a number.
-chunk: A chunk expression specifying a portion of the container.
-container: A field, button, or variable, or the message box.
-array (array): An array variable each of whose elements is a number.
-arrayContainer (array): An array variable each of whose elements is a number.
+number:
+An expression that evaluates to a number.
+
+chunk:
+A chunk expression specifying a portion of the container.
+
+container:
+A field, button, or variable, or the message box.
+
+array (array):
+An array variable each of whose elements is a number.
+
+
+arrayContainer (array):
+An array variable each of whose elements is a number.
+
 
 Description:
 Use the <add> <command> to add a number to a <container> or a portion of
@@ -67,11 +80,12 @@ empty, the <add> <command> treats its contents as zero.
 If <container> is a <field> or <button>, the <format> of the sum is
 determined by the <numberFormat> <property>.
 
-References: array (glossary), button (object), combine (command), 
-command (glossary), container (glossary), element (glossary), 
-element (keyword), evaluate (glossary), expression (glossary), 
-field (object), format (glossary), multiply (command), 
-numberFormat (property), property (glossary), split (command), 
-sum (function), union (command), value (function)
+References: combine (command), multiply (command), split (command),
+union (command), sum (function), value (function), array (glossary),
+command (glossary), container (glossary), element (glossary),
+evaluate (glossary), expression (glossary), format (glossary),
+property (glossary), element (keyword), button (object), field (object),
+numberFormat (property)
 
 Tags: math
+