diff --git a/Moose Setup/Moose_Create.lua b/Moose Setup/Moose_Create.lua index 42a3213aa..4b3e635ec 100644 --- a/Moose Setup/Moose_Create.lua +++ b/Moose Setup/Moose_Create.lua @@ -5,19 +5,32 @@ local MooseCommitHash = arg[2] local MooseDevelopmentPath = arg[3] local MooseSetupPath = arg[4] local MooseTargetPath = arg[5] +local isWindows = arg[6] +if not isWindows then + isWindows = 0 +end print( "Moose (D)ynamic (S)tatic : " .. MooseDynamicStatic ) print( "Commit Hash ID : " .. MooseCommitHash ) print( "Moose development path : " .. MooseDevelopmentPath ) print( "Moose setup path : " .. MooseSetupPath ) print( "Moose target path : " .. MooseTargetPath ) +print( "isWindows : " .. isWindows) + +function PathConvert(splatnixPath) + if isWindows == 0 then + return splatnixPath + end + return splatnixPath:gsub("/", "\\") +end + local MooseModulesFilePath = MooseDevelopmentPath .. "/Modules.lua" local LoaderFilePath = MooseTargetPath .. "/Moose.lua" print( "Reading Moose source list : " .. MooseModulesFilePath ) - -local LoaderFile = io.open( LoaderFilePath, "w" ) +print("Opening Loaderfile " .. PathConvert(LoaderFilePath)) +local LoaderFile = assert(io.open( PathConvert(LoaderFilePath), "w+" )) if MooseDynamicStatic == "S" then LoaderFile:write( "env.info( '*** MOOSE GITHUB Commit Hash ID: " .. MooseCommitHash .. " ***' )\n" ) @@ -31,13 +44,14 @@ if MooseDynamicStatic == "S" then MooseLoaderPath = MooseSetupPath .. "/Moose Templates/Moose_Static_Loader.lua" end -local MooseLoader = io.open( MooseLoaderPath, "r" ) + +local MooseLoader = assert(io.open( PathConvert(MooseLoaderPath), "r" )) local MooseLoaderText = MooseLoader:read( "*a" ) MooseLoader:close() LoaderFile:write( MooseLoaderText ) -local MooseSourcesFile = io.open( MooseModulesFilePath, "r" ) +local MooseSourcesFile = assert(io.open( PathConvert(MooseModulesFilePath), "r" )) local MooseSource = MooseSourcesFile:read("*l") while( MooseSource ) do @@ -50,7 +64,7 @@ while( MooseSource ) do end if MooseDynamicStatic == "S" then print( "Load static: " .. MooseFilePath ) - local MooseSourceFile = io.open( MooseFilePath, "r" ) + local MooseSourceFile = assert(io.open( PathConvert(MooseFilePath), "r" )) local MooseSourceFileText = MooseSourceFile:read( "*a" ) MooseSourceFile:close() @@ -72,3 +86,8 @@ LoaderFile:write( "env.info( '*** MOOSE INCLUDE END *** ' )\n" ) MooseSourcesFile:close() LoaderFile:close() + +print("Moose include generation complete.") +if MooseDynamicStatic == "D" then + print("To enable dynamic moose loading, add a soft or hard link from \"\\Scripts\\Moose\" to the \"Moose Development\\Moose\" subdirectory of the Moose_Framework repository.") +end