DESERT Release 3.3.0

signetlabdei · Jan 22, 2023 · 0a5ea70 · 0a5ea70
1 parent 6debd11
commit 0a5ea70
Show file tree

Hide file tree

Showing 265 changed files with 18,287 additions and 27,865 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,4 +31,5 @@ MODEM_log_*
 ***/*.tr
 ***/test-driver
 ***/.clang-format
+***/configure~
 .DS_Store
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,10 @@
+3.3.0 - 2023-01-16
+	* OFDM support (thanks to Sara Falleni <[email protected]>)
+	* Updated WOSS and its dependancies
+	* New samples folder struct and organization
+	* Cross-compile support for Raspberry Pi Zero
+	* Cross-compile support for EvoLogics Debian Sandbox (thanks EvoLogics)
+	* Several bug fixes and improvements
 3.2.3 - 2021-03-14
 	* Improved doxygen documentation and project README
 	* Now doxygen is hosted on github pages
@@ -6,7 +13,6 @@
 	* Fix hd5 to use local zlib
 	* Fix tclcl installation of zlib
 	* Fixes on doxygen and minor improvements
-
 3.2.0 - 2020-26-10
 	* Various fixes on uwApplication
 	* Improvements and new features on uwpolling

diff --git a/...hysical/ms2c_evologics_lowlev/Makefile.am → ..._Addons/ms2c_evologics_lowlev/Makefile.am b/...hysical/ms2c_evologics_lowlev/Makefile.am → ..._Addons/ms2c_evologics_lowlev/Makefile.am
@@ -45,9 +45,9 @@ minterpreterTEL.h
 
 
 
-libevologics_driverll_la_CPPFLAGS = @NS_CPPFLAGS@ @NSMIRACLE_CPPFLAGS@ @DESERT_CPPFLAGS@
-libevologics_driverll_la_LDFLAGS =  @NS_LDFLAGS@ @NSMIRACLE_LDFLAGS@ @DESERT_LDFLAGS@
-libevologics_driverll_la_LIBADD = @NS_LIBADD@ @NSMIRACLE_LIBADD@ @DESERT_LIBADD@
+libevologics_driverll_la_CPPFLAGS = @NS_CPPFLAGS@ @NSMIRACLE_CPPFLAGS@ @DESERT_ADDON_CPPFLAGS@ @DESERT_CPPFLAGS@
+libevologics_driverll_la_LDFLAGS =  @NS_LDFLAGS@ @NSMIRACLE_LDFLAGS@ @DESERT_ADDON_LDFLAGS@ @DESERT_ADDON_LDFLAGS_BUILD@ @DESERT_LDFLAGS@ @DESERT_LDFLAGS_BUILD@
+libevologics_driverll_la_LIBADD = @NS_LIBADD@ @NSMIRACLE_LIBADD@ @DESERT_ADDON_LIBADD@ @DESERT_LIBADD@ @DESERT_LIBADD@
 
 nodist_libevologics_driverll_la_SOURCES = initTcl.cc
 BUILT_SOURCES = initTcl.cc

diff --git a/DESERT_Addons/ms2c_evologics_lowlev/autogen.sh b/DESERT_Addons/ms2c_evologics_lowlev/autogen.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Copyright (c) 2013 Regents of the SIGNET lab, University of Padova.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the University of Padova (SIGNET lab) nor the 
+#    names of its contributors may be used to endorse or promote products 
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#
+
+
+aclocal -I m4 --force && libtoolize --force && automake --foreign --add-missing && autoconf
diff --git a/DESERT_Addons/ms2c_evologics_lowlev/configure.ac b/DESERT_Addons/ms2c_evologics_lowlev/configure.ac
@@ -0,0 +1,72 @@
+#
+# Copyright (c) 2022 Regents of the SIGNET lab, University of Padova.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the University of Padova (SIGNET lab) nor the 
+#    names of its contributors may be used to endorse or promote products 
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+AC_INIT(libevologics_driverll, 1.0.0)
+AM_INIT_AUTOMAKE
+AM_PROG_AR
+
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_PROG_CXX
+AC_PROG_MAKE_SET
+
+AC_DISABLE_STATIC
+
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+AC_PATH_NS_ALLINONE
+
+AC_ARG_WITH_NSMIRACLE
+
+AC_CHECK_NSMIRACLE([have_nsmiracle=yes],[have_nsmiracle=no])
+if test x$have_nsmiracle != xyes ; then
+  AC_MSG_ERROR([Could not find nsmiracle, is --with-nsmiracle set correctly?])
+fi  
+
+
+AC_ARG_WITH_DESERT
+AC_ARG_WITH_DESERT_BUILD
+
+AC_CHECK_DESERT([have_desert=yes],[have_desert=no])
+if test x$have_desert != xyes ; then
+  AC_MSG_ERROR([Could not find desert, is --with-desert set correctly?])
+fi  
+
+AC_ARG_WITH_DESERT_ADDON
+AC_ARG_WITH_DESERT_ADDON_BUILD
+
+AC_DEFINE(CPP_NAMESPACE,std)
+
+AC_CONFIG_FILES([
+		m4/Makefile
+		Makefile
+      ])
+
+AC_OUTPUT
diff --git a/...physical/ms2c_evologics_lowlev/initlib.cc → ...T_Addons/ms2c_evologics_lowlev/initlib.cc b/...physical/ms2c_evologics_lowlev/initlib.cc → ...T_Addons/ms2c_evologics_lowlev/initlib.cc
diff --git a/DESERT_Addons/ms2c_evologics_lowlev/m4/Makefile.am b/DESERT_Addons/ms2c_evologics_lowlev/m4/Makefile.am
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2012 Regents of the SIGNET lab, University of Padova.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the University of Padova (SIGNET lab) nor the 
+#    names of its contributors may be used to endorse or promote products 
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+EXTRA_DIST = nsallinone.m4 nsmiracle.m4 desertAddon.m4
+
diff --git a/DESERT_Addons/ms2c_evologics_lowlev/m4/desert.m4 b/DESERT_Addons/ms2c_evologics_lowlev/m4/desert.m4
@@ -0,0 +1,144 @@
+#
+# Copyright (c) 2014 Regents of the SIGNET lab, University of Padova.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the University of Padova (SIGNET lab) nor the 
+#    names of its contributors may be used to endorse or promote products 
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+
+AC_DEFUN([AC_ARG_WITH_DESERT],[
+
+    DESERT_PATH=''
+    DESERT_CPPLAGS=''
+    DESERT_LDFLAGS=''
+    DESERT_LIBADD=''
+
+    AC_ARG_WITH([desert],
+        [AS_HELP_STRING([--with-desert=<directory>],
+                [use desert installation in <directory>])],
+        [
+            if test "x$withval" != "xno" ; then
+                if test -d $withval ; then
+                    DESERT_PATH="${withval}"
+                    if test ! -d "${DESERT_PATH}" ; then
+                    AC_MSG_ERROR([could not find ${withval}, is --with-desert=${withval} correct?])
+                fi
+
+                for dir in         \
+                    physical/uw-al  \
+                    network/uwip
+                do
+                    echo "considering dir \"$dir\""
+                    DESERT_CPPFLAGS="$DESERT_CPPFLAGS -I${DESERT_PATH}/${dir}"
+                    DESERT_LDFLAGS="$DESERT_LDFLAGS -L${DESERT_PATH}/${dir}"
+                done
+
+                for lib in \
+                    uwal \
+                    uwip
+                do
+                    DESERT_LIBADD="$DESERT_LIBADD -l${lib}"
+                done
+
+                DESERT_DISTCHECK_CONFIGURE_FLAGS="--with-desert=$withval"
+                AC_SUBST(DESERT_DISTCHECK_CONFIGURE_FLAGS)
+
+                else
+                    AC_MSG_ERROR([desert path $withval is not a directory])
+                fi
+            fi
+        ])
+
+    AC_SUBST(DESERT_CPPFLAGS)
+    AC_SUBST(DESERT_LDFLAGS)
+    AC_SUBST(DESERT_LIBADD)
+])
+
+AC_DEFUN([AC_ARG_WITH_DESERT_BUILD],[
+
+    DESERT_PATH_BUILD=''
+    DESERT_LDFLAGS_BUILD=''
+
+    AC_ARG_WITH([desert-build],
+        [AS_HELP_STRING([--with-desert-build=<directory>],
+                [use desert installation in <directory>])],
+        [
+            if test "x$withval" != "xno" ; then
+                if test -d $withval ; then
+                    DESERT_PATH_BUILD="${withval}"
+                    if test ! -d "${DESERT_PATH_BUILD}" ; then
+                        AC_MSG_ERROR([could not find ${withval}, is --with-desert-build=${withval} correct?])
+                    fi
+
+                    for dir in         \
+                        physical/uw-al  \
+                        network/uwip
+                    do
+                        echo "considering dir \"$dir\""
+                        DESERT_LDFLAGS_BUILD="$DESERT_LDFLAGS_BUILD -L${DESERT_PATH_BUILD}/${dir}"
+                    done
+
+                else
+                    AC_MSG_ERROR([desert path $withval is not a directory])
+                fi
+            fi
+        ])
+
+    #AC_SUBST(DESERT_CPPFLAGS)
+    AC_SUBST(DESERT_LDFLAGS_BUILD)
+])
+
+AC_DEFUN([AC_CHECK_DESERT],[
+    # temporarily add NS_CPPFLAGS and NSMIRACLE_CPPFLAGS to CPPFLAGS
+    BACKUP_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $NS_CPPFLAGS $NSMIRACLE_CPPFLAGS"
+    
+    AC_LANG_PUSH(C++)
+    
+    AC_MSG_CHECKING([for desert headers])
+
+    AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+                #include<cltracer.h>
+                ClMessageTracer* t; 
+                ]],[[
+                ]]  )],
+              [AC_MSG_RESULT([yes])
+                found_desert=yes
+                [$1]
+                ],
+              [AC_MSG_RESULT([no])
+                found_desert=no
+                [$2]
+              ])
+
+
+    AM_CONDITIONAL([HAVE_DESERT], [test x$found_desert = xyes])
+    
+    # Restoring to the initial value
+    CPPFLAGS="$BACKUP_CPPFLAGS"
+    
+    AC_LANG_POP(C++)
+])