Skip to content

Commit

Permalink
replace lfs.writedir()..[[Scripts\DCS-BIOS]] with BIOS.LuaScriptDir; …
Browse files Browse the repository at this point in the history 
…do not write JSON files by default

The Lua scripts will be distributed with the DCS-BIOS Hub and no longer
reside in the user profile directory.

JSON files are now written to lfs.writedir()..[[DCS-BIOS JSON]].
If that directory does not exist, that step is skipped.
Saving another copy in .jsonp format is also no longer necessary.
  • Loading branch information
@jboecker
jboecker committed Oct 20, 2019
1 parent 0d2b3b7 commit 7c97003
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 49 deletions.
77 changes: 38 additions & 39 deletions src/dcs-lua/BIOS.lua
View file
@@ -1,5 +1,4 @@
BIOS = {}
dofile(lfs.writedir()..[[Scripts\DCS-BIOS\lib\AircraftList.lua]])
dofile(BIOS.LuaScriptDir..[[lib\AircraftList.lua]])

BIOS.dbg = {}
BIOS.logfile = io.open(lfs.writedir()..[[Logs\DCS-BIOS.log]], "w")
Expand All @@ -16,43 +15,43 @@ package.cpath = package.cpath..";.\\LuaSocket\\?.dll"

socket = require("socket")

dofile(lfs.writedir()..[[Scripts\DCS-BIOS\lib\Util.lua]])
dofile(lfs.writedir()..[[Scripts\DCS-BIOS\lib\ProtocolIO.lua]])
dofile(lfs.writedir()..[[Scripts\DCS-BIOS\lib\Protocol.lua]])
dofile(lfs.writedir()..[[Scripts\DCS-BIOS\lib\MetadataEnd.lua]])
dofile(lfs.writedir()..[[Scripts\DCS-BIOS\lib\MetadataStart.lua]])
dofile(lfs.writedir()..[[Scripts\DCS-BIOS\lib\CommonData.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\A-4E-C.lua]])
dofile(lfs.writedir()..[[Scripts\DCS-BIOS\lib\A10C.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\AJS37.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\AV8BNA.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\Bf109k4.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\C-101CC.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\ChristenEagle.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\F-14B.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\F-16C_50.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\F-5E-3.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\F86.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\FA-18C_hornet.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\FC3.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\FW190A8.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\FW190D9.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\I-16.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\Ka50.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\L-39ZA.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\M2000C.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\MB-339PAN.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\Mi8MT.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\Mig15.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\Mig19.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\Mig21.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\NS430.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\P-51D.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\SA342M.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\SpitfireLFMkIX.lua]])
dofile(lfs.writedir()..[[Scripts\DCS-BIOS\lib\UH1H.lua]])
dofile(lfs.writedir()..[[scripts\DCS-BIOS\lib\Yak-52.lua]])
dofile(lfs.writedir()..[[Scripts\DCS-BIOS\BIOSConfig.lua]])
dofile(BIOS.LuaScriptDir..[[lib\Util.lua]])
dofile(BIOS.LuaScriptDir..[[lib\ProtocolIO.lua]])
dofile(BIOS.LuaScriptDir..[[lib\Protocol.lua]])
dofile(BIOS.LuaScriptDir..[[lib\MetadataEnd.lua]])
dofile(BIOS.LuaScriptDir..[[lib\MetadataStart.lua]])
dofile(BIOS.LuaScriptDir..[[lib\CommonData.lua]])
dofile(BIOS.LuaScriptDir..[[lib\A-4E-C.lua]])
dofile(BIOS.LuaScriptDir..[[lib\A10C.lua]])
dofile(BIOS.LuaScriptDir..[[lib\AJS37.lua]])
dofile(BIOS.LuaScriptDir..[[lib\AV8BNA.lua]])
dofile(BIOS.LuaScriptDir..[[lib\Bf109k4.lua]])
dofile(BIOS.LuaScriptDir..[[lib\C-101CC.lua]])
dofile(BIOS.LuaScriptDir..[[lib\ChristenEagle.lua]])
dofile(BIOS.LuaScriptDir..[[lib\F-14B.lua]])
dofile(BIOS.LuaScriptDir..[[lib\F-16C_50.lua]])
dofile(BIOS.LuaScriptDir..[[lib\F-5E-3.lua]])
dofile(BIOS.LuaScriptDir..[[lib\F86.lua]])
dofile(BIOS.LuaScriptDir..[[lib\FA-18C_hornet.lua]])
dofile(BIOS.LuaScriptDir..[[lib\FC3.lua]])
dofile(BIOS.LuaScriptDir..[[lib\FW190A8.lua]])
dofile(BIOS.LuaScriptDir..[[lib\FW190D9.lua]])
dofile(BIOS.LuaScriptDir..[[lib\I-16.lua]])
dofile(BIOS.LuaScriptDir..[[lib\Ka50.lua]])
dofile(BIOS.LuaScriptDir..[[lib\L-39ZA.lua]])
dofile(BIOS.LuaScriptDir..[[lib\M2000C.lua]])
dofile(BIOS.LuaScriptDir..[[lib\MB-339PAN.lua]])
dofile(BIOS.LuaScriptDir..[[lib\Mi8MT.lua]])
dofile(BIOS.LuaScriptDir..[[lib\Mig15.lua]])
dofile(BIOS.LuaScriptDir..[[lib\Mig19.lua]])
dofile(BIOS.LuaScriptDir..[[lib\Mig21.lua]])
dofile(BIOS.LuaScriptDir..[[lib\NS430.lua]])
dofile(BIOS.LuaScriptDir..[[lib\P-51D.lua]])
dofile(BIOS.LuaScriptDir..[[lib\SA342M.lua]])
dofile(BIOS.LuaScriptDir..[[lib\SpitfireLFMkIX.lua]])
dofile(BIOS.LuaScriptDir..[[lib\UH1H.lua]])
dofile(BIOS.LuaScriptDir..[[lib\Yak-52.lua]])
dofile(BIOS.LuaScriptDir..[[BIOSConfig.lua]])

-- Prev Export functions.
local PrevExport = {}
Expand Down
2 changes: 1 addition & 1 deletion src/dcs-lua/lib/A10C.lua
View file
Expand Up @@ -1152,7 +1152,7 @@ definePotentiometer("RWR_BRT", 29, 3001, 16, {0.15, 0.85}, "RWR", "Display Brigh


local JSON = loadfile([[Scripts\JSON.lua]])()
local cdu_indicator_data_file = io.open(lfs.writedir()..[[Scripts\DCS-BIOS\lib\CDU.json]], "r")
local cdu_indicator_data_file = io.open(BIOS.LuaScriptDir..[[lib\CDU.json]], "r")
local cdu_indicator_data = JSON:decode(cdu_indicator_data_file:read("*a"))
cdu_indicator_data_file:close()
cdu_indicator_data_file = nil
Expand Down
14 changes: 5 additions & 9 deletions src/dcs-lua/lib/Protocol.lua
View file
Expand Up @@ -57,23 +57,19 @@ function BIOS.protocol.beginModule(name, baseAddress)
exportModules[name] = moduleBeingDefined
end
function BIOS.protocol.endModule()
local jsonFileDir = lfs.writedir().."DCS-BIOS JSON"
local function saveDoc()
local JSON = loadfile([[Scripts\JSON.lua]])()
local file, err = io.open(lfs.writedir()..[[Scripts\DCS-BIOS\doc\json\]]..moduleBeingDefined.name..".json", "w")
local file, err = io.open(lfs.writedir()..[[DCS-BIOS JSON\]]..moduleBeingDefined.name..".json", "w")
local json_string = JSON:encode_pretty(moduleBeingDefined.documentation)
if file then
file:write(json_string)
file:close()
end
local file, err = io.open(lfs.writedir()..[[Scripts\DCS-BIOS\doc\json\]]..moduleBeingDefined.name..".jsonp", "w")
if file then
file:write('docdata["'..moduleBeingDefined.name..'"] =\n')
file:write(json_string)
file:write(";\n")
file:close()
end
end
pcall(saveDoc)
if lfs.attributes(lfs.writedir().."DCS-BIOS JSON") ~= nil then
pcall(saveDoc)
end
moduleBeingDefined = nil
end

Expand Down

0 comments on commit 7c97003

Please sign in to comment.