Merge pull request #1616 from Zonr0/Zonr0-ExternalToolsFix

Fixes broken external tools

MOOSE_INCLUDE/Moose_Include_Dynamic/Moose.lua

@@ -0,0 +1,24 @@
+env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
+
+local base = _G
+
+__Moose = {}
+
+__Moose.Include = function( IncludeFile )
+	if not __Moose.Includes[ IncludeFile ] then
+		__Moose.Includes[IncludeFile] = IncludeFile
+		local f = assert( base.loadfile( IncludeFile ) )
+		if f == nil then
+			error ("Moose: Could not load Moose file " .. IncludeFile )
+		else
+			env.info( "Moose: " .. IncludeFile .. " dynamically loaded." )
+			return f()
+		end
+	end
+end
+
+__Moose.Includes = {}
+
+__Moose.Include( 'Scripts/Moose/Modules.lua' )
+BASE:TraceOnOff( true )
+env.info( '*** MOOSE INCLUDE END *** ' )

Moose Setup/Eclipse/Moose Loader Dynamic.launch

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\ProgramData\chocolatey\lib\lua51\tools\lua5.1.exe"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Moose_Framework/lua54/lua54.exe}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup\Moose_Create.lua&quot; &quot;D&quot; &quot;LOCAL&quot; &quot;${resource_loc:/MOOSE/Moose Development/Moose}&quot; &quot;${resource_loc:/MOOSE/Moose Setup}&quot;&#13;&#10;${resource_loc:/MOOSE_INCLUDE/Moose_Include_Dynamic}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup/Moose_Create.lua&quot; &quot;D&quot; &quot;LOCAL&quot; &quot;${workspace_loc:/Moose_Framework/Moose Development/Moose}&quot; &quot;${workspace_loc:/Moose_Framework/Moose Setup}&quot;&#13;&#10;&quot;${workspace_loc:/Moose_Framework/MOOSE_INCLUDE\Moose_Include_Dynamic}&quot; 1"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/MOOSE}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Moose_Framework}"/>
 </launchConfiguration>

Moose Setup/Eclipse/Moose Loader Static.launch

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\ProgramData\chocolatey\lib\lua51\tools\lua5.1.exe"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Moose_Framework/lua54/lua54.exe}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup\Moose_Create.lua&quot; &quot;S&quot; &quot;LOCAL&quot; &quot;${resource_loc:/MOOSE/Moose Development/Moose}&quot; &quot;${resource_loc:/MOOSE/Moose Setup}&quot;&#13;&#10;${resource_loc:/MOOSE_INCLUDE/Moose_Include_Static}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup\Moose_Create.lua&quot; &quot;S&quot; &quot;LOCAL&quot; &quot;${workspace_loc:/Moose_Framework/Moose Development/Moose}&quot; &quot;${workspace_loc:/Moose_Framework/Moose Setup}&quot;&#13;&#10;&quot;${workspace_loc:/Moose_Framework/MOOSE_INCLUDE\Moose_Include_Static}&quot; 1"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/MOOSE}"/>
+    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Moose_Framework}"/>
 </launchConfiguration>

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 )
-
+print("Opening Loaderfile " .. PathConvert(LoaderFilePath))
-local LoaderFile = io.open( LoaderFilePath, "w" )
+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 \"<YOUR_DCS_INSTALL_DIRECTORY>\\Scripts\\Moose\" to the \"Moose Development\\Moose\" subdirectory of the Moose_Framework repository.")
+end