From 37f833aec1f31e9f42e7bee497b627d8c00ba6a4 Mon Sep 17 00:00:00 2001 From: Wouter R Date: Fri, 8 Jan 2016 23:24:03 +0100 Subject: [PATCH 1/4] Print skipped files when adding copyright notices. Remove old script. --- extra/scripts/attach-license.lua | 2 ++ src/script/collect-code.sh | 34 -------------------------------- 2 files changed, 2 insertions(+), 34 deletions(-) delete mode 100755 src/script/collect-code.sh diff --git a/extra/scripts/attach-license.lua b/extra/scripts/attach-license.lua index aff1024..1d1e184 100755 --- a/extra/scripts/attach-license.lua +++ b/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 diff --git a/src/script/collect-code.sh b/src/script/collect-code.sh deleted file mode 100755 index a41902b..0000000 --- a/src/script/collect-code.sh +++ /dev/null @@ -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." From fd1a428aeaf518fcc54745f30815f499a03a8cdc Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Mon, 11 Jan 2016 12:02:26 +0100 Subject: [PATCH 2/4] 0.10.8 version and release notes --- ReleaseNotes.md | 7 ++++--- src/FIRMWARE-VERSION | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index ae17ee7..b6b68e7 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,9 +1,10 @@ Changelog +# 0.10.8 # 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. +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. For better adhesion we extruded even while traveling on the bottom layers, we now made it configurable and turned it off by default. -Fixed month display of releases in settings screen. +Fixed month display of releases in settings screen. # 0.10.8-a (11 nov 2015) Added ch341 and cp210x usb-serial drivers to diffconfig diff --git a/src/FIRMWARE-VERSION b/src/FIRMWARE-VERSION index 4c23639..1a46c7f 100644 --- a/src/FIRMWARE-VERSION +++ b/src/FIRMWARE-VERSION @@ -1 +1 @@ -0.10.8-b +0.10.8 From 95ea3a10595f55af4ab6603ca059b98d4cc6d928 Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Mon, 11 Jan 2016 12:31:40 +0100 Subject: [PATCH 3/4] 0.10.9 version and release notes --- ReleaseNotes.md | 3 ++- src/FIRMWARE-VERSION | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index b6b68e7..43512f5 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,5 +1,6 @@ Changelog -# 0.10.8 +# 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. diff --git a/src/FIRMWARE-VERSION b/src/FIRMWARE-VERSION index 1a46c7f..f314d02 100644 --- a/src/FIRMWARE-VERSION +++ b/src/FIRMWARE-VERSION @@ -1 +1 @@ -0.10.8 +0.10.9 From bd5a3045043441f110fb487e7bdc2c09c87accad Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Tue, 12 Jan 2016 12:03:53 +0100 Subject: [PATCH 4/4] Publish script comments update --- extra/scripts/publish-wifibox-release.lua | 26 +++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/extra/scripts/publish-wifibox-release.lua b/extra/scripts/publish-wifibox-release.lua index 6cbcacd..c47fa0b 100755 --- a/extra/scripts/publish-wifibox-release.lua +++ b/extra/scripts/publish-wifibox-release.lua @@ -7,15 +7,23 @@ -- -- 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 +-- LuaRocks (http://luarocks.org/) as follows: +-- $ 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 -- --- This script will automatically locate the Doodle3D repo's. +-- 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 -- guide, see: http://www.linuxproblem.org/art_9.html. @@ -27,8 +35,8 @@ -- HostName ftp.greenhost.nl -- Some basic sanity checks are built in (unique version, updated release notes, 'clean' openwrt config) -- but lots others are still missing (mainly: clean git repo's, freshly built images). --- The script must be run from within the openwrt build root. So it's handy to create a symlink --- to this file. You could to something like from the build root: +-- The script must be run from within the openwrt build root. So it's handy to create a symlink +-- to this file. You could to something like from the build root: -- ln -s ~/wrt-wifibox-feed/doodle3d-firmware/extra/scripts/publish-wifibox-release.lua . -- Then you can start with: -- cd trunk ../publish-wifibox-release.lua @@ -158,9 +166,9 @@ local function fileExists(path) end local function detectBuildroot() - if not fileExists("customfeeds") or not fileExists("bin") then - return false - else + if not fileExists("customfeeds") or not fileExists("bin") then + return false + else return true end end @@ -454,7 +462,7 @@ local function main() print("Error: could not collect local version information (" .. msg .. ")") quit(3) end - + local stables,betas = fetchVersionInfo() if not stables then print("Error: could not get version information (" .. betas .. ")")