Minor changes making release.

sandialabs · May 3, 2024 · eb39451 · eb39451
1 parent 5d39b61
commit eb39451
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/src/LicenseAndDisclaimersWindow.cpp b/src/LicenseAndDisclaimersWindow.cpp
@@ -435,7 +435,6 @@ void LicenseAndDisclaimersWindow::dataStorageCreator( Wt::WContainerWidget *pare
     ", except when the "
 #endif
 #if( USE_LEAFLET_MAP )
-    "Maps or External RID features are used"
   #if( USE_REMOTE_RID )
     "Maps or External RID features are used"
   #else

diff --git a/src/SpecFileQueryWidget.cpp b/src/SpecFileQueryWidget.cpp
@@ -2280,8 +2280,12 @@ void SpecFileQueryWidget::updateNumberFiles( const string srcdir,
 #ifdef _WIN32
     const wstring wsrcdir = SpecUtils::convert_from_utf8_to_utf16( srcdir );
     boost::filesystem::recursive_directory_iterator diriter( wsrcdir, boost::filesystem::symlink_option::recurse );
+#else
+#if BOOST_VERSION >= 108400 && BOOST_FILESYSTEM_VERSION >= 3
+    boost::filesystem::recursive_directory_iterator diriter( srcdir, boost::filesystem::directory_options::follow_directory_symlink );
 #else
     boost::filesystem::recursive_directory_iterator diriter( srcdir, boost::filesystem::symlink_option::recurse );
+#endif
 #endif
     const boost::filesystem::recursive_directory_iterator dirend;
 
@@ -2303,7 +2307,11 @@ void SpecFileQueryWidget::updateNumberFiles( const string srcdir,
       if( !recursive && is_dir )
       {
         is_file = false; //JIC
+#if BOOST_VERSION >= 108400 && BOOST_FILESYSTEM_VERSION >= 3
+        diriter.disable_recursion_pending();
+#else
         diriter.no_push();  //Dont recurse down into directories if we arent doing a recursive search
+#endif
       }
 
       bool is_simlink_dir = false;
@@ -2324,7 +2332,13 @@ void SpecFileQueryWidget::updateNumberFiles( const string srcdir,
         resvedpath = boost::filesystem::canonical( resvedpath );
         auto pcanon = boost::filesystem::canonical( diriter->path().parent_path() );
         if( SpecUtils::starts_with( pcanon.string<string>(), resvedpath.string<string>().c_str() ) )
+        {
+#if BOOST_VERSION >= 108400 && BOOST_FILESYSTEM_VERSION >= 3
+          diriter.disable_recursion_pending();
+#else
           diriter.no_push();  //Dont recurse down into directories
+#endif
+        }
       }//if( is_simlink_dir && recursive )
 
 
@@ -2802,8 +2816,12 @@ void SpecFileQueryWidget::doSearch( const std::string basedir,
 #ifdef _WIN32
     const std::wstring wbasedir = SpecUtils::convert_from_utf8_to_utf16( basedir );
     boost::filesystem::recursive_directory_iterator diriter( wbasedir, boost::filesystem::symlink_option::recurse );
+#else
+#if BOOST_VERSION >= 108400 && BOOST_FILESYSTEM_VERSION >= 3
+    boost::filesystem::recursive_directory_iterator diriter( basedir, boost::filesystem::directory_options::follow_directory_symlink );
 #else
     boost::filesystem::recursive_directory_iterator diriter( basedir, boost::filesystem::symlink_option::recurse );
+#endif
 #endif
     const boost::filesystem::recursive_directory_iterator dirend;
 
@@ -2825,7 +2843,11 @@ void SpecFileQueryWidget::doSearch( const std::string basedir,
       if( !recursive && is_dir )
       {
         is_file = false; //JIC
+#if BOOST_VERSION >= 108400 && BOOST_FILESYSTEM_VERSION >= 3
+        diriter.disable_recursion_pending();
+#else
         diriter.no_push();  //Dont recurse down into directories if we arent doing a recursive search
+#endif
       }
 
       bool is_simlink_dir = false;
@@ -2846,7 +2868,13 @@ void SpecFileQueryWidget::doSearch( const std::string basedir,
         resvedpath = boost::filesystem::canonical( resvedpath );
         auto pcanon = boost::filesystem::canonical( diriter->path().parent_path() );
         if( SpecUtils::starts_with( pcanon.string<string>(), resvedpath.string<string>().c_str() ) )
+        {
+#if BOOST_VERSION >= 108400 && BOOST_FILESYSTEM_VERSION >= 3
+          diriter.disable_recursion_pending();
+#else
           diriter.no_push();  //Dont recurse down into directories
+#endif
+        }
       }//if( is_simlink_dir && recursive )
 
 

diff --git a/target/electron/package.json b/target/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "InterSpecAddOn",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Application for interactive gamma spectroscopy",
   "homepage": "https://github.com/sandialabs/InterSpec",
   "main": "main.js",
@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "electron": "^21.4.4",
-    "electron-packager": "^17.1.1",
-    "node-addon-api": "^6.0.0"
+    "electron-packager": "^17.1.2",
+    "node-addon-api": "^6.1.0"
   }
 }
diff --git a/target/osx/CMakeLists.txt b/target/osx/CMakeLists.txt
@@ -21,7 +21,7 @@ SET(MACOSX_BUNDLE_BUNDLE_VERSION "0" )
 SET(MACOSX_BUNDLE_COPYRIGHT "Sandia National Labs, Will Johnson" )
 SET(MACOSX_BUNDLE_GUI_IDENTIFIER "gov.sandia.macOS.InterSpec" )
 #set MACOS_BUNDLE_VERSION_NUMBER for Info.plist.template to populate corresponding value in Xcode
-set(MACOS_BUNDLE_VERSION_NUMBER 41)
+set(MACOS_BUNDLE_VERSION_NUMBER 44)
 
 
 SET( ${PRODUCT_NAME} "InterSpec" )