From ddac03c36e6cb393bcf0bdac5b5d5cf2d2ae1bc4 Mon Sep 17 00:00:00 2001 From: Mark Wieder Date: Mon, 22 Jul 2019 21:42:33 -0700 Subject: [PATCH 1/7] Fixes the dbsqlite gyp file for building on linux Or more properly to avoid crashing on launch after building from source --- revdb/revdb.gyp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/revdb/revdb.gyp b/revdb/revdb.gyp index a516499b2a3..de38118299d 100644 --- a/revdb/revdb.gyp +++ b/revdb/revdb.gyp @@ -539,6 +539,10 @@ # Error in ../../thirdparty/libsqlite/include/qry_dat.h '-Werror=return-type', ], + 'defines': + [ + '_GLIBCXX_USE_CXX11_ABI=0', + ], }, ], [ @@ -652,6 +656,10 @@ '-lstdc++', '-Wl,-Bdynamic', ], + 'defines': + [ + '_GLIBCXX_USE_CXX11_ABI=0', + ], }, ], ], From c9b7e96c0c07be67dc039d1f80fd0ce59ffb257f Mon Sep 17 00:00:00 2001 From: livecodesam Date: Thu, 1 Aug 2019 11:04:01 +0100 Subject: [PATCH 2/7] Update log.lcdoc Added absent reference --- docs/dictionary/command/log.lcdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/dictionary/command/log.lcdoc b/docs/dictionary/command/log.lcdoc index 0bed4394a5c..7fc5f66e58a 100644 --- a/docs/dictionary/command/log.lcdoc +++ b/docs/dictionary/command/log.lcdoc @@ -47,6 +47,6 @@ to turn the logging off for a release build. The may be set to any handler name, however, if the handler is not in the message path then use of the command will throw a `can't find handler` error. -References: log (command), put (command), msgChanged (message) +References: put (command), msgChanged (message), logMessage (property) Tags: debugging From a4c7f44e2634e3ded35626ebdf97617771208cc1 Mon Sep 17 00:00:00 2001 From: livecodesam Date: Thu, 1 Aug 2019 11:05:39 +0100 Subject: [PATCH 3/7] Create 22278.md --- docs/notes/22278.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/notes/22278.md diff --git a/docs/notes/22278.md b/docs/notes/22278.md new file mode 100644 index 00000000000..c2beb3fd451 --- /dev/null +++ b/docs/notes/22278.md @@ -0,0 +1 @@ +# Corrected missing text issue in the documentation for the log command From aa76aaa4e2ce545d23a1819b1ffffc0b04389168 Mon Sep 17 00:00:00 2001 From: livecodesam Date: Thu, 1 Aug 2019 11:06:03 +0100 Subject: [PATCH 4/7] Rename 22278.md to bugfix-22278.md --- docs/notes/{22278.md => bugfix-22278.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/notes/{22278.md => bugfix-22278.md} (100%) diff --git a/docs/notes/22278.md b/docs/notes/bugfix-22278.md similarity index 100% rename from docs/notes/22278.md rename to docs/notes/bugfix-22278.md From ef82f8f5f72b45fe00ef99efee32c3a921692647 Mon Sep 17 00:00:00 2001 From: livecodesam Date: Thu, 1 Aug 2019 11:43:56 +0100 Subject: [PATCH 5/7] Update log.lcdoc Additional change to the first sentence per suggestion. --- docs/dictionary/command/log.lcdoc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/dictionary/command/log.lcdoc b/docs/dictionary/command/log.lcdoc index 7fc5f66e58a..28b0a227646 100644 --- a/docs/dictionary/command/log.lcdoc +++ b/docs/dictionary/command/log.lcdoc @@ -38,14 +38,15 @@ A comma separated list of expressions containing the arguments to send. Arrays are expressions and are valid to send as arguments. Description: -The command invokes the handler. When the is the -default value of `log` then the command behaves in the same way as any -other scripted handler. If the is set to empty then the -command does not invoke any handler or evaluate parameters, therefore, allowing -for many logs to be added to scripts for development and an easy low-cost method -to turn the logging off for a release build. The may be set to any -handler name, however, if the handler is not in the message path then use of the - command will throw a `can't find handler` error. +The command invokes the handler specified by the property. +When the is the default value of `log` then the command +behaves in the same way as any other scripted handler. If the is +set to empty then the command does not invoke any handler or evaluate +parameters, therefore, allowing for many logs to be added to scripts for +development and an easy low-cost method to turn the logging off for a release +build. The may be set to any handler name, however, if the +handler is not in the message path then use of the command will throw a +`can't find handler` error. References: put (command), msgChanged (message), logMessage (property) From 6952c353472ab4e17fde4502cc6bbaad65bb6868 Mon Sep 17 00:00:00 2001 From: livecodepanos Date: Wed, 18 Sep 2019 16:20:44 +0300 Subject: [PATCH 6/7] Reverted ide and version --- ide | 2 +- version | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ide b/ide index 7979fcdf29f..5f188495990 160000 --- a/ide +++ b/ide @@ -1 +1 @@ -Subproject commit 7979fcdf29f91a3239aef140c5de5efc181f8b6a +Subproject commit 5f188495990dd6fca83752d1f7763c4c94db4bed diff --git a/version b/version index 30cc6a8e470..44efd760324 100644 --- a/version +++ b/version @@ -1,6 +1,6 @@ -BUILD_REVISION = 15504 +BUILD_REVISION = 15501 BUILD_MAJOR_VERSION = 9 BUILD_MINOR_VERSION = 5 -BUILD_POINT_VERSION = 1 -BUILD_SHORT_VERSION = 9.5.1-rc-1 -BUILD_LONG_VERSION = 9.5.1.15504 (RC 1) +BUILD_POINT_VERSION = 0 +BUILD_SHORT_VERSION = 9.5.0-rc-1 +BUILD_LONG_VERSION = 9.5.0.15501 (RC 1) From 8f9b09e5723dc4478d133bbabfcf3d58b2ea9eb6 Mon Sep 17 00:00:00 2001 From: livecodepanos Date: Wed, 18 Sep 2019 16:37:02 +0300 Subject: [PATCH 7/7] [9.6 dp1] Updated version --- version | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/version b/version index 44efd760324..8c62bfa1262 100644 --- a/version +++ b/version @@ -1,6 +1,6 @@ -BUILD_REVISION = 15501 +BUILD_REVISION = 15510 BUILD_MAJOR_VERSION = 9 -BUILD_MINOR_VERSION = 5 +BUILD_MINOR_VERSION = 6 BUILD_POINT_VERSION = 0 -BUILD_SHORT_VERSION = 9.5.0-rc-1 -BUILD_LONG_VERSION = 9.5.0.15501 (RC 1) +BUILD_SHORT_VERSION = 9.6.0-dp-1 +BUILD_LONG_VERSION = 9.6.0.15510 (DP 1)