Minor fixes, allowing RVI to be built and executed on tizen

Signed-off-by: Magnus <mfeuer@jaguarlandrover.com>

3 files changed, 10 insertions, 18 deletions

diff --git a/rel/reltool.config b/rel/reltool.config
index 8405060..ac2bdfd 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -24,7 +24,8 @@
                            "^erts.*/bin/(dialyzer|typer)",
                            "^erts.*/(doc|info|include|lib|man|src)"]},
        {excl_app_filters, ["\.gitignore"]},
-       {app, rvi, [{mod_cond, app}, {incl_cond, include}, {lib_dir, ".."}]}
+       {app, rvi, [{mod_cond, app}, {incl_cond, include}, {lib_dir, ".."}]},
+       {app, hipe, [{incl_cond, exclude}]}
       ]}.
 
 {target_dir, "rvi"}.
diff --git a/rvi_node.sh b/rvi_node.sh
index 92f67ae..607ed8a 100755
--- a/rvi_node.sh
+++ b/rvi_node.sh
@@ -8,25 +8,21 @@
 #
 
 #
-# Launch an RVI node
+# Launch an RVI node using the build direcotriuies.
 #
 # This script launches the erlang runtime system and executes the RVI
-# code directly from its build directory. It does not (yet) launch a
-# separate release, but is instead intended for testing and evaluation.
-#
+# code directly from its build directory. Use ./setup_rvi_node without
+# the -d flag to create an installable release that can execute
+# without the use of this script.
 #
 # This script can be executed after a setup_node.sh has been executed to 
 # create the necessary config files and erlang boot scripts.
 #
 
-# ./rvi_node.sh 
-
 usage() {
     echo "Usage: $0 -n node_name -b|-r [-p port] [-s prefix,ip:port]..."
     echo "  -n node_name          Specify the name of the rvi node to launch"
-    echo "  -b                    Launch using development build (default)"
-    echo "  -r                    Launch using release"
-    echo 
+
     echo "Configuration data is read from the configuration file"
     echo "provided to the setup_rvi_node.sh script that created the node."
     exit 1
@@ -38,12 +34,6 @@ while getopts ":n:brp:s:" o; do
         n)
             node_name=${OPTARG}
             ;;
-        b)
-            mode=build
-            ;;
-        r)
-            mode=release
-            ;;
         *)
             usage
             ;;
diff --git a/setup_rvi_node.sh b/setup_rvi_node.sh
index b63c65b..c44a553 100755
--- a/setup_rvi_node.sh
+++ b/setup_rvi_node.sh
@@ -94,13 +94,14 @@ $SETUP_GEN $NODE_NAME $CONFIG_NAME $NODE_NAME
 
 if [ "${build_type}" = "dev" ]
 then
-    echo "RVI Node $NODE_NAME has been setup. Launch with ./rvi_node.sh -n $NODE_NAME"
+    echo "RVI Node $NODE_NAME has been setup."
+    echo "Launch with ./rvi_node.sh -n $NODE_NAME"
     exit
 else
     echo "Building stand-alone release for $NODE_NAME"
     # Copy the newly created config file.
     cp $NODE_NAME/sys.config rel/files/sys.config
-    rebar generate 
+    ./rebar generate 
     # Rename the release after the node name
     mv rel/rvi rel/$NODE_NAME
     echo "Stand alone release for $NODE_NAME created under ./rel/$NODE_NAME."