mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2026-08-21 11:53:30 +00:00
Merge branch 'master' into develop
This commit is contained in:
@@ -5,8 +5,9 @@
|
|||||||
-- This method is used by Moose developers and not mission builders.
|
-- This method is used by Moose developers and not mission builders.
|
||||||
ModuleLoader = 'Scripts/Moose/Modules.lua'
|
ModuleLoader = 'Scripts/Moose/Modules.lua'
|
||||||
|
|
||||||
local f=io.open(ModuleLoader,"r")
|
if io then
|
||||||
if f~=nil then
|
local f=io.open(ModuleLoader,"r")
|
||||||
|
if f~=nil then
|
||||||
io.close(f)
|
io.close(f)
|
||||||
|
|
||||||
env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
|
env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
|
||||||
@@ -36,6 +37,9 @@ if f~=nil then
|
|||||||
|
|
||||||
-- Skip the static part of this file completly
|
-- Skip the static part of this file completly
|
||||||
do return end
|
do return end
|
||||||
|
end
|
||||||
|
else
|
||||||
|
env.info( '*** MOOSE DYNAMIC INCLUDE NOT POSSIBLE (Desanitize io to use it) *** ' )
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Individual Moose files are not found. Use the static code below.
|
-- Individual Moose files are not found. Use the static code below.
|
||||||
|
|||||||
Reference in New Issue
Block a user