Skip to content

Pipe colony-compiler output instead of writing a temp file #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevinmehall wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pipe colony-compiler output instead of writing a temp file #665

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/colony/lua/preload.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,15 @@ if not _G.COLONY_EMBED then
-- This is temporary until we have proper compilation in C.
colony._load = function (file)
-- Compile JS script before running.
local status
assert(#_G.COLONY_COMPILER_PATH ~= 0, "COLONY_COMPILER_PATH is not defined")
local handle
if jit == nil then
status = os.execute(_G.COLONY_COMPILER_PATH .. ' -m ' .. file .. ' > /tmp/colonyunique')
handle = io.popen(_G.COLONY_COMPILER_PATH .. ' -m "' .. file .. '"')
else
status = os.execute(_G.COLONY_COMPILER_PATH .. ' -l ' .. file .. ' > /tmp/colonyunique')
handle = io.popen(_G.COLONY_COMPILER_PATH .. ' -l "' .. file .. '"')
end
if status ~= 0 then
os.exit(status)
end
local file = io.open('/tmp/colonyunique', 'r')
local output = file:read('*all')
file:close()
local output = handle:read('*all')
handle:close()
return output
end
end
Expand Down