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

Commit 28288ac

Browse files
livecodesebastienlivecodesebastien
committed
Merge remote-tracking branch 'origin/develop-7.0' into develop
All the refactored changes are the changes affecting the files referenced in the lists 'Conflicts' and 'Changes to be committed' Conflicts: Installer/package.txt config/android.gypi config/linux.gypi engine/kernel-server.gypi engine/kernel.gypi engine/src/customprinter.cpp engine/src/graphicscontext.cpp engine/src/linux.stubs engine/src/lnxaudio.cpp engine/src/mode_installer.cpp engine/src/stackview.cpp ide libgraphics/include/graphics.h libgraphics/src/graphics-internal.h version Changes to be committed: modified: config/linux-settings.gypi modified: engine/kernel-server.gyp modified: engine/src/chunk.cpp
2 parents 7704afd + 2b0ad63 commit 28288ac

Some content is hidden

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

47 files changed

+270
-111
lines changed

‎Installer/package.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,7 @@ component Runtime.iOS
728728
file ios:iphonesimulator6.1/mobile-template.plist as "Settings.plist"
729729
file ios:iphonesimulator6.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
730730
file ios:iphonesimulator6.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
731+
file ios:iphonesimulator6.1/mobile-disable-ats-template.plist as "DisableATS.plist"
731732
file ios:iphonesimulator6.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
732733
file ios:iphonesimulator6.1/fontmap as "fontmap"
733734
into "[[ToolsFolder]]/Runtime/iOS/Simulator-7_1" place
@@ -742,6 +743,7 @@ component Runtime.iOS
742743
file ios:iphonesimulator7.1/mobile-template.plist as "Settings.plist"
743744
file ios:iphonesimulator7.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
744745
file ios:iphonesimulator7.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
746+
file ios:iphonesimulator7.1/mobile-disable-ats-template.plist as "DisableATS.plist"
745747
file ios:iphonesimulator7.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
746748
file ios:iphonesimulator7.1/fontmap as "fontmap"
747749
into "[[ToolsFolder]]/Runtime/iOS/Simulator-8_2" place
@@ -757,6 +759,7 @@ component Runtime.iOS
757759
file ios:iphonesimulator8.2/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
758760
file ios:iphonesimulator8.2/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
759761
file ios:iphonesimulator8.2/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
762+
file ios:iphonesimulator8.2/mobile-disable-ats-template.plist as "DisableATS.plist"
760763
file ios:iphonesimulator8.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
761764
file ios:iphonesimulator8.2/fontmap as "fontmap"
762765
into "[[ToolsFolder]]/Runtime/iOS/Simulator-8_4" place
@@ -772,6 +775,7 @@ component Runtime.iOS
772775
file ios:iphonesimulator8.4/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
773776
file ios:iphonesimulator8.4/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
774777
file ios:iphonesimulator8.4/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
778+
file ios:iphonesimulator8.4/mobile-disable-ats-template.plist as "DisableATS.plist"
775779
file ios:iphonesimulator8.4/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
776780
file ios:iphonesimulator8.4/fontmap as "fontmap"
777781
into "[[ToolsFolder]]/Runtime/iOS/Simulator-9_1" place
@@ -787,6 +791,7 @@ component Runtime.iOS
787791
file ios:iphonesimulator9.1/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
788792
file ios:iphonesimulator9.1/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
789793
file ios:iphonesimulator9.1/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
794+
file ios:iphonesimulator9.1/mobile-disable-ats-template.plist as "DisableATS.plist"
790795
file ios:iphonesimulator9.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
791796
file ios:iphonesimulator9.1/fontmap as "fontmap"
792797
into "[[ToolsFolder]]/Runtime/iOS/Device-8_2" place
@@ -807,6 +812,7 @@ component Runtime.iOS
807812
file ios:iphoneos8.2/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
808813
file ios:iphoneos8.2/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
809814
file ios:iphoneos8.2/template-ResourceRules.plist as "ResourceRules.plist"
815+
file ios:iphoneos8.2/mobile-disable-ats-template.plist as "DisableATS.plist"
810816
file ios:iphoneos8.2/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
811817
file ios:iphoneos8.2/fontmap as "fontmap"
812818
into "[[ToolsFolder]]/Runtime/iOS/Device-8_4" place
@@ -827,6 +833,7 @@ component Runtime.iOS
827833
file ios:iphoneos8.4/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
828834
file ios:iphoneos8.4/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
829835
file ios:iphoneos8.4/template-ResourceRules.plist as "ResourceRules.plist"
836+
file ios:iphoneos8.4/mobile-disable-ats-template.plist as "DisableATS.plist"
830837
file ios:iphoneos8.4/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
831838
file ios:iphoneos8.4/fontmap as "fontmap"
832839
into "[[ToolsFolder]]/Runtime/iOS/Device-9_1" place
@@ -847,6 +854,7 @@ component Runtime.iOS
847854
file ios:iphoneos9.1/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
848855
file ios:iphoneos9.1/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
849856
file ios:iphoneos9.1/template-ResourceRules.plist as "ResourceRules.plist"
857+
file ios:iphoneos9.1/mobile-disable-ats-template.plist as "DisableATS.plist"
850858
file ios:iphoneos9.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
851859
file ios:iphoneos9.1/fontmap as "fontmap"
852860

‎builder/server_builder.livecodescript‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,9 @@ command serverBuilderRun pPlatform, pEdition
3737
delete file tOutputFile
3838

3939
if pPlatform is "windows" then
40-
local tExternalsFolder
41-
put tEngineFolder into tExternalsFolder
42-
set the itemDel to slash
43-
put "releaseserver" into the last item of tExternalsFolder
44-
set the itemDel to comma
45-
4640
repeat for each word tExternal in "revdb revzip revxml dbsqlite dbmysql dbpostgresql dbodbc"
4741
get "server-" & tExternal & ".dll"
48-
if there is a file (tExternalsFolder & slash & it) then
49-
builderLog "message", "Copying windows external '" & tExternal & "' from release server folder"
50-
put URL ("binfile:" & tExternalsFolder & slash & it) into URL ("binfile:" & tEngineFolder & slash & it)
51-
else
42+
if there is not a file (tEngineFolder & slash & it) then
5243
get tExternal & ".dll"
5344
if there is a file (tEngineFolder & slash & it) then
5445
builderLog "message", "Copying windows external '" & tExternal & "' from desktop external"

‎config/ios.gypi‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@
3232
'IPHONEOS_DEPLOYMENT_TARGET[arch=i386]': '5.1.1',
3333
'IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]': '7.0.0',
3434
'IPHONEOS_DEPLOYMENT_TARGET[arch=x86_64]': '7.0.0',
35-
'ENABLE_BITCODE[arch=armv7]': 'No',
36-
'ENABLE_BITCODE[arch=i386]': 'No',
37-
'ENABLE_BITCODE[arch=arm64]': 'Yes',
38-
'ENABLE_BITCODE[arch=x86_64]': 'Yes',
35+
'ENABLE_BITCODE': 'No',
3936
'TARGETED_DEVICE_FAMILY': '1,2',
4037
'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
4138
'ARCHS_STANDARD': 'armv7 arm64',
@@ -194,6 +191,7 @@
194191
'-Werror=declaration-after-statement',
195192
'-Wno-unused-parameter',
196193
'-Werror=uninitialized',
194+
'-Werror=return-type',
197195
],
198196
},
199197
},

‎config/linux-settings.gypi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
'-fpermissive', # Be more lax with old code
7878
'-Wno-return-type',
7979
'-Werror=uninitialized',
80+
'-Werror=return-type',
8081
],
8182

8283
'cflags_c':

‎config/mac.gypi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
'-Werror=declaration-after-statement',
121121
'-Wno-unused-parameter',
122122
'-Werror=uninitialized',
123+
'-Werror=return-type',
123124
],
124125
},
125126
},

‎docs/notes/bugfix-15097.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Ensure 'the effective rect of stack' is more accurate on Linux
2+
3+
With the move to GDK since 7.0 there is a better method for computing the effective rect of a window. The engine has been updated to use this method, rather than the heuristic which was there before.

‎docs/notes/bugfix-16162.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# "infinity" is not always equal to "infinity"

‎docs/notes/bugfix-16239.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Touch interaction with iOS native scrollers doesn't work until after the scroller has been scrolled.

‎docs/notes/bugfix-16268.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Use the server-revdb.dll external for Windows server
2+

‎docs/notes/bugfix-16299.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Unable to mobileControlSet URL with http:// URL on iOS 9.1 Simulators and Devices

0 commit comments

Comments
 (0)