Add some fixes and make 'how-to-build' scripts runnable

octaspire · Jun 15, 2017 · 47cc1ba · 47cc1ba
1 parent a2e8bfb
commit 47cc1ba
Show file tree

Hide file tree

Showing 22 changed files with 64 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 2.8.12)
 project(octaspire-dern C)
 
 set(OCTASPIRE_DERN_CONFIG_VERSION_MAJOR 0)
-set(OCTASPIRE_DERN_CONFIG_VERSION_MINOR 133)
+set(OCTASPIRE_DERN_CONFIG_VERSION_MINOR 134)
 set(OCTASPIRE_DERN_CONFIG_VERSION_PATCH 0)
 
 message("== Building ${PROJECT_NAME} ${OCTASPIRE_DERN_CONFIG_VERSION_MAJOR}.${OCTASPIRE_DERN_CONFIG_VERSION_MINOR}.${OCTASPIRE_DERN_CONFIG_VERSION_PATCH}")

diff --git a/doc/book/Programming_in_Octaspire_Dern.adoc b/doc/book/Programming_in_Octaspire_Dern.adoc
@@ -4,7 +4,7 @@ Programming in Octaspire Dern
 :lang: en
 :toc:
 
-Documentation for Octaspire Dern programming language version 0.133.0
+Documentation for Octaspire Dern programming language version 0.134.0
 
 == About
 

diff --git a/doc/book/Programming_in_Octaspire_Dern.html b/doc/book/Programming_in_Octaspire_Dern.html
@@ -804,7 +804,7 @@ <h1>Programming in Octaspire Dern</h1>
 <div id="content">
 <div id="preamble">
 <div class="sectionbody">
-<div class="paragraph"><p>Documentation for Octaspire Dern programming language version 0.133.0</p></div>
+<div class="paragraph"><p>Documentation for Octaspire Dern programming language version 0.134.0</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -1753,7 +1753,7 @@ <h2 id="_using_the_amalgamated_source">Using the amalgamated source</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2017-06-15 16:46:14 EEST
+ 2017-06-15 22:01:56 EEST
 </div>
 </div>
 </body>

diff --git a/etc/how-to-build/FreeBSD.sh b/etc/how-to-build/FreeBSD.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echoAndRun() { echo "$@" ; "$@" ; }
 echoToDefs() { echo "$(tput setaf 9) $(tput sgr0)" ; }
 

diff --git a/etc/how-to-build/NetBSD.sh b/etc/how-to-build/NetBSD.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echoAndRun() { echo "$@" ; "$@" ; }
 echoToDefs() { echo "$(tput setaf 9) $(tput sgr0)" ; }
 
@@ -65,12 +67,12 @@ cat << EnDoFmEsSaGe
    binary plugin 'dern_ncurses', you don't have to do anything. Otherwise,
    to install development version of library 'ncurses':
 
-       - NetBSD: sudo pkgin install devel/ncurses
+       - NetBSD: sudo pkgin install ncurses
 -------------------------------------------------------------------------------
 EnDoFmEsSaGe
 echoToDefs
 echoAndRun $CC -O2 -std=c99 -Wall -Wextra -fPIC -I . -c plugins/dern_ncurses.c
-echoAndRun $CC -O2 -std=c99 -Wall -Wextra -shared -I . -o libdern_ncurses.so dern_ncurses.o -lncurses
+echoAndRun $CC -O2 -std=c99 -Wall -Wextra -shared -I . -o libdern_ncurses.so dern_ncurses.o -lcurses -lterminfo
 
 
 

diff --git a/etc/how-to-build/OpenBSD.sh b/etc/how-to-build/OpenBSD.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echoAndRun() { echo "$@" ; "$@" ; }
 echoToDefs() { echo "$(tput sgr0)" ; }
 

diff --git a/etc/how-to-build/haiku.sh b/etc/how-to-build/haiku.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echoAndRun() { echo "$@" ; "$@" ; }
 echoToDefs() { echo "$(tput setaf 9) $(tput sgr0)" ; }
 

diff --git a/etc/how-to-build/linux.sh b/etc/how-to-build/linux.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echoAndRun() { echo "$@" ; "$@" ; }
 echoToDefs() { echo "$(tput setaf 9) $(tput sgr0)" ; }
 

diff --git a/etc/how-to-build/minix3.sh b/etc/how-to-build/minix3.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echoAndRun() { echo "$@" ; "$@" ; }
 echoToDefs() { echo "$(tput setaf 9) $(tput sgr0)" ; }
 

diff --git a/etc/octaspire_dern_amalgamated.c b/etc/octaspire_dern_amalgamated.c
@@ -16007,10 +16007,10 @@ limitations under the License.
 #define OCTASPIRE_DERN_CONFIG_H
 
 #define OCTASPIRE_DERN_CONFIG_VERSION_MAJOR "0"
-#define OCTASPIRE_DERN_CONFIG_VERSION_MINOR "133"
+#define OCTASPIRE_DERN_CONFIG_VERSION_MINOR "134"
 #define OCTASPIRE_DERN_CONFIG_VERSION_PATCH "0"
 
-#define OCTASPIRE_DERN_CONFIG_VERSION_STR   "Octaspire Dern version 0.133.0"
+#define OCTASPIRE_DERN_CONFIG_VERSION_STR   "Octaspire Dern version 0.134.0"
 
 
 

diff --git a/etc/plugins/dern_ncurses.c b/etc/plugins/dern_ncurses.c
@@ -1,5 +1,10 @@
 #include "octaspire-dern-amalgamated.c"
+
+#ifdef __NetBSD__
+#include <curses.h>
+#else
 #include <ncurses.h>
+#endif
 
 static char const * const DERN_NCURSES_PLUGIN_NAME = "dern_ncurses";
 
@@ -251,9 +256,9 @@ octaspire_dern_value_t *dern_ncurses_set_cursor(
         if (result == ERR)
         {
             octaspire_helpers_verify(stackLength == octaspire_dern_vm_get_stack_length(vm));
-            return octaspire_dern_vm_create_new_value_error_from_c_string(
+            return octaspire_dern_vm_create_new_value_string_from_c_string(
                 vm,
-                "Builtin 'ncurses-set-cursor' failed to make cursor 'invisible'. ");
+                "Builtin 'ncurses-set-cursor' failed to make cursor 'invisible'.");
         }
     }
     else if (octaspire_dern_value_as_symbol_is_equal_to_c_string(arg, "normal"))
@@ -263,9 +268,9 @@ octaspire_dern_value_t *dern_ncurses_set_cursor(
         if (result == ERR)
         {
             octaspire_helpers_verify(stackLength == octaspire_dern_vm_get_stack_length(vm));
-            return octaspire_dern_vm_create_new_value_error_from_c_string(
+            return octaspire_dern_vm_create_new_value_string_from_c_string(
                 vm,
-                "Builtin 'ncurses-set-cursor' failed to make cursor 'normal'. ");
+                "Builtin 'ncurses-set-cursor' failed to make cursor 'normal'.");
         }
     }
     else if (octaspire_dern_value_as_symbol_is_equal_to_c_string(arg, "very-visible"))
@@ -275,7 +280,7 @@ octaspire_dern_value_t *dern_ncurses_set_cursor(
         if (result == ERR)
         {
             octaspire_helpers_verify(stackLength == octaspire_dern_vm_get_stack_length(vm));
-            return octaspire_dern_vm_create_new_value_error_from_c_string(
+            return octaspire_dern_vm_create_new_value_string_from_c_string(
                 vm,
                 "Builtin 'ncurses-set-cursor' failed to make cursor 'very-visible'. ");
         }
@@ -1398,7 +1403,7 @@ bool dern_ncurses_init(
             "ncurses-set-cursor",
             dern_ncurses_set_cursor,
             1,
-            "(ncurses-set-cursor boolean) -> boolean",
+            "(ncurses-set-cursor boolean) -> symbol of previous mode or error string",
             targetEnv))
     {
         return false;

diff --git a/release/README b/release/README
@@ -1,12 +1,12 @@
 This is amalgamated single file source release for Octaspire Dern programming
-language version 0.133.0. File 'octaspire-dern-amalgamated.c'
+language version 0.134.0. File 'octaspire-dern-amalgamated.c'
 is all that is needed; it has no other dependencies than a C compiler and
 standard library supporting C99.
 
 SHA-512 checksums for this and older releases can be found from:
 https://octaspire.github.io/dern/
-If you want to check this release, download checksums for version 0.133.0 from:
-https://octaspire.github.io/dern/checksums-0.133.0
+If you want to check this release, download checksums for version 0.134.0 from:
+https://octaspire.github.io/dern/checksums-0.134.0
 
 Building instructions for all supported platforms (and scripts for building
 automatically) can be found in directory 'how-to-build'. Look for a file that

diff --git a/release/documentation/Programming_in_Octaspire_Dern.html b/release/documentation/Programming_in_Octaspire_Dern.html
@@ -804,7 +804,7 @@ <h1>Programming in Octaspire Dern</h1>
 <div id="content">
 <div id="preamble">
 <div class="sectionbody">
-<div class="paragraph"><p>Documentation for Octaspire Dern programming language version 0.133.0</p></div>
+<div class="paragraph"><p>Documentation for Octaspire Dern programming language version 0.134.0</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -1753,7 +1753,7 @@ <h2 id="_using_the_amalgamated_source">Using the amalgamated source</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2017-06-15 16:46:14 EEST
+ 2017-06-15 22:01:56 EEST
 </div>
 </div>
 </body>

diff --git a/release/how-to-build/FreeBSD.sh b/release/how-to-build/FreeBSD.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echoAndRun() { echo "$@" ; "$@" ; }
 echoToDefs() { echo "$(tput setaf 9) $(tput sgr0)" ; }
 

diff --git a/release/how-to-build/NetBSD.sh b/release/how-to-build/NetBSD.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echoAndRun() { echo "$@" ; "$@" ; }
 echoToDefs() { echo "$(tput setaf 9) $(tput sgr0)" ; }
 
@@ -65,12 +67,12 @@ cat << EnDoFmEsSaGe
    binary plugin 'dern_ncurses', you don't have to do anything. Otherwise,
    to install development version of library 'ncurses':
 
-       - NetBSD: sudo pkgin install devel/ncurses
+       - NetBSD: sudo pkgin install ncurses
 -------------------------------------------------------------------------------
 EnDoFmEsSaGe
 echoToDefs
 echoAndRun $CC -O2 -std=c99 -Wall -Wextra -fPIC -I . -c plugins/dern_ncurses.c
-echoAndRun $CC -O2 -std=c99 -Wall -Wextra -shared -I . -o libdern_ncurses.so dern_ncurses.o -lncurses
+echoAndRun $CC -O2 -std=c99 -Wall -Wextra -shared -I . -o libdern_ncurses.so dern_ncurses.o -lcurses -lterminfo
 
 
 

diff --git a/release/how-to-build/OpenBSD.sh b/release/how-to-build/OpenBSD.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echoAndRun() { echo "$@" ; "$@" ; }
 echoToDefs() { echo "$(tput sgr0)" ; }
 

diff --git a/release/how-to-build/haiku.sh b/release/how-to-build/haiku.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echoAndRun() { echo "$@" ; "$@" ; }
 echoToDefs() { echo "$(tput setaf 9) $(tput sgr0)" ; }
 

diff --git a/release/how-to-build/linux.sh b/release/how-to-build/linux.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echoAndRun() { echo "$@" ; "$@" ; }
 echoToDefs() { echo "$(tput setaf 9) $(tput sgr0)" ; }
 

diff --git a/release/how-to-build/minix3.sh b/release/how-to-build/minix3.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echoAndRun() { echo "$@" ; "$@" ; }
 echoToDefs() { echo "$(tput setaf 9) $(tput sgr0)" ; }
 

diff --git a/release/octaspire-dern-amalgamated.c b/release/octaspire-dern-amalgamated.c
@@ -16007,10 +16007,10 @@ limitations under the License.
 #define OCTASPIRE_DERN_CONFIG_H
 
 #define OCTASPIRE_DERN_CONFIG_VERSION_MAJOR "0"
-#define OCTASPIRE_DERN_CONFIG_VERSION_MINOR "133"
+#define OCTASPIRE_DERN_CONFIG_VERSION_MINOR "134"
 #define OCTASPIRE_DERN_CONFIG_VERSION_PATCH "0"
 
-#define OCTASPIRE_DERN_CONFIG_VERSION_STR   "Octaspire Dern version 0.133.0"
+#define OCTASPIRE_DERN_CONFIG_VERSION_STR   "Octaspire Dern version 0.134.0"
 
 
 

diff --git a/release/plugins/dern_ncurses.c b/release/plugins/dern_ncurses.c
@@ -1,5 +1,10 @@
 #include "octaspire-dern-amalgamated.c"
+
+#ifdef __NetBSD__
+#include <curses.h>
+#else
 #include <ncurses.h>
+#endif
 
 static char const * const DERN_NCURSES_PLUGIN_NAME = "dern_ncurses";
 
@@ -251,9 +256,9 @@ octaspire_dern_value_t *dern_ncurses_set_cursor(
         if (result == ERR)
         {
             octaspire_helpers_verify(stackLength == octaspire_dern_vm_get_stack_length(vm));
-            return octaspire_dern_vm_create_new_value_error_from_c_string(
+            return octaspire_dern_vm_create_new_value_string_from_c_string(
                 vm,
-                "Builtin 'ncurses-set-cursor' failed to make cursor 'invisible'. ");
+                "Builtin 'ncurses-set-cursor' failed to make cursor 'invisible'.");
         }
     }
     else if (octaspire_dern_value_as_symbol_is_equal_to_c_string(arg, "normal"))
@@ -263,9 +268,9 @@ octaspire_dern_value_t *dern_ncurses_set_cursor(
         if (result == ERR)
         {
             octaspire_helpers_verify(stackLength == octaspire_dern_vm_get_stack_length(vm));
-            return octaspire_dern_vm_create_new_value_error_from_c_string(
+            return octaspire_dern_vm_create_new_value_string_from_c_string(
                 vm,
-                "Builtin 'ncurses-set-cursor' failed to make cursor 'normal'. ");
+                "Builtin 'ncurses-set-cursor' failed to make cursor 'normal'.");
         }
     }
     else if (octaspire_dern_value_as_symbol_is_equal_to_c_string(arg, "very-visible"))
@@ -275,7 +280,7 @@ octaspire_dern_value_t *dern_ncurses_set_cursor(
         if (result == ERR)
         {
             octaspire_helpers_verify(stackLength == octaspire_dern_vm_get_stack_length(vm));
-            return octaspire_dern_vm_create_new_value_error_from_c_string(
+            return octaspire_dern_vm_create_new_value_string_from_c_string(
                 vm,
                 "Builtin 'ncurses-set-cursor' failed to make cursor 'very-visible'. ");
         }
@@ -1398,7 +1403,7 @@ bool dern_ncurses_init(
             "ncurses-set-cursor",
             dern_ncurses_set_cursor,
             1,
-            "(ncurses-set-cursor boolean) -> boolean",
+            "(ncurses-set-cursor boolean) -> symbol of previous mode or error string",
             targetEnv))
     {
         return false;

diff --git a/test/REPL/octaspire-dern-repl.exp b/test/REPL/octaspire-dern-repl.exp
@@ -3,7 +3,7 @@ set timeout 4
 
 spawn ../../build/octaspire-dern-repl -v
 expect {
-    "Octaspire Dern version 0.133.0"
+    "Octaspire Dern version 0.134.0"
     {puts "\n\x1B\[32m---------- TEST PASS ----------\x1B\[0m\n"         }
 
     default