WIP BROKEN libticonv, libtifiles, libticalcs: add initial, limited su…

…pport for the CBL, CBR, CBL2, CBR2 (legacy I/O), LabPro (legacy I/O) and TI-Presenter; add ticonv_model_is_lab_equipment(), multiple libticalcs functions, and torture tests; improve test_ticalcs_2 a lot further; require a C++11 compiler and autoconf-archive. Tests, test programs and sources of information by myself, Xavier "critor" Andréani, CVSoft / notipa and Brandon "BrandonW" Wilson. Signed-off-by: Lionel Debroux <[email protected]>
debrouxl · Mar 20, 2020 · 956c8dc · 956c8dc
1 parent 44c9a7f
commit 956c8dc
Show file tree

Hide file tree

Showing 49 changed files with 4,684 additions and 1,187 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,7 @@ _linuxpackages: &_linuxpackages
         - ninja-build
         - liblz4-dev
         - liblzma-dev
+        - autoconf-archive
 
 matrix:
   include:
@@ -58,7 +59,7 @@ matrix:
       env: PREBUILDER=cmake     BUILDER=ninja
 
 install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake ninja gettext libarchive libtool glib libusb bison flex texinfo libiconv intltool ; brew link --force gettext libarchive ; export PKG_CONFIG_PATH="/usr/local/opt/libarchive/lib/pkgconfig"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake ninja gettext libarchive libtool glib libusb bison flex texinfo libiconv intltool autoconf-archive ; brew link --force gettext libarchive ; export PKG_CONFIG_PATH="/usr/local/opt/libarchive/lib/pkgconfig"; fi
   - which gcc   ; gcc --version
   - which cmake ; cmake --version
   - which ninja ; ninja --version

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,6 +35,7 @@ set(USED_CMAKE_GENERATOR "${CMAKE_GENERATOR}" CACHE STRING "Expose CMAKE_GENERAT
 message(STATUS "Detected system: ${CMAKE_SYSTEM_NAME} - host processor: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
 
 include(GNUInstallDirs)
+include(CheckFunctionExists)
 
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 11)
@@ -70,6 +71,14 @@ set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}")
 
 # Global defines
 add_definitions(-DHAVE_FVISIBILITY=1 -DLOCALEDIR="${LOCALEDIR}")
+check_function_exists(strtok_r HAVE_STRTOK_R)
+check_function_exists(strtok_s HAVE_STRTOK_S)
+if(HAVE_STRTOK_R)
+add_definitions(-DHAVE_STRTOK_R=1)
+endif()
+if(HAVE_STRTOK_S)
+add_definitions(-DHAVE_STRTOK_S=1)
+endif()
 
 # For libs finding
 find_package(PkgConfig)

diff --git a/libticalcs/trunk/CMakeLists.txt b/libticalcs/trunk/CMakeLists.txt
@@ -16,6 +16,7 @@ set(SRC_FILES
         src/calc_9x.cc
         src/calc_nsp.cc
         src/calc_xx.cc
+        src/calclabequipmentdata.cc
         src/clock.cc
         src/cmd68k.cc
         src/cmdz80.cc
@@ -59,7 +60,8 @@ set(PUBLIC_HEADERS
         src/nsp_vpkt.h
         src/nsp_cmd.h
         src/cmdz80.h
-        src/cmd68k.h)
+        src/cmd68k.h
+        src/calclabequipmentdata.h)
 
 # external deps lookup
 pkg_check_modules(DEPS REQUIRED glib-2.0 ticonv ticables2 tifiles2)

diff --git a/libticalcs/trunk/configure.ac b/libticalcs/trunk/configure.ac
@@ -90,10 +90,11 @@ AC_CHECK_HEADERS([stdlib.h string.h time.h unistd.h])
 AC_C_BIGENDIAN
 AC_C_CONST
 AC_C_RESTRICT
+AX_CXX_COMPILE_STDCXX_11
 
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
-AC_CHECK_FUNCS([bzero memmove memset strcasecmp strdup localtime_r asctime_r])
+AC_CHECK_FUNCS([bzero memmove memset strcasecmp strdup localtime_r asctime_r strtok_r strtok_s])
 
 # Platform specific tests.
 dnl AC_CANONICAL_HOST

diff --git a/libticalcs/trunk/po/POTFILES.in b/libticalcs/trunk/po/POTFILES.in
@@ -1,6 +1,7 @@
 # List of source files containing translatable strings.
 
 src/backup.cc
+src/calclabequipmentdata.cc
 src/calc_00.cc
 src/calc_73.cc
 src/calc_84p.cc