Skip to content

Commit c0738c0

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop-8.1-07.07.2017
2 parents 1e8f1cf + 86a825f commit c0738c0

19 files changed

Lines changed: 127 additions & 68 deletions

‎Installer/package.txt‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
// LiveCode
2727

2828
installer LiveCode
29+
if BaseEdition is Commercial then
30+
additional manifest "../Installer/commercial-package.txt"
2931
include Misc
3032
include Toolset
3133
include Plugins
@@ -86,8 +88,6 @@ installer LiveCode
8688
if TargetEdition is Business then
8789
desktop icon "private:engine/rsrc/Business/android-notify-icon.png" as "runrev-[[ProductTag]]-[[TargetArchitecture]]"
8890
include Uninstaller
89-
if BaseEdition is Commercial then
90-
additional manifest "../Installer/commercial-package.txt"
9191
if TargetEdition is Indy then
9292
include Commercial.IndyComponents
9393
if TargetEdition is Business then
@@ -98,7 +98,15 @@ component Runtime
9898

9999
component Externals
100100
include Externals.[[TargetPlatform]]
101+
if TargetEdition is "Business" then
102+
include Commercial.BusinessExternals
103+
if TargetEdition is "Indy" then
104+
include Commercial.IndyExternals
101105
include Databases.[[TargetPlatform]]
106+
if TargetEdition is "Business" then
107+
include Commercial.BusinessDatabases
108+
if TargetEdition is "Indy" then
109+
include Commercial.IndyDatabases
102110
if TargetPlatform is Linux then
103111
include Externals.CEF.Linux
104112
if TargetPlatform is Windows then
@@ -734,6 +742,7 @@ component Externals.CEF.Linux
734742
file linux-[[TargetArchitecture]]:Externals/CEF/cef_100_percent.pak
735743
file linux-[[TargetArchitecture]]:Externals/CEF/cef_200_percent.pak
736744
file linux-[[TargetArchitecture]]:Externals/CEF/cef_extensions.pak
745+
737746
// Horrible workaround for a libCEF bug
738747
into [[TargetFolder]] place
739748
file linux-[[TargetArchitecture]]:icudtl.dat
@@ -748,12 +757,9 @@ component Externals.CEF.Windows
748757
executable windows:revbrowser-cefprocess.exe
749758
executable windows:CEF/libcef.dll
750759
executable windows:CEF/d3dcompiler_43.dll
751-
executable windows:CEF/d3dcompiler_46.dll
752760
executable windows:CEF/d3dcompiler_47.dll
753-
executable windows:CEF/ffmpegsumo.dll
754761
executable windows:CEF/libEGL.dll
755762
executable windows:CEF/libGLESv2.dll
756-
executable windows:CEF/pdf.dll
757763
rfolder windows:CEF/locales
758764
file windows:CEF/cef.pak
759765
file windows:CEF/cef_100_percent.pak
@@ -778,8 +784,6 @@ component Databases.Linux
778784
declare dbdriver "ODBC" using dbodbc.so
779785
declare dbdriver "PostgreSQL" using dbpostgresql.so
780786
declare dbdriver "SqLite" using dbsqlite.so
781-
ifnot TargetEdition is "Community" then
782-
declare dbdriver "Oracle" using dboracle.so
783787

784788
//////////
785789

@@ -791,15 +795,11 @@ component Databases.Windows
791795
executable windows:dbodbc.dll
792796
executable windows:dbpostgresql.dll
793797
executable windows:dbsqlite.dll
794-
ifnot TargetEdition is "Community" then
795-
executable private:oracle_libraries/dboracle.dll
796798
declare external "Database" using revdb.dll
797799
declare dbdriver "MySQL" using dbmysql.dll
798800
declare dbdriver "ODBC" using dbodbc.dll
799801
declare dbdriver "PostgreSQL" using dbpostgresql.dll
800802
declare dbdriver "SqLite" using dbsqlite.dll
801-
ifnot TargetEdition is "Community" then
802-
declare dbdriver "Oracle" using dboracle.dll
803803

804804
//////////
805805

@@ -811,15 +811,11 @@ component Databases.MacOSX
811811
executable macosx:dbodbc.bundle
812812
executable macosx:dbpostgresql.bundle
813813
executable macosx:dbsqlite.bundle
814-
ifnot TargetEdition is "Community" then
815-
executable private:oracle_libraries/dboracle.bundle
816814
declare external "Database" using revdb.bundle
817815
declare dbdriver "MySQL" using dbmysql.bundle
818816
declare dbdriver "ODBC" using dbodbc.bundle
819817
declare dbdriver "PostgreSQL" using dbpostgresql.bundle
820818
declare dbdriver "SqLite" using dbsqlite.bundle
821-
ifnot TargetEdition is "Community" then
822-
declare dbdriver "Oracle" using dboracle.bundle
823819

824820
////////////////////////////////////////////////////////////////////////////////
825821

‎builder/package_compiler.livecodescript‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -829,8 +829,7 @@ private command compilerExecuteCopy @self, pCommand
829829
end if
830830
else
831831
if not abstractThereIsAFile(tSourcePath) then
832-
compilerBuildWarning self, "Item '" & tSourcePath & "' could not be found", pCommand["line"]
833-
exit compilerExecuteCopy
832+
compilerExecutionError self, "Item '" & tSourcePath & "' could not be found", pCommand["line"]
834833
end if
835834
put pCommand["class"], empty into tItemManifest
836835
end if
@@ -856,7 +855,7 @@ private command compilerExecuteCopy @self, pCommand
856855
end if
857856

858857
if tItemClass is not "folder" and not abstractThereIsAFile(tItemSourcePath) then
859-
compilerBuildWarning self, "Bundle item '" & tItemSourcePath & "' could not be found", pCommand["line"]
858+
compilerExecutionError self, "Bundle item '" & tItemSourcePath & "' could not be found", pCommand["line"]
860859
end if
861860

862861
local tProcess, tSuffix, tManifestType
@@ -1130,8 +1129,7 @@ private command compilerExecuteDesktop @self, pCommand
11301129
local tSourcePath
11311130
put self["sources"][tSourceType] & slash & tSourceFile into tSourcePath
11321131
if not abstractThereIsAFile(tSourcePath) then
1133-
compilerBuildWarning self, "Item '" & tSourcePath & "' could not be found", pCommand["line"]
1134-
exit compilerExecuteDesktop
1132+
compilerExecutionError self, "Item '" & tSourcePath & "' could not be found", pCommand["line"]
11351133
end if
11361134

11371135
-- If its an application, process the data into a derived file

‎docs/dictionary/command/hide.lcdoc‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ Makes an <object(glossary)> invisible.
99

1010
Introduced: 1.0
1111

12-
Deprecated:
13-
8.1
14-
1512
OS: mac, windows, linux, ios, android
1613

1714
Platforms: desktop, server, mobile
@@ -20,10 +17,10 @@ Example:
2017
hide button 14
2118

2219
Example:
23-
hide field "New" with visual effect dissolve
20+
hide field "New" with visual effect "dissolve"
2421

2522
Example:
26-
hide this stack with visual dissolve fast to black
23+
hide this stack with visual "dissolve" fast to black
2724

2825
Parameters:
2926
object:
@@ -73,9 +70,10 @@ not include 64 bit support and therefore can not be supported on OS X 64
7370
bit builds of LiveCode.
7471

7572
References: disable (command), answer effect (command), show (command),
76-
hide menubar (command), object (glossary), command (glossary),
77-
property (glossary), black (keyword), stack (object), showPict (property),
78-
imageSource (property), visible (property), showInvisibles (property)
73+
hide menubar (command), visual effect (command), object (glossary),
74+
command (glossary), property (glossary), black (keyword), stack (object),
75+
showPict (property), imageSource (property), visible (property),
76+
showInvisibles (property)
7977

8078
Tags: ui
8179

‎docs/dictionary/command/show.lcdoc‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Example:
1717
show stack "project1"
1818

1919
Example:
20-
show image "picture" with visual effect barn door open
20+
show image "picture" with visual effect "barn door open"
2121

2222
Parameters:
2323
object:
@@ -47,11 +47,25 @@ effect.
4747
Showing a group shows all the controls in the group whose visible
4848
<property> is true.
4949

50+
Changes:
51+
The ability to use QuickTime special effects was introduced in version
52+
1.1. In previous versions, only the built-in visual effects listed under
53+
the visual effect command were available.
54+
55+
The use of <QuickTime> was deprecated in version 8.1 of LiveCode with
56+
new defaults for <dontUseQT> and <dontUseQTEffects> as true on all
57+
systems apart from pre OS X 10.8. The Windows build of LiveCode no
58+
longer supports any <QuickTime> features and setting the <dontUseQT> and
59+
<dontUseQTEffects> will have no effect. Additionally <QuickTime> does
60+
not include 64 bit support and therefore can not be supported on OS X 64
61+
bit builds of LiveCode.
62+
5063
References: hide (command), answer effect (command),
5164
show groups (command), show cards (command), show taskbar (command),
52-
object (glossary), command (glossary), property (glossary),
53-
black (keyword), showPict (property), toolTip (property),
54-
imageSource (property), showInvisibles (property), visible (property)
65+
visual effect (command), object (glossary), command (glossary),
66+
property (glossary), black (keyword), showPict (property),
67+
toolTip (property), imageSource (property), showInvisibles (property),
68+
visible (property)
5569

5670
Tags: ui
5771

‎docs/notes/bugfix-19891.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure player controller thumb shows within the allowed range

‎docs/notes/bugfix-19893.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure player respects startTime in reverse playback

‎docs/notes/bugfix-19935.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Made various improvements to the show and hide dictionary entries

‎docs/notes/bugfix-19936.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure window masks with no transparency still work on Mac

‎docs/notes/bugfix-19950.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Fix crash due to invalid object in event queue

‎docs/notes/bugfix-19972.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Make sure setting playRate to negative does have an effect when player has reached the end of movie

0 commit comments

Comments
 (0)