From fbb270ee4a9b879ed7bf476f0752432f1feb967c Mon Sep 17 00:00:00 2001
From: Jane Roxanne <janeroxanne0@gmail.com>
Date: Wed, 18 Mar 2020 13:23:39 -0500
Subject: [PATCH] This should work questionmark.

---
 .gitignore                 |  4 +++-
 application.lua            |  0
 make_release.lua           | 18 ++++++++++++++++++
 src/application.lua        |  2 +-
 src/directives/include.lua |  2 +-
 src/generator.lua          |  4 ++--
 src/init.lua               |  1 -
 7 files changed, 25 insertions(+), 6 deletions(-)
 delete mode 100644 application.lua
 create mode 100644 make_release.lua

diff --git a/.gitignore b/.gitignore
index 2ece25a..ddd2106 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-luacomp.lua
\ No newline at end of file
+luacomp.lua
+luacomp
+build/*
\ No newline at end of file
diff --git a/application.lua b/application.lua
deleted file mode 100644
index e69de29..0000000
diff --git a/make_release.lua b/make_release.lua
new file mode 100644
index 0000000..a3577c1
--- /dev/null
+++ b/make_release.lua
@@ -0,0 +1,18 @@
+local luaexec = {
+	"5.4",
+	"5.3",
+	"5.2",
+	"5.1",
+	"jit"
+}
+
+os.execute("rm -rf build")
+os.execute("mkdir build")
+for i=1, #luaexec do
+	os.execute("luacomp -xlua"..luaexec[i].." -mluamin -O build/luacomp-"..luaexec[i].." src/init.lua")
+	os.execute("luacomp -xlua"..luaexec[i].." -mnone -O build/luacomp-static-"..luaexec[i].." src/staticinit.lua")
+	os.execute("chmod +x build/luacomp-"..luaexec[i])
+	os.execute("chmod +x build/luacomp-static-"..luaexec[i])
+end
+
+os.execute("cp -v build/luacomp-".._VERSION:sub(5).." luacomp")
\ No newline at end of file
diff --git a/src/application.lua b/src/application.lua
index ab37b40..5ec863c 100644
--- a/src/application.lua
+++ b/src/application.lua
@@ -62,7 +62,7 @@ else
 end
 dprint("Generating AST...")
 local ast = mkast(f, file)
-ast.file = f
+ast.file = file
 dprint("Generating code...")
 local ocode = generate(ast, args.generator_code)
 
diff --git a/src/directives/include.lua b/src/directives/include.lua
index f2ffaad..e4f8e0b 100644
--- a/src/directives/include.lua
+++ b/src/directives/include.lua
@@ -6,6 +6,6 @@ function directives.include(env, file)
 	local fast = mkast(f, file)
 	fast.file = file
 	local code = generate(fast)
-	env.code = env.code .. "\n" .. code .. "\n"
+	env.code = env.code .. code .. "\n"
 	return true
 end
\ No newline at end of file
diff --git a/src/generator.lua b/src/generator.lua
index 261d1b5..751c70a 100644
--- a/src/generator.lua
+++ b/src/generator.lua
@@ -104,8 +104,8 @@ local function generate(ast, gencode)
       for k, v in pairs(vars) do
          vstr = vstr .. k.."=".."\""..svar_escape(v).."\" "
       end
-      dprint("Shell", vstr .. f.." 2>"..tname)
-      local h = io.popen(vstr .. f.." 2>"..tname, "r")
+      dprint("Shell", vstr .. f.." "..tname)
+      local h = io.popen(vstr .. f.." "..tname, "r")
       local output = h:read("*a"):gsub("\n$", "")
       local ok, sig, code = h:close()
       fh = io.open(tname, "r")
diff --git a/src/init.lua b/src/init.lua
index 2a56c2c..72ac419 100644
--- a/src/init.lua
+++ b/src/init.lua
@@ -18,4 +18,3 @@
 local argparse = require("argparse")
 
 --#include "src/application.lua"
----#include "src/application.lua" @[{test}]