Get canonical location before asking for parent path (openscad#5448)

* Get canonical location before asking for parent path to correctly resolve a possible symlink of the openscad executable itself

* Make boost::dll use std::filesystem, remove boost::filesystem from OpenSCAD dependencies

Author: kintel

CMakeLists.txt

@@ -284,10 +284,11 @@ if (MSVC)
   message(STATUS "Eigen: ${Eigen3_VERSION}")
 
   set(Boost_USE_STATIC_LIBS TRUE)
-  find_package(Boost 1.56 REQUIRED COMPONENTS filesystem system regex program_options)
+  find_package(Boost 1.61 REQUIRED COMPONENTS system regex program_options)
   message(STATUS "Boost: ${Boost_VERSION}")
   target_include_directories(OpenSCAD SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
   target_link_libraries(OpenSCAD PRIVATE ${Boost_LIBRARIES})
+  target_compile_definitions(OpenSCAD PRIVATE BOOST_DLL_USE_STD_FS)
 
   find_package(harfbuzz CONFIG REQUIRED)
   find_path(HARFBUZZ_INCLUDE_DIRS harfbuzz)
@@ -331,10 +332,11 @@ else()
   target_compile_definitions(OpenSCAD PRIVATE EIGEN_DONT_ALIGN)
   message(STATUS "Eigen: ${Eigen3_VERSION}")
 
-  find_package(Boost 1.56 REQUIRED COMPONENTS filesystem system regex program_options)
+  find_package(Boost 1.61 REQUIRED COMPONENTS system regex program_options)
   message(STATUS "Boost: ${Boost_VERSION}")
   target_include_directories(OpenSCAD SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
   target_link_libraries(OpenSCAD PRIVATE ${Boost_LIBRARIES})
+  target_compile_definitions(OpenSCAD PRIVATE BOOST_DLL_USE_STD_FS)
 
   find_package(HarfBuzz 0.9.19 REQUIRED QUIET)
   message(STATUS "Harfbuzz: ${HARFBUZZ_VERSION}")

README.md

@@ -109,7 +109,7 @@ Follow the instructions for the platform you're compiling on below.
 * [CGAL (5.4 ->)](https://www.cgal.org/)
  * [GMP (5.x)](https://gmplib.org/)
  * [MPFR (3.x)](https://www.mpfr.org/)
-* [boost (1.56 ->)](https://www.boost.org/)
+* [boost (1.61 ->)](https://www.boost.org/)
 * [OpenCSG (1.4.2 ->)](http://www.opencsg.org/)
 * [GLEW (1.5.4 ->)](http://glew.sourceforge.net/)
 * [Eigen (3.x)](https://eigen.tuxfamily.org/)

scripts/macosx-build-dependencies.sh

@@ -38,7 +38,7 @@ OPTION_X86_64=false
 
 PACKAGES=(
     "double_conversion 3.2.1"
-    "boost 1.81.0"
+    "boost 1.86.0"
     "eigen 3.4.0"
     "gmp 6.3.0"
     "mpfr 4.2.0"
@@ -359,7 +359,7 @@ build_boost()
     ARCH_FLAGS+=(-arch $arch)
   done
 
-  ./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread,program_options,filesystem,chrono,system,regex,date_time,atomic
+  ./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread,program_options,chrono,system,regex,date_time,atomic
   ./b2 -j"$NUMCPU" -d+2 $BOOST_TOOLSET cflags="-mmacosx-version-min=$MAC_OSX_VERSION_MIN ${ARCH_FLAGS[*]}" linkflags="-mmacosx-version-min=$MAC_OSX_VERSION_MIN ${ARCH_FLAGS[*]} -headerpad_max_install_names" install
 }
 

scripts/uni-get-dependencies.sh

@@ -35,7 +35,7 @@ get_qomo_deps()
 
 get_altlinux_deps()
 {
- for i in boost-devel boost-filesystem-devel gcc4.5 gcc4.5-c++ boost-program_options-devel \
+ for i in boost-devel gcc4.5 gcc4.5-c++ boost-program_options-devel \
   boost-thread-devel boost-system-devel boost-regex-devel eigen3 \
   libmpfr libgmp libgmp_cxx-devel qt5-devel libcgal-devel git-core tbb-devel \
   libglew-devel flex bison curl imagemagick gettext glib2-devel; do apt-get install $i; done
@@ -64,7 +64,7 @@ get_opensuse_deps()
   glib2-devel gettext freetype-devel harfbuzz-devel  \
   qscintilla-qt5-devel libqt5-qtbase-devel libQt5OpenGL-devel \
   xvfb-run libzip-devel libqt5-qtmultimedia-devel libqt5-qtsvg-devel \
-  double-conversion-devel libboost_filesystem-devel libboost_regex-devel \
+  double-conversion-devel libboost_regex-devel \
   libboost_program_options-devel tbb-devel
  # qscintilla-qt5-devel replaces libqscintilla_qt5-devel
  # but openscad compiles with both

snap/snapcraft.yaml

@@ -128,7 +128,6 @@ parts:
     - libboost-dev
     - libboost-regex-dev
     - libboost-system-dev
-    - libboost-filesystem-dev
     - libboost-program-options-dev
     - libdouble-conversion-dev
     - chrpath
@@ -146,7 +145,6 @@ parts:
     stage-packages:
     - qtwayland5
     - libasyncns0
-    - libboost-filesystem1.71.0
     - libboost-regex1.71.0
     - libboost-system1.71.0
     - libboost-program-options1.71.0

src/openscad.cc

@@ -670,7 +670,7 @@ int main(int argc, char **argv)
   PlatformUtils::ensureStdIO();
 #endif
 
-  const auto applicationPath = weakly_canonical(boost::dll::program_location().parent_path()).generic_string();
+  const auto applicationPath = weakly_canonical(boost::dll::program_location()).parent_path().generic_string();
   PlatformUtils::registerApplicationPath(applicationPath);
 
 #ifdef ENABLE_CGAL