new --strip option to build bundle

README.md

@@ -21,8 +21,12 @@ git init myapp
 vim myapp/main.lua
 # Run the app
 luvi myapp
-# Build the binary when done
+# Build the binary with compiled Lua code when done
 luvi myapp -o mybinary
+# Build the binary with compiled, striped Lua code when done
+luvi myapp -o mybinary -s
+# Build the binary just copy Lua code when done
+luvi myapp -o mybinary --copy
 # Run the new self-contained binary
 ./mybinary
 # Deploy / Publish / Profit!
@@ -235,10 +239,13 @@ Usage: luvi bundle+ [options] [-- extra args]
 
   bundle            Path to directory or zip file containing bundle source.
                     `bundle` can be specified multiple times to layer bundles
-                    on top of eachother.
+                    on top of each other.
   --version         Show luvi version and compiled in options.
   --output target   Build a luvi app by zipping the bundle and inserting luvi.
   --main path       Specify a custom main bundle path (normally main.lua)
+  --copy            Do not compile, just copy Lua code and compress.
+  --strip           Compile Lua code and strip debug info.
+  --force           Force build then bundle, ignore Lua compile error.
   --help            Show this help file.
   --                All args after this go to the luvi app itself.
 

src/lua/init.lua

@@ -46,6 +46,10 @@ local commands = {
   ["--version"] = "version",
   ["-h"] = "help",
   ["--help"] = "help",
+  ["--copy"] = "copy",
+  ["--force"] = "force",
+  ["-s"] = "strip",
+  ["--strip"] = "strip"
 }
 
 local function version(args)
@@ -64,6 +68,9 @@ Usage: $(LUVI) bundle+ [options] [-- extra args]
   --version         Show luvi version and compiled in options.
   --output target   Build a luvi app by zipping the bundle and inserting luvi.
   --main path       Specify a custom main bundle path (normally main.lua)
+  --copy            Do not compile, just copy Lua code and compress.
+  --strip           Compile Lua code and strip debug info.
+  --force           Force build then bundle, ignore Lua compile error.
   --help            Show this help file.
   --                All args after this go to the luvi app itself.
 
@@ -159,7 +166,7 @@ return function(args)
 
   -- Build the app if output is given
   if options.output then
-    return buildBundle(options.output, makeBundle(bundles))
+    return buildBundle(options, makeBundle(bundles))
   end
 
   -- Run the luvi app with the extra args

src/lua/luvibundle.lua

@@ -151,7 +151,9 @@ local function zipBundle(base, zip)
   return bundle
 end
 
-local function buildBundle(target, bundle)
+local function buildBundle(options, bundle)
+  assert(type(options)=='table')
+  local target = assert(options.output, "missing output target")
   target = pathJoin(uv.cwd(), target)
   print("Creating new binary: " .. target)
   local fd = assert(uv.fs_open(target, "w", 511)) -- 0777
@@ -173,6 +175,7 @@ local function buildBundle(target, bundle)
     uv.fs_close(fd2)
   end
 
+  local load = loadstring or load
   local writer = miniz.new_writer()
   local function copyFolder(path)
     local files = bundle.readdir(path)
@@ -187,7 +190,19 @@ local function buildBundle(target, bundle)
           copyFolder(child)
         elseif stat.type == "file" then
           print("    " .. child)
-          writer:add(child, bundle.readfile(child), 9)
+          local ctx = bundle.readfile(child)
+          local isLua = name:sub(-4, -1) == ".lua"
+
+          -- compile, strip lua code, but skip package.lua
+          if isLua and name ~= 'package.lua' and not options.copy then
+            local fn, err = load(ctx, child)
+            if not fn and not options.force then
+              error(err)
+            else
+              ctx = string.dump(fn, options.strip)
+            end
+          end
+          writer:add(child, ctx, 9)
         end
       end
     end