Merge branch 'master' into heeren/build-wheels

neuronsimulator · Sep 26, 2023 · 3033bfa · 3033bfa
2 parents 4230901 + b4fdb4c
commit 3033bfa
Show file tree

Hide file tree

Showing 28 changed files with 411 additions and 785 deletions.
diff --git a/cmake/Coverage.cmake b/cmake/Coverage.cmake
@@ -35,8 +35,7 @@ if(NRN_ENABLE_COVERAGE)
     message(WARNING "Using CMAKE_BUILD_TYPE=Debug is recommended with NRN_ENABLE_COVERAGE")
   endif()
   set(NRN_COVERAGE_FLAGS_UNQUOTED --coverage -fno-inline)
-  string(JOIN " " NRN_COVERAGE_FLAGS ${NRN_COVERAGE_FLAGS})
-  set(NRN_COVERAGE_LIB gcov)
+  string(JOIN " " NRN_COVERAGE_FLAGS ${NRN_COVERAGE_FLAGS_UNQUOTED})
   set(NRN_COVERAGE_LINK_FLAGS --coverage)
 
   if(NRN_COVERAGE_FILES)
@@ -60,11 +59,11 @@ if(NRN_ENABLE_COVERAGE)
         "${NRN_COVERAGE_FLAGS}"
         CACHE INTERNAL "Remind that this is always in effect from now on" FORCE)
     list(APPEND NRN_COMPILE_FLAGS ${NRN_COVERAGE_FLAGS_UNQUOTED})
-    list(APPEND NRN_LINK_FLAGS ${NRN_COVERAGE_LINK_FLAGS})
     list(APPEND CORENRN_EXTRA_CXX_FLAGS ${NRN_COVERAGE_FLAGS_UNQUOTED})
     list(APPEND CORENRN_EXTRA_MECH_CXX_FLAGS ${NRN_COVERAGE_FLAGS_UNQUOTED})
-    list(APPEND CORENRN_EXTRA_LINK_FLAGS ${NRN_COVERAGE_LINK_FLAGS})
   endif()
+  list(APPEND NRN_LINK_FLAGS ${NRN_COVERAGE_LINK_FLAGS})
+  list(APPEND CORENRN_EXTRA_LINK_FLAGS ${NRN_COVERAGE_LINK_FLAGS})
   list(APPEND NRN_COMPILE_DEFS NRN_COVERAGE_ENABLED)
 else()
   unset(NRN_COVERAGE_FLAGS)

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,25 @@
 # NEURON 8.2
 
+## 8.2.3
+_Release Date_ : 15-09-2023
+
+### What's New
+
+- The primary purpose of 8.2.3 is to fix the HOC cursor control problems of
+  the wheel and windows installed versions.
+- Many fragments from current master to allow building of installers.
+  with current compiler toolchains and github actions.
+
+
+### Bug Fixes
+
+- Fix MacOS linux wheel HOC backspace.
+- Fix Windows HOC cursor issues.
+- Fix Windows 11 HOC icon.
+- Fix Windows and MacOS segfault on multiline HOC statements input from terminal.
+- Fix build issues with current compiler toolchains and github actions.
+- Deal with .inputrc if missing on Windows
+
 ## 8.2.2
 _Release Date_ : 15-12-2022
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -97,7 +97,7 @@ Installation
 
          pip3 install neuron
       
-      Alternatively, you can use the `PKG installer <https://github.com/neuronsimulator/nrn/releases/download/8.2.2/nrn-8.2.2-macosx-10.9-universal2-py-38-39-310-311.pkg>`_.
+      Alternatively, you can use the `PKG installer <https://github.com/neuronsimulator/nrn/releases/download/8.2.3/nrn-8.2.3-macosx-10.9-universal2-py-38-39-310-311.pkg>`_.
 
       For troubleshooting, see the `detailed installation instructions <install/install_instructions.md>`_.
 
@@ -115,7 +115,7 @@ Installation
 
    .. tab-item:: Windows
 
-      `Download the Windows Installer <https://github.com/neuronsimulator/nrn/releases/download/8.2.2/nrn-8.2.2.w64-mingw-py-37-38-39-310-311-setup.exe>`_.
+      `Download the Windows Installer <https://github.com/neuronsimulator/nrn/releases/download/8.2.3/nrn-8.2.3.w64-mingw-py-37-38-39-310-311-setup.exe>`_.
 
       You can also install the Linux wheel via the Windows Subsystem for Linux (WSL). See `instructions <install/install_instructions.html#windows-subsystem-for-linux-wsl-python-wheel>`_.
 

diff --git a/src/ivoc/checkpnt.cpp b/src/ivoc/checkpnt.cpp
@@ -248,9 +248,6 @@ void PortablePointer::set(void* address, int type, unsigned long s) {
 }
 PortablePointer::~PortablePointer() {}
 
-declareList(PPList, PortablePointer)
-implementList(PPList, PortablePointer)
-
 class OcCheckpoint {
   public:
     OcCheckpoint();
@@ -297,7 +294,6 @@ class OcCheckpoint {
     int cnt_;
     int nobj_;
     Objects* otable_;
-    PPList* ppl_;
     bool (OcCheckpoint::*func_)(Symbol*);
     Symbols* stable_;
 #if HAVE_XDR
@@ -413,7 +409,6 @@ int hoc_readcheckpoint(char* fname) {
 }
 
 OcCheckpoint::OcCheckpoint() {
-    ppl_ = NULL;
     func_ = NULL;
     stable_ = NULL;
     otable_ = NULL;
@@ -430,9 +425,6 @@ OcCheckpoint::OcCheckpoint() {
 }
 
 OcCheckpoint::~OcCheckpoint() {
-    if (ppl_) {
-        delete ppl_;
-    }
     if (stable_) {
         delete stable_;
     }