From 6df0824474652c2b71a2b8b33ec827508e43087c Mon Sep 17 00:00:00 2001
From: poire-z <poire-z@users.noreply.github.com>
Date: Thu, 4 Jan 2018 18:35:02 +0100
Subject: [PATCH] kodev: two small fixes (#3575)

- kodev-run: fix use of $args
- kodev-build: build the emulator in debug mode, for consistency
with kodev-run
- kodev build: add --debug / --no-debug options
---
 kodev | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/kodev b/kodev
index 7d74e88b5..75be39b05 100755
--- a/kodev
+++ b/kodev
@@ -125,6 +125,8 @@ usage: build <OPTIONS> <TARGET>
 OPTIONS:
 
     -v, --verbose   Build in verbose mode.
+    --debug         include debugging symbols (default for emulator)
+    --no-debug      no debugging symbols (default for target devices)
 
 TARGET:
 ${SUPPORTED_TARGETS}"
@@ -140,6 +142,14 @@ ${SUPPORTED_TARGETS}"
                 echo "${BUILD_HELP_MSG}"
                 exit 0
                 ;;
+            --no-debug)
+                export KODEBUG=
+                KODEBUG_NO_DEFAULT=1
+                ;;
+            --debug)
+                export KODEBUG=1
+                KODEBUG_NO_DEFAULT=1
+                ;;
             *)
                 echo "ERROR: unknown option \"$PARAM\""
                 echo "${BUILD_HELP_MSG}"
@@ -207,6 +217,10 @@ ${SUPPORTED_TARGETS}"
             assert_ret_zero $?
             ;;
         *)
+            if [ -z "${KODEBUG_NO_DEFAULT+x}" ]; then # no explicit --debug / --no-debug
+                # builds a debug build by default, like kodev-run
+                export KODEBUG=1
+            fi
             make
             assert_ret_zero $? "Failed to build emulator! Try run with -v for more information."
             setup_env
@@ -546,14 +560,14 @@ TARGET:
                 CATCHSEGV=$(which catchsegv)
             fi
 
-            KOREADER_COMMAND="${CATCHSEGV} ./reader.lua -d ${args}"
+            KOREADER_COMMAND="${CATCHSEGV} ./reader.lua -d"
 
             if [ ! -z "${gdb}" ]; then
-                KOREADER_COMMAND="${gdb} ./luajit reader.lua -d ${args}"
+                KOREADER_COMMAND="${gdb} ./luajit reader.lua -d"
             fi
 
             if [ ! -z "${valgrind}" ]; then
-                KOREADER_COMMAND="${valgrind} ./luajit reader.lua -d ${args}"
+                KOREADER_COMMAND="${valgrind} ./luajit reader.lua -d"
             fi
 
             echo "[*] Running KOReader with arguments: $*..."
@@ -564,6 +578,7 @@ TARGET:
                     args="$*"
                     [[ $args != /* ]] && args="${CURDIR}/${args}"
                 fi
+                KOREADER_COMMAND="$KOREADER_COMMAND ${args}"
 
                 RETURN_VALUE=85
                 while [ $RETURN_VALUE -eq 85 ]; do