Merged branch develop into feature/fixups-unify-log+chunk-checking

ReleaseNotes.md

@@ -1,4 +1,6 @@
 Changelog
+# 0.10.9 (11 jan 2016)
+# 0.10.8 (11 jan 2016)
 # 0.10.8-b (7 jan 2016)
 Logging less by default, fixing some pretty serious memory issues, which could cause the WiFi-box to 'crash' while printing bigger files.
 Log level setting, enabling users to log more if they run into problems.

extra/scripts/attach-license.lua

@@ -254,6 +254,8 @@ local function main()
 			else
 				print("error: file '" .. f .. "' has uncommitted changes in git, refusing to process")
 			end
+		elseif processType == false then
+			print("Skipping excluded file '" .. f .. "'")
 		end
 	end
 end

extra/scripts/publish-wifibox-release.lua

@@ -8,13 +8,21 @@
 -- USAGE:
 -- The only dependency of this script are the penlight and luafilesystem libraries, which can be installed using
 -- LuaRocks (http://luarocks.org/) as follows:
--- sudo luarocks install penlight
+-- $ sudo luarocks install penlight
 -- If the penlight libary is not found you might need to add the following to /etc/launchd.conf
 -- setenv LUA_CPATH /opt/local/share/luarocks/lib/lua/5.2/?.so
 -- setenv LUA_PATH /opt/local/share/luarocks/share/lua/5.2/?.lua
 -- Reboot
 -- Also see: https://github.com/keplerproject/luarocks/wiki/Using-LuaRocks#rocks-trees-and-the-lua-libraries-path
 --
+-- Lua + Luarocks installation on Linux:
+--   $ sudo apt-get install lua5.2 liblua5.2-dev
+--   # Build Luarocks from source, configured for lua 5.2:
+--   $ wget http://luarocks.org/releases/luarocks-2.2.2.tar.gz
+--   $ tar zxpf luarocks-2.2.2.tar.gz
+--   $ cd luarocks-2.2.2
+--   $ ./configure --lua-version=5.2
+--   $ sudo make bootstrap
 -- This script will automatically locate the Doodle3D repo's.
 -- Index files are fetched from the online repository.
 -- For synchronizing, rsync must have passwordless SSH access to the server, for a

src/FIRMWARE-VERSION

@@ -1 +1 @@
-0.10.8-b
+0.10.9

src/script/collect-code.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-BASE_NAME=d3d-wifibox-backup
-SRC_PATHS="/etc /root /www/ /usr/share/lua"
-TEMP_DIR=/tmp
-TGT_FILE=$BASE_NAME.tar.gz
-
-if [ -e /www-external ]; then
-	echo "ERROR: switch back /www-regular to /www before running this script"
-	exit 1
-fi
-
-cd $TEMP_DIR
-if [ $? != 0 ]; then
-	echo "ERROR: could not cd to temporary directory ($TEMP_DIR)"
-	exit 2
-fi
-
-TGT_DIR=$TEMP_DIR/$BASE_NAME
-rm -rf $TGT_DIR
-mkdir -p $TGT_DIR
-
-for path in $SRC_PATHS; do
-	echo "copying $path -> $TGT_DIR..."
-	cp -a $path $TGT_DIR
-done
-
-echo "compressing $TGT_DIR into $BASE_NAME.tar.gz..."
-tar czf $BASE_NAME.tar.gz $BASE_NAME
-
-echo "removing staging dir..."
-rm -rf $TGT_DIR
-
-echo "done."