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

Commit d66cc1a

Browse files
committed
[[ CodeResources ]] Fix revEnvironmentNonNativeBinariesPath
This patch fixes `revEnvironmentNonNativeBinariesPath` which had become out of date since the gypification of build files. It now uses the bin folder for each platform which can be downloaded from staging or copied from another machine. This patch also adds iOS, android and emscripten as platforms to the function. In order to support iOS which has a childbuild folder per SDK an additional pSDK parameter was added.
1 parent 84163a3 commit d66cc1a

1 file changed

Lines changed: 32 additions & 29 deletions

File tree

Toolset/home.livecodescript

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2163,50 +2163,53 @@ end revEnvironmentBinariesPath
21632163

21642164
// SN-2015-05-15: [[ DeployAllPlatforms ]] Allow the deployment to happen for any
21652165
// platform, from any repository platform
2166-
function revEnvironmentNonNativeBinariesPath pPlatform
2167-
local tNonNativeBinariesPath, tReleaseFolder, tDebugFolder
2168-
put sBinariesPath into tNonNativeBinariesPath
2169-
2170-
set the itemDelimiter to slash
2171-
2172-
// If the platform is Linux, there will be archs
2173-
if the platform is "linux" then
2174-
delete item -3 to -1 of tNonNativeBinariesPath
2175-
else
2176-
delete item -2 to -1 of tNonNativeBinariesPath
2177-
end if
2178-
2179-
// Init to lower-case, will change if Mac platform
2180-
put "release" into tReleaseFolder
2181-
put "debug" into tDebugFolder
2166+
function revEnvironmentNonNativeBinariesPath pPlatform, pSDK
2167+
local tNonNativeBinariesPath
2168+
put sRepositoryPath into tNonNativeBinariesPath
21822169

21832170
switch pPlatform
21842171
case "Windows"
2185-
put slash & "windows" after tNonNativeBinariesPath
2172+
put slash & "win-x86-bin" after tNonNativeBinariesPath
2173+
break
2174+
case "Windows x86-64"
2175+
case "Windows x64"
2176+
case "Windows x86_64"
2177+
put slash & "win-x86_64-bin" after tNonNativeBinariesPath
21862178
break
21872179
case "Linux"
2188-
put slash & "linux/i386" after tNonNativeBinariesPath
2180+
put slash & "linux-x86-bin" after tNonNativeBinariesPath
21892181
break
2182+
case "Linux x86-64"
21902183
case "Linux x64"
2191-
put slash & "linux/x86_64" after tNonNativeBinariesPath
2184+
case "Linux x86_64"
2185+
put slash & "linux-x86_64-bin" after tNonNativeBinariesPath
2186+
break
2187+
case "Linux armv6_hf"
2188+
put slash & "linux-armv6_hf-bin" after tNonNativeBinariesPath
21922189
break
21932190
case "MacOS"
2194-
case "MacOSX PowerPC-32"
21952191
case "MacOSX x86-32"
2196-
put slash & "mac" after tNonNativeBinariesPath
2197-
put "Release" into tReleaseFolder
2198-
put "Debug" into tDebugFolder
2192+
case "MacOSX x86_32"
2193+
case "MacOSX x86-64"
2194+
case "MacOSX x64"
2195+
case "MacOSX x86_64"
2196+
put slash & "mac-bin" after tNonNativeBinariesPath
2197+
break
2198+
case "Android"
2199+
case "Android armv6"
2200+
put slash & "android-armv6-bin" after tNonNativeBinariesPath
2201+
break
2202+
case "Emscripten"
2203+
case "HTML5"
2204+
put slash & "emscripten-bin" after tNonNativeBinariesPath
2205+
break
2206+
case "iOS"
2207+
put slash & "ios-bin" & slash & pSDK after tNonNativeBinariesPath
21992208
break
22002209
default
22012210
return empty
22022211
end switch
22032212

2204-
if the last item of sBinariesPath is "release" then
2205-
put slash & tReleaseFolder after tNonNativeBinariesPath
2206-
else
2207-
put slash & tDebugFolder after tNonNativeBinariesPath
2208-
end if
2209-
22102213
return tNonNativeBinariesPath
22112214
end revEnvironmentNonNativeBinariesPath
22122215

0 commit comments

Comments
 (0)