3 files changed, 63 insertions, 66 deletions
diff --git a/scripts/build_osx_universal_gmpfr.sh b/scripts/build_osx_universal_gmpfr.sh
new file mode 100755
index 00000000..3dafa3ce
--- /dev/null
+++ b/scripts/build_osx_universal_gmpfr.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+set -e
+
+# In the working directory, creates deps-uni/lib/*
+# Assumes that the user has enough rights to run brew fetch
+
+# Downloading
+mkdir deps-amd64
+cd deps-amd64
+tar xf "`brew fetch --bottle-tag=big_sur gmp        | sed -ne 's/^Downloaded to: //p'`"
+tar xf "`brew fetch --bottle-tag=big_sur mpfr       | sed -ne 's/^Downloaded to: //p'`"
+cd ..
+mkdir deps-arm64
+cd deps-arm64
+tar xf "`brew fetch --bottle-tag=arm64_big_sur gmp  | sed -ne 's/^Downloaded to: //p'`"
+tar xf "`brew fetch --bottle-tag=arm64_big_sur mpfr | sed -ne 's/^Downloaded to: //p'`"
+cd ..
+
+# Merging
+mkdir -p deps-uni/lib
+GMP1=deps-amd64/gmp/*/lib/libgmp.*.dylib
+GMP=`basename $GMP1`
+GMPXX1=deps-amd64/gmp/*/lib/libgmpxx.*.dylib
+GMPXX=`basename $GMPXX1`
+MPFR1=deps-amd64/mpfr/*/lib/libmpfr.*.dylib
+MPFR=`basename $MPFR1`
+lipo -create $GMP1 deps-arm64/gmp/*/lib/$GMP -output deps-uni/lib/$GMP
+lipo -create $GMPXX1 deps-arm64/gmp/*/lib/$GMPXX -output deps-uni/lib/$GMPXX
+lipo -create $MPFR1 deps-arm64/mpfr/*/lib/$MPFR -output deps-uni/lib/$MPFR
+
+# Necessary even for libs created by lipo
+install_name_tool -id $PWD/deps-uni/lib/$GMP deps-uni/lib/$GMP
+install_name_tool -id $PWD/deps-uni/lib/$GMPXX deps-uni/lib/$GMPXX
+install_name_tool -id $PWD/deps-uni/lib/$MPFR deps-uni/lib/$MPFR
+# Also fix dependencies
+BADGMP=`otool -L deps-uni/lib/$MPFR|sed -ne 's/[[:space:]]*\(.*libgmp\..*dylib\).*/\1/p'`
+install_name_tool -change $BADGMP $PWD/deps-uni/lib/$GMP deps-uni/lib/$MPFR
+BADGMP=`otool -L deps-uni/lib/$GMPXX|sed -ne 's/[[:space:]]*\(.*libgmp\..*dylib\).*/\1/p'`
+install_name_tool -change $BADGMP $PWD/deps-uni/lib/$GMP deps-uni/lib/$GMPXX
+
+ln -s $GMP deps-uni/lib/libgmp.dylib
+ln -s $GMPXX deps-uni/lib/libgmpxx.dylib
+ln -s $MPFR deps-uni/lib/libmpfr.dylib
+
+# Debug
+ls -l deps-uni/lib
+otool -L deps-uni/lib/*.*.dylib
diff --git a/scripts/cpp_examples_for_doxygen.py b/scripts/cpp_examples_for_doxygen.py
new file mode 100644
index 00000000..5c091c4f
--- /dev/null
+++ b/scripts/cpp_examples_for_doxygen.py
@@ -0,0 +1,16 @@
+import os
+import glob
+
+for gd_mod in glob.glob("src/*/"):
+    mod_files = []
+    for paths in [gd_mod + 'utilities', gd_mod + 'example']:
+        if os.path.isdir(paths):
+            for root, dirs, files in os.walk(paths):
+                for file in files:
+                    if file.endswith(".cpp"):
+                        mod_files.append(str(os.path.join(root, file)).split(paths)[1][1:])
+    if len(mod_files) > 0:
+        mod = str(gd_mod).split('/')[1]
+        print(' * \section ' + mod + '_example_section ' + mod)
+        for file in mod_files:
+            print(' * @example ' + file)
diff --git a/scripts/create_gudhi_version.sh b/scripts/create_gudhi_version.sh
deleted file mode 100755
index f2a9233f..00000000
--- a/scripts/create_gudhi_version.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-login="vrouvrea"
-version="2.3.0"
-cgaldir="/home/vincent/workspace/CGAL-4.11-HO/build"
-cpucount=7
-
-
-# We start from scripts dir in the dev branch
-cd ..
-RELATIVEURL=`svn info . |grep -F "Relative URL:" | awk '{print $NF}'`
-
-if [ "$RELATIVEURL" != "^/trunk" ]
-then
-echo "Script must be launched in trunk and not in $RELATIVEURL"
-exit
-fi
-
-rm -rf build; mkdir build; cd build; cmake  -DCMAKE_BUILD_TYPE=Debug -DDEBUG_TRACES=ON -DCGAL_DIR=${cgaldir} -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_BENCHMARK=ON -DPython_ADDITIONAL_VERSIONS=3 ..
-cmake  -DCMAKE_BUILD_TYPE=Debug .
-
-CURRENTDIRECTORY=`pwd`
-export PYTHONPATH=$CURRENTDIRECTORY/src/cython:$PYTHONPATH
-
-make -j ${cpucount} all test
-
-cd ..
-svn st | grep -v GUDHIVersion.cmake | grep "^\?" | awk "{print \$2}" | xargs rm -rf
-
-svn copy svn+ssh://${login}@scm.gforge.inria.fr/svnroot/gudhi/trunk svn+ssh://${login}@scm.gforge.inria.fr/svnroot/gudhi/tags/gudhi-release-${version} \
-  -m "Creating a tag of Gudhi release version ${version}."
-
-cd build
-make user_version
-
-userversiondir=`find . -type d -name "*_GUDHI_${version}" | sed 's/\.\///g'`
-echo "User version directory = ${userversiondir}"
-
-tar -czvf ${userversiondir}.tar.gz ${userversiondir}
-
-userdocdir=${userversiondir/GUDHI/GUDHI_DOC}
-echo "User documentation directory = ${userdocdir}"
-mkdir ${userdocdir}
-make doxygen
-
-cp -R ${userversiondir}/doc/html ${userdocdir}/cpp
-cd ${userversiondir}
-rm -rf build; mkdir build; cd build; cmake  -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./installed -DCGAL_DIR=${cgaldir} -DWITH_GUDHI_EXAMPLE=ON -DPython_ADDITIONAL_VERSIONS=3 ..
-
-CURRENTDIRECTORY=`pwd`
-export PYTHONPATH=$CURRENTDIRECTORY/cython:$PYTHONPATH
-
-make sphinx
-
-cp -R cython/sphinx ../../${userdocdir}/python
-cd ../..
-tar -czvf ${userdocdir}.tar.gz ${userdocdir}
-
-cd ${userversiondir}/build
-make -j ${cpucount} all test install
-
-cd ../..
-actualdir=`pwd`
-echo "Library is available at ${actualdir}/${userversiondir}.tar.gz"
-sha256sum ${userversiondir}.tar.gz
-echo "Documentation is available at ${actualdir}/${userdocdir}.tar.gz"