Merge pull request #54 from FlightControl-Master/Embedded

Embedded

Embedded/Moose_Create_Embedded.bat

@@ -1,36 +0,0 @@
-del Moose_Embedded.lua
-
-echo env.info( 'Moose Embedded' ) > Moose_Embedded.lua
-
-copy /b Moose_Embedded.lua + ..\Moose\Routines.lua              Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Base.lua                  Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Event.lua                 Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Menu.lua                  Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Group.lua                 Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Unit.lua                  Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Zone.lua                  Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Client.lua                Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Database.lua              Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Moose.lua                 Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Scheduler.lua             Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Scoring.lua               Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Cargo.lua                 Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Message.lua               Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Stage.lua                 Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Task.lua                  Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\GoHomeTask.lua            Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\DestroyBaseTask.lua       Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\DestroyGroupsTask.lua     Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\DestroyRadarsTask.lua     Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\DestroyUnitTypesTask.lua  Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\PickupTask.lua            Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\DeployTask.lua            Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\NoTask.lua                Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\RouteTask.lua             Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Mission.lua               Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\CleanUp.lua               Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Spawn.lua                 Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Movement.lua              Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Sead.lua                  Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\Escort.lua                Moose_Embedded.lua
-copy /b Moose_Embedded.lua + ..\Moose\MissileTrainer.lua        Moose_Embedded.lua

MissionScripting/MissionScripting.lua

@@ -1,37 +0,0 @@
---Initialization script for the Mission lua Environment (SSE)
-
-dofile('Scripts/ScriptingSystem.lua')
-
-Include = {}
-
-Include.LoadPath = 'Scripts/MOOSE'
-Include.Files = {}
-
-Include.File = function( IncludeFile )
-	if not Include.Files[ IncludeFile ] then
-		Include.Files[IncludeFile] = IncludeFile
-		dofile( Include.LoadPath .. "/" .. IncludeFile .. ".lua" )
-		env.info( "Include:" .. IncludeFile .. " loaded." )
-	end
-end
-
-Include.File( "Database" )
---Include.File( "StatHandler" )
-
---Sanitize Mission Scripting environment
---This makes unavailable some unsecure functions. 
---Mission downloaded from server to client may contain potentialy harmful lua code that may use these functions.
---You can remove the code below and make availble these functions at your own risk.
-
-local function sanitizeModule(name)
-	_G[name] = nil
-	package.loaded[name] = nil
-end
-
-do
-	--sanitizeModule('os')
-	--sanitizeModule('io')
-	sanitizeModule('lfs')
-	require = nil
-	loadlib = nil
-end

Moose Mission Setup/Moose Mission Update/Moose_Update_Missions.bat

@@ -0,0 +1,8 @@
+echo off
+
+rem Update Missions with a new version of Moose.lua
+rem Run this batch file with the following command arguments in Eclipse: "${resource_loc:/Moose/Moose Development/Moose}" "${current_date}"
+
+echo Path to Mission Files: %1
+
+For /R %1 %%G IN (*.miz) do 7z u "%%G" "l10n\DEFAULT\Moose.lua"

Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua

@@ -1,4 +1,29 @@
-env.info( 'Moose Embedded' ) 
+env.info( '*** MOOSE STATIC INCLUDE START *** ' ) 
+env.info( 'Moose Generation Timestamp: 20160525_1055' ) 
+local base = _G
+env.info("Loading MOOSE " .. base.timer.getAbsTime() )
+
+Include = {}
+
+Include.Path = function()
+   local str = debug.getinfo(2, "S").source
+   return str:match("(.*/)"):sub(1,-2):gsub("\\","/")
+end
+
+Include.File = function( IncludeFile )
+end
+
+Include.ProgramPath = "Scripts/Moose/Moose/"
+Include.MissionPath = Include.Path()
+
+env.info( "Include.ProgramPath = " .. Include.ProgramPath)
+env.info( "Include.MissionPath = " .. Include.MissionPath)
+
+Include.Files = {}
+
+Include.File( "Moose" )
+
+env.info("Loaded MOOSE Include Engine")
 --- Various routines
 -- @module routines
 -- @author Flightcontrol
@@ -16668,3 +16693,4 @@ function MISSILETRAINER:_TrackMissiles()
 
   return true
 end
+env.info( '*** MOOSE INCLUDE END *** ' ) 

Moose Mission Setup/Moose_Create.bat

@@ -0,0 +1,78 @@
+ECHO OFF
+
+REM Create Moose.lua File
+
+ECHO Path to Moose *.lua files: %1
+ECHO Current Date: %2
+ECHO Path to Update Missions: %3
+ECHO Dynamic or Static: %4
+
+DEL Moose.lua
+
+IF %4 == D GOTO Dynamic
+IF %4 == S GOTO Static
+
+GOTO End
+
+:Dynamic
+
+ECHO Dynamic Moose.lua
+
+REM Create a timestamp with is logged in the DCS.log file.
+ECHO env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' ) > Moose.lua
+ECHO env.info( 'Moose Generation Timestamp: %2' ) >> Moose.lua
+
+COPY /b Moose.lua + "Moose Create Dynamic\Moose_Dynamic_Loader.lua"        Moose.lua
+
+GOTO End
+
+:Static
+
+ECHO Static Moose.lua
+
+REM Create a timestamp with is logged in the DCS.log file.
+ECHO env.info( '*** MOOSE STATIC INCLUDE START *** ' ) > Moose.lua
+ECHO env.info( 'Moose Generation Timestamp: %2' ) >> Moose.lua
+
+COPY /b Moose.lua + "Moose Create Static\Moose_Static_Loader.lua"        Moose.lua
+
+
+COPY /b Moose.lua + %1\Routines.lua              Moose.lua
+COPY /b Moose.lua + %1\Base.lua                  Moose.lua
+COPY /b Moose.lua + %1\Event.lua                 Moose.lua
+COPY /b Moose.lua + %1\Menu.lua                  Moose.lua
+COPY /b Moose.lua + %1\Group.lua                 Moose.lua
+COPY /b Moose.lua + %1\Unit.lua                  Moose.lua
+COPY /b Moose.lua + %1\Zone.lua                  Moose.lua
+COPY /b Moose.lua + %1\Client.lua                Moose.lua
+COPY /b Moose.lua + %1\Database.lua              Moose.lua
+COPY /b Moose.lua + %1\Moose.lua                 Moose.lua
+COPY /b Moose.lua + %1\Scheduler.lua             Moose.lua
+COPY /b Moose.lua + %1\Scoring.lua               Moose.lua
+COPY /b Moose.lua + %1\Cargo.lua                 Moose.lua
+COPY /b Moose.lua + %1\Message.lua               Moose.lua
+COPY /b Moose.lua + %1\Stage.lua                 Moose.lua
+COPY /b Moose.lua + %1\Task.lua                  Moose.lua
+COPY /b Moose.lua + %1\GoHomeTask.lua            Moose.lua
+COPY /b Moose.lua + %1\DestroyBaseTask.lua       Moose.lua
+COPY /b Moose.lua + %1\DestroyGroupsTask.lua     Moose.lua
+COPY /b Moose.lua + %1\DestroyRadarsTask.lua     Moose.lua
+COPY /b Moose.lua + %1\DestroyUnitTypesTask.lua  Moose.lua
+COPY /b Moose.lua + %1\PickupTask.lua            Moose.lua
+COPY /b Moose.lua + %1\DeployTask.lua            Moose.lua
+COPY /b Moose.lua + %1\NoTask.lua                Moose.lua
+COPY /b Moose.lua + %1\RouteTask.lua             Moose.lua
+COPY /b Moose.lua + %1\Mission.lua               Moose.lua
+COPY /b Moose.lua + %1\CleanUp.lua               Moose.lua
+COPY /b Moose.lua + %1\Spawn.lua                 Moose.lua
+COPY /b Moose.lua + %1\Movement.lua              Moose.lua
+COPY /b Moose.lua + %1\Sead.lua                  Moose.lua
+COPY /b Moose.lua + %1\Escort.lua                Moose.lua
+COPY /b Moose.lua + %1\MissileTrainer.lua        Moose.lua
+
+GOTO End
+
+:End
+
+ECHO env.info( '*** MOOSE INCLUDE END *** ' ) >> Moose.lua
+COPY Moose.lua %3