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

Commit 7979fcd

Browse files
Merge pull request #2076 from livecode/bugfix-22269
[22269] Ensure the S/B includes database drivers of the correct arch
2 parents 5f18849 + a2708b5 commit 7979fcd

File tree

2 files changed

+12
-20
lines changed

2 files changed

+12
-20
lines changed

Toolset/libraries/revbackscriptlibrary.livecodescript

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2481,26 +2481,17 @@ function revDBDriverPath pDriver, pPlatform, pArchitecture
24812481
-- returns path to database driver from runtime or user runtime folder
24822482
-- will be a folder on Mac OS X, a list of files on Windows
24832483

2484-
local tEnvironmentFolder, tUserFolder
2485-
switch pPlatform
2486-
case "MacOSX"
2487-
if pArchitecture is empty then
2488-
put "Universal" into pArchitecture
2489-
end if
2490-
put revEnvironmentRuntimePath() & "/Mac OS X/" & pArchitecture & "/Externals" into tEnvironmentFolder
2491-
put revEnvironmentUserRuntimePath() & "/Mac OS X/" & pArchitecture & "/Externals" into tUserFolder
2492-
break
2493-
2494-
case "Windows"
2495-
put revEnvironmentRuntimePath() & "/Windows/x86-32/Externals" into tEnvironmentFolder
2496-
put revEnvironmentUserRuntimePath() & "/Windows/x86-32/Externals" into tUserFolder
2497-
break
2498-
2499-
case "Linux"
2500-
put revEnvironmentRuntimePath() & "/Linux/" & pArchitecture & "/Externals" into tEnvironmentFolder
2501-
put revEnvironmentUserRuntimePath() & "/Linux/" & pArchitecture & "/Externals" into tUserFolder
2502-
break
2503-
end switch
2484+
local tPlatform, tEnvironmentFolder, tUserFolder
2485+
put pPlatform into tPlatform
2486+
if tPlatform is "MacOSX" then
2487+
put "Mac OS X" into tPlatform
2488+
if pArchitecture is empty then
2489+
put "Universal" into pArchitecture
2490+
end if
2491+
end if
2492+
2493+
put revEnvironmentRuntimePath() & "/" & tPlatform & "/" & pArchitecture & "/Externals" into tEnvironmentFolder
2494+
put revEnvironmentUserRuntimePath() & "/" & tPlatform & "/" & pArchitecture & "/Externals" into tUserFolder
25042495

25052496
local tEnvironmentFile, tUserFile, tLegacyFile
25062497
put tEnvironmentFolder & slash & kDriverIndexSubFolder & slash & kDriverIndexName into tEnvironmentFile

notes/bugfix-22269.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Ensure S/B includes database drivers of the correct architecture

0 commit comments

Comments
 (0)