diff --git a/deploy/mac/deploy_imageviewer_mac.sh b/deploy/mac/deploy_imageviewer_mac.sh deleted file mode 100755 index fadb64bd..00000000 --- a/deploy/mac/deploy_imageviewer_mac.sh +++ /dev/null @@ -1,153 +0,0 @@ -DIRECTORY=$WORKSPACE/deployed - -DEST="$DIRECTORY/imageviewer.app" -REPOSPATH=$WORKSPACE -QTPATH=$QTBINPATH - -GITVER=`git rev-parse --short HEAD` - -if [ ! -d "$DIRECTORY" ]; then - mkdir $DIRECTORY -fi - -echo $DIRECTORY -echo $QTPATH -echo $DEST -echo $REPOSPATH - -cp -r $REPOSPATH/Applications/imageviewer.app $DIRECTORY - -pushd . -CPCMD="cp" - -cd $DEST/Contents -echo "This is where it lands..." -pwd -if [ ! -d "./Frameworks" ]; then - mkdir ./Frameworks -fi - - -`$CPCMD $REPOSPATH/lib/libModuleConfig.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/lib/libReaderConfig.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/lib/libReaderGUI.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/lib/libQtAddons.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/lib/libkipl.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/lib/libImagingAlgorithms.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/imagingsuite/external/mac/lib/libNeXus.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/imagingsuite/external/mac/lib/libNeXusCPP.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/imagingsuite/external/mac/lib/libhdf5.10.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/imagingsuite/external/mac/lib/libhdf5_cpp.11.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/imagingsuite/external/mac/lib/libhdf5_hl.10.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/imagingsuite/external/mac/lib/libsz.2.dylib $DEST/Contents/Frameworks` - -rm -f ./MacOS/*.dylib - -cd Frameworks -rm -f *.1.0.dylib -rm -f *.1.dylib - -for f in `ls *.1.0.0.dylib`; do - ln -s $f "`basename $f .1.0.0.dylib`.1.0.dylib" - ln -s $f "`basename $f .1.0.0.dylib`.1.dylib" - ln -s $f "`basename $f .1.0.0.dylib`.dylib" -done - -if [ -e "/opt/local/lib/libzstd.1.dylib" ]; then - `$CPCMD /opt/local/lib/libzstd.1.dylib $DEST/Contents/Frameworks` -fi - -if [ -e "/opt/local/lib/libzstd.9.dylib" ]; then - `$CPCMD /opt/local/lib/libzstd.9.dylib $DEST/Contents/Frameworks` -fi - -popd - -cd $QTBINPATH -echo "Do deploy..." -./macdeployqt $DEST #-dmg - -cd $DEST/Contents/MacOS -echo -echo Reassign dependencies -echo -pwd - -# kipl -install_name_tool -change libtiff.5.dylib @executable_path/../Frameworks/libtiff.5.dylib libkipl.1.0.0.dylib -install_name_tool -change libxml2.2.dylib @executable_path/../Frameworks/libtiff.5.dylib libkipl.1.0.0.dylib -install_name_tool -change libarmadillo.10.dylib @executable_path/../Frameworks/libarmadillo.10.dylib libkipl.1.0.0.dylib - -# imageviewer -install_name_tool -change libkipl.1.dylib @executable_path/../Frameworks/libkipl.1.dylib imageviewer -install_name_tool -change libQtAddons.1.dylib @executable_path/../Frameworks/libQtAddons.1.dylib imageviewer -install_name_tool -change libImagingAlgorithms.1.dylib @executable_path/../Frameworks/libImagingAlgorithms.1.dylib imageviewer -install_name_tool -change libReaderConfig.1.dylib @executable_path/../Frameworks/libReaderConfig.1.dylib imageviewer -install_name_tool -change libNeXus.1.dylib @executable_path/../Frameworks/libNeXus.1.dylib imageviewer -install_name_tool -change libNeXusCPP.1.dylib @executable_path/../Frameworks/libNeXusCPP.1.dylib imageviewer -install_name_tool -change libtiff.5.dylib @executable_path/../Frameworks/libtiff.5.dylib imageviewer -install_name_tool -change libxml2.2.dylib @executable_path/../Frameworks/libxml2.2.dylib imageviewer -install_name_tool -change libcfitsio.1.dylib @executable_path/../Frameworks/libcfitsio.dylib imageviewer - -cd ../Frameworks -# QtAddons -install_name_tool -change libkipl.1.dylib @executable_path/../Frameworks/libkipl.1.dylib libQtAddons.1.0.0.dylib - -# ImagingAlgorithms -install_name_tool -change libkipl.1.dylib @executable_path/../Frameworks/libkipl.1.dylib libImagingAlgorithms.1.0.0.dylib - -# ReaderConfig -install_name_tool -change libkipl.1.dylib @executable_path/../Frameworks/libkipl.1.dylib libReaderConfig.1.0.0.dylib -install_name_tool -change libImagingAlgorithms.1.dylib @executable_path/../Frameworks/libImagingAlgorithms.1.dylib libReaderConfig.1.0.0.dylib -install_name_tool -change libNeXus.1.dylib @executable_path/../Frameworks/libNeXus.1.dylib libReaderConfig.1.0.0.dylib -install_name_tool -change libNeXusCPP.1.dylib @executable_path/../Frameworks/libNeXusCPP.1.dylib libReaderConfig.1.0.0.dylib -install_name_tool -change libtiff.5.dylib @executable_path/../Frameworks/libtiff.5.dylib libReaderConfig.1.0.0.dylib -install_name_tool -change libxml2.2.dylib @executable_path/../Frameworks/libxml2.2.dylib libReaderConfig.1.0.0.dylib -install_name_tool -change libcfitsio.1.dylib @executable_path/../Frameworks/libcfitsio.dylib libReaderConfig.1.0.0.dylib - -#nexus_related -install_name_tool -change libNeXus.1.dylib @executable_path/../Frameworks/libNeXus.1.dylib libkipl.1.0.0.dylib -install_name_tool -change libNeXusCPP.1.dylib @executable_path/../Frameworks/libNeXusCPP.1.dylib libkipl.1.0.0.dylib -install_name_tool -change /usr/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib libNexus.1.dylib -install_name_tool -change /usr/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib libNexusCPP.1.dylib -install_name_tool -change libNeXus.1.dylib @executable_path/../Frameworks/libNeXus.1.dylib libNexusCPP.1.dylib - -install_name_tool -change /usr/local/Cellar/hdf5/1.8.16_1/lib/libhdf5.10.dylib @executable_path/../Frameworks/libhdf5.10.dylib libhdf5_cpp.11.dylib -install_name_tool -change /usr/local/Cellar/hdf5/1.8.16_1/lib/libhdf5.10.dylib @executable_path/../Frameworks/libhdf5.10.dylib libhdf5_hl.10.dylib - -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_cpp.11.dylib @executable_path/../Frameworks/libhdf5_cpp.11.dylib libNeXus.1.0.0.dylib -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5.10.dylib @executable_path/../Frameworks/libhdf5.10.dylib libNeXus.1.0.0.dylib -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_hl.10.dylib @executable_path/../Frameworks/libhdf5_hl.10.dylib libNeXus.1.0.0.dylib -install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @executable_path/../Frameworks/libsz.2.dylib libNeXus.1.0.0.dylib - -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_cpp.11.dylib @executable_path/../Frameworks/libhdf5_cpp.11.dylib libNeXusCPP.1.0.0.dylib -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5.10.dylib @executable_path/../Frameworks/libhdf5.10.dylib libNeXusCPP.1.0.0.dylib -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_hl.10.dylib @executable_path/../Frameworks/libhdf5_hl.10.dylib libNeXusCPP.1.0.0.dylib -install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @executable_path/../Frameworks/libsz.2.dylib libNeXusCPP.1.0.0.dylib - -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5.10.dylib libhdf5.10.dylib libhdf5.10.dylib -install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @executable_path/../Frameworks/libsz.2.dylib libhdf5.10.dylib -install_name_tool -change /usr/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib libhdf5.10.dylib - -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_cpp.11.dylib libhdf5_cpp.11.dylib libhdf5_cpp.11.dylib -install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @executable_path/../Frameworks/libsz.2.dylib libhdf5_cpp.11.dylib -install_name_tool -change /usr/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib libhdf5_cpp.11.dylib - -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_hl.10.dylib libhdf5_hl.10.dylib libhdf5_hl.10.dylib -install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @executable_path/../Frameworks/libsz.2.dylib libhdf5_hl.10.dylib -install_name_tool -change /usr/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib libhdf5_hl.10.dylib - - -rm -rf /tmp/imageviewer - -if [ ! -d "/tmp/imageviewer" ]; then - mkdir /tmp/imageviewer -fi - -if [ ! -e "tmp/imageviewer/Applications" ]; then - ln -s /Applications /tmp/imageviewer -fi - -cp -r $DEST /tmp/imageviewer - -hdiutil create -volname ImageViewer -srcfolder /tmp/imageviewer -ov -format UDZO $DIRECTORY/ImageViewer_build-$GITVER-`date +%Y%m%d`.dmg diff --git a/deploy/mac/deploy_imageviewer_mac_arm64.sh b/deploy/mac/deploy_imageviewer_mac_arm64.sh deleted file mode 100755 index b1333943..00000000 --- a/deploy/mac/deploy_imageviewer_mac_arm64.sh +++ /dev/null @@ -1,160 +0,0 @@ -DIRECTORY=$WORKSPACE/deployed - -DEST="$DIRECTORY/ImageViewer.app" -REPOSPATH=$WORKSPACE -QTPATH=$QTBINPATH - -ARCH=`uname -m` -GITVER=`git rev-parse --short HEAD` - -if [ ! -d "$DIRECTORY" ]; then - mkdir $DIRECTORY -fi - -echo $DIRECTORY -echo $QTPATH -echo $DEST -echo $REPOSPATH - -cp -r $REPOSPATH/install/applications/ImageViewer.app $DIRECTORY - -pushd . -CPCMD="cp" - -cd $DEST/Contents -echo "This is where it lands..." -pwd -if [ ! -d "./Frameworks" ]; then - mkdir ./Frameworks -fi - -if [ ! -d "./MacOS" ]; then - mkdir ./MacOS -fi - -`$CPCMD $REPOSPATH/install/lib/libModuleConfig.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReaderConfig.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReaderGUI.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libQtAddons.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libkipl.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libQtModuleConfigure.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libQtImaging.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libImagingAlgorithms.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/ExternalDependencies/macos/$ARCH/lib/libNeXus.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/ExternalDependencies/macos/$ARCH/lib/libNeXusCPP.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD /opt/local/lib/libhdf5.10.dylib $DEST/Contents/Frameworks` -`$CPCMD /opt/local/lib/libhdf5_cpp.dylib $DEST/Contents/Frameworks` -`$CPCMD /opt/local/lib/libhdf5_hl.dylib $DEST/Contents/Frameworks` -`$CPCMD /opt/local/lib/libsz.2.dylib $DEST/Contents/Frameworks` -`$CPCMD /opt/local/lib/libarmadillo*.dylib $DEST/Contents/Frameworks` - -rm -f ./MacOS/*.dylib - -cd Frameworks -rm -f *.1.0.dylib -rm -f *.1.dylib - -for f in `ls *.1.0.0.dylib`; do - ln -s $f "`basename $f .1.0.0.dylib`.1.0.dylib" - ln -s $f "`basename $f .1.0.0.dylib`.1.dylib" - ln -s $f "`basename $f .1.0.0.dylib`.dylib" -done - -if [ -e "/opt/local/lib/libzstd.1.dylib" ]; then - `$CPCMD /opt/local/lib/libzstd.1.dylib $DEST/Contents/Frameworks` -fi - -if [ -e "/opt/local/lib/libzstd.9.dylib" ]; then - `$CPCMD /opt/local/lib/libzstd.9.dylib $DEST/Contents/Frameworks` -fi - -popd - -cd $QTBINPATH -echo "Do deploy..." -./macdeployqt $DEST #-dmg - -cd $DEST/Contents/MacOS -echo -echo Reassign dependencies -echo -pwd - -install_name_tool -add_rpath @executable_path/../Frameworks ImageViewer -cd ../Frameworks -# # kipl -# install_name_tool -change libtiff.5.dylib @executable_path/../Frameworks/libtiff.5.dylib libkipl.1.0.0.dylib -# install_name_tool -change libxml2.2.dylib @executable_path/../Frameworks/libtiff.5.dylib libkipl.1.0.0.dylib -# install_name_tool -change libarmadillo.10.dylib @executable_path/../Frameworks/libarmadillo.10.dylib libkipl.1.0.0.dylib - -# # imageviewer -# install_name_tool -change libkipl.1.dylib @executable_path/../Frameworks/libkipl.1.dylib imageviewer -# install_name_tool -change libQtAddons.1.dylib @executable_path/../Frameworks/libQtAddons.1.dylib imageviewer -# install_name_tool -change libImagingAlgorithms.1.dylib @executable_path/../Frameworks/libImagingAlgorithms.1.dylib imageviewer -# install_name_tool -change libReaderConfig.1.dylib @executable_path/../Frameworks/libReaderConfig.1.dylib imageviewer -# install_name_tool -change libNeXus.1.dylib @executable_path/../Frameworks/libNeXus.1.dylib imageviewer -# install_name_tool -change libNeXusCPP.1.dylib @executable_path/../Frameworks/libNeXusCPP.1.dylib imageviewer -# install_name_tool -change libtiff.5.dylib @executable_path/../Frameworks/libtiff.5.dylib imageviewer -# install_name_tool -change libxml2.2.dylib @executable_path/../Frameworks/libxml2.2.dylib imageviewer -# install_name_tool -change libcfitsio.1.dylib @executable_path/../Frameworks/libcfitsio.dylib imageviewer - -# cd ../Frameworks -# # QtAddons -# install_name_tool -change libkipl.1.dylib @executable_path/../Frameworks/libkipl.1.dylib libQtAddons.1.0.0.dylib - -# # ImagingAlgorithms -# install_name_tool -change libkipl.1.dylib @executable_path/../Frameworks/libkipl.1.dylib libImagingAlgorithms.1.0.0.dylib - -# # ReaderConfig -# install_name_tool -change libkipl.1.dylib @executable_path/../Frameworks/libkipl.1.dylib libReaderConfig.1.0.0.dylib -# install_name_tool -change libImagingAlgorithms.1.dylib @executable_path/../Frameworks/libImagingAlgorithms.1.dylib libReaderConfig.1.0.0.dylib -# install_name_tool -change libNeXus.1.dylib @executable_path/../Frameworks/libNeXus.1.dylib libReaderConfig.1.0.0.dylib -# install_name_tool -change libNeXusCPP.1.dylib @executable_path/../Frameworks/libNeXusCPP.1.dylib libReaderConfig.1.0.0.dylib -# install_name_tool -change libtiff.5.dylib @executable_path/../Frameworks/libtiff.5.dylib libReaderConfig.1.0.0.dylib -# install_name_tool -change libxml2.2.dylib @executable_path/../Frameworks/libxml2.2.dylib libReaderConfig.1.0.0.dylib -# install_name_tool -change libcfitsio.1.dylib @executable_path/../Frameworks/libcfitsio.dylib libReaderConfig.1.0.0.dylib - -# #nexus_related -install_name_tool -change libNeXus.1.dylib @rpath/Frameworks/libNeXus.1.dylib libkipl.dylib -install_name_tool -change libNeXusCPP.1.dylib @rpath/Frameworks/libNeXusCPP.1.dylib libkipl.dylib -install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libNexusCPP.1.0.0.dylib - -# install_name_tool -change /usr/local/Cellar/hdf5/1.8.16_1/lib/libhdf5.10.dylib @executable_path/../Frameworks/libhdf5.10.dylib libhdf5_cpp.11.dylib -# install_name_tool -change /usr/local/Cellar/hdf5/1.8.16_1/lib/libhdf5.10.dylib @executable_path/../Frameworks/libhdf5.10.dylib libhdf5_hl.10.dylib - -# install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_cpp.11.dylib @executable_path/../Frameworks/libhdf5_cpp.11.dylib libNeXus.1.0.0.dylib -# install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5.10.dylib @executable_path/../Frameworks/libhdf5.10.dylib libNeXus.1.0.0.dylib -# install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_hl.10.dylib @executable_path/../Frameworks/libhdf5_hl.10.dylib libNeXus.1.0.0.dylib -# install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @executable_path/../Frameworks/libsz.2.dylib libNeXus.1.0.0.dylib - -# install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_cpp.11.dylib @executable_path/../Frameworks/libhdf5_cpp.11.dylib libNeXusCPP.1.0.0.dylib -# install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5.10.dylib @executable_path/../Frameworks/libhdf5.10.dylib libNeXusCPP.1.0.0.dylib -# install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_hl.10.dylib @executable_path/../Frameworks/libhdf5_hl.10.dylib libNeXusCPP.1.0.0.dylib -# install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @executable_path/../Frameworks/libsz.2.dylib libNeXusCPP.1.0.0.dylib - -# install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5.10.dylib libhdf5.10.dylib libhdf5.10.dylib -# install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @executable_path/../Frameworks/libsz.2.dylib libhdf5.10.dylib -# install_name_tool -change /usr/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib libhdf5.10.dylib - -# install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_cpp.11.dylib libhdf5_cpp.11.dylib libhdf5_cpp.11.dylib -# install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @executable_path/../Frameworks/libsz.2.dylib libhdf5_cpp.11.dylib -# install_name_tool -change /usr/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib libhdf5_cpp.11.dylib - -# install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_hl.10.dylib libhdf5_hl.10.dylib libhdf5_hl.10.dylib -# install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @executable_path/../Frameworks/libsz.2.dylib libhdf5_hl.10.dylib -# install_name_tool -change /usr/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib libhdf5_hl.10.dylib - - -rm -rf /tmp/imageviewer - -if [ ! -d "/tmp/imageviewer" ]; then - mkdir /tmp/imageviewer -fi - -if [ ! -e "tmp/imageviewer/Applications" ]; then - ln -s /Applications /tmp/imageviewer -fi - -cp -r $DEST /tmp/imageviewer - -hdiutil create -volname ImageViewer -srcfolder /tmp/imageviewer -ov -format UDZO $DIRECTORY/ImageViewer_$ARCH-build-$GITVER-`date +%Y%m%d`.dmg diff --git a/deploy/mac/deploy_muhrec_mac.sh b/deploy/mac/deploy_muhrec_mac.sh deleted file mode 100755 index 632938f1..00000000 --- a/deploy/mac/deploy_muhrec_mac.sh +++ /dev/null @@ -1,191 +0,0 @@ -DIRECTORY=$WORKSPACE/deployed - -DEST="$DIRECTORY/MuhRec.app" -REPOSPATH=$WORKSPACE -QTPATH=$QTBINPATH - -ARCH=`uname -m` - -BREWPATH="`brew --prefix`" - -echo $BREWPATH - -GITVER=`git rev-parse --short HEAD` - -if [ ! -d "$DIRECTORY" ]; then - mkdir $DIRECTORY -fi - -echo $DIRECTORY -echo $QTPATH -echo $DEST -echo $REPOSPATH - -cp -r $REPOSPATH/install/applications/MuhRec.app $DIRECTORY - -pushd . -CPCMD="cp -f" - -cd $DEST/Contents -echo "This is where it lands..." -pwd -if [ ! -d "./Frameworks" ]; then - mkdir ./Frameworks -fi - -if [ ! -d "./MacOS" ]; then - mkdir ./MacOS -fi - -`$CPCMD $REPOSPATH/install/lib/libImagingAlgorithms.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libAdvancedFilters.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libModuleConfig.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libQtAddons.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libQtImaging.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReaderConfig.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReaderGUI.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libQtModuleConfigure.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReconFramework.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReconAlgorithms.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libStdBackProjectors.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libStdPreprocModules.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libkipl.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libStdPreprocModulesGUI.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libInspectorModulesGUI.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libInspectorModules.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libFDKBackProjectors.dylib $DEST/Contents/Frameworks` - -# `$CPCMD $REPOSPATH/ExternalDependencies/macos/$ARCH/lib/libNeXus.1.0.0.dylib $DEST/Contents/Frameworks` -# `$CPCMD $REPOSPATH/ExternalDependencies/macos/$ARCH/lib/libNeXusCPP.1.0.0.dylib $DEST/Contents/Frameworks` -# `$CPCMD /usr/local/lib/libNeXus.1.0.0.dylib $DEST/Contents/Frameworks` -# `$CPCMD /usr/local/lib/libNeXusCPP.1.0.0.dylib $DEST/Contents/Frameworks` - -`$CPCMD $BREWPATH/lib/libarmadillo.12.dylib $DEST/Contents/Frameworks` - -`$CPCMD $BREWPATH/opt/openblas/lib/libopenblas.0.dylib $DEST/Contents/Frameworks` -`$CPCMD $BREWPATH/opt/arpack/lib/libarpack.2.dylib $DEST/Contents/Frameworks` -`$CPCMD $BREWPATH/opt/superlu/lib/libsuperlu.6.dylib $DEST/Contents/Frameworks` -`$CPCMD $BREWPATH/lib/libzstd.1.dylib $DEST/Contents/Frameworks` -`$CPCMD $BREWPATH/lib/libsz.2.dylib $DEST/Contents/Frameworks` -`$CPCMD $BREWPATH/opt/gcc/lib/gcc/current/libgcc_s.1.1.dylib $DEST/Contents/Frameworks` -# `$CPCMD /Users/kaestner/anaconda3/lib/libgcc_s.1.1.dylib $DEST/Contents/Frameworks` - -if [ -e "$REPOSPATH/Applications/muhrecCLI" ]; then - `$CPCMD $REPOSPATH/Applications/muhrecCLI $DEST/Contents/MacOS` -fi - -rm -f ./MacOS/*.dylib -cd Frameworks -rm -f *.1.0.dylib -rm -f *.1.dylib - -if [ -e "/opt/local/lib/libzstd.1.dylib" ]; then - `$CPCMD /opt/local/lib/libzstd.1.dylib $DEST/Contents/MacOS` -fi - -if [ -e "/opt/local/lib/libzstd.9.dylib" ]; then - `$CPCMD /opt/local/lib/libzstd.9.dylib $DEST/Contents/MacOS` -fi - - - -cd .. - -if [ ! -d "./Resources" ]; then - mkdir ./Resources -fi - -cp $REPOSPATH/imagingsuite/applications/muhrec/Resources/* ./Resources - -#sed -i.bak s+com.yourcompany+ch.psi+g $DEST/Contents/Info.plist -echo "copy plugins" -pwd -if [ ! -d "./PlugIns" ]; then - mkdir ./PlugIns -fi - -if [ ! -d "./PlugIns/platforms" ]; then - mkdir ./PlugIns/platforms -fi - -if [ ! -f "./PlugIns/platforms/libqcocoa.dylib" ]; then - if [ -f "$QTPATH/plugins/platforms/libqcocoa.dylib" ]; then - cp $QTPATH/plugins/platforms/libqcocoa.dylib $DEST/Contents/PlugIns/platforms/ - fi -fi - -if [ ! -d "./PlugIns/printsupport" ]; then - mkdir ./PlugIns/printsupport -fi - -if [ ! -f "./PlugIns/printsupport/libcocoaprintersupport.dylib" ]; then - if [ -f "$QTPATH/plugins/printsupport/libcocoaprintersupport.dylib" ]; then - cp $QTPATH/plugins/printsupport/libcocoaprintersupport.dylib $DEST/Contents/PlugIns/printsupport/ - fi -fi - -if [ ! -d "./PlugIns/accessible" ]; then - mkdir ./PlugIns/accessible -fi - -if [ ! -f "./PlugIns/accessible/libqtaccessiblewidgets.dylib" ]; then - if [ -f "$QTPATH/plugins/accessible/libqtaccessiblewidgets.dylib" ] ; then - cp $QTPATH/plugins/accessible/libqtaccessiblewidgets.dylib $DEST/Contents/PlugIns/accessible/ - fi -fi - -pwd -ls PlugIns - -cd $QTBINPATH -echo "Do deploy..." -./macdeployqt $DEST #-dmg - -cd $DEST/Contents/MacOS - -# muhrec -install_name_tool -add_rpath @executable_path/../Frameworks MuhRec - -install_name_tool -change @executable_path/../Frameworks/libxml2.2.dylib @rpath/libxml2.2.dylib MuhRec -install_name_tool -change @executable_path/../Frameworks/libarmadillo.12.dylib @rpath/libarmadillo.12.dylib MuhRec -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib MuhRec -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib MuhRec - -cd ../Frameworks - -chmod 666 libarmadillo.12.dylib -# chmod 666 libhdf5_hl.dylib libhdf5_cpp.dylib -# ln -s libNeXus.1.0.0.dylib libNeXus.1.dylib -# ln -s libNeXusCPP.1.0.0.dylib libNeXusCPP.1.dylib -`$CPCMD $BREWPATH/opt/gcc/lib/gcc/current/libgcc_s.1.1.dylib $DEST/Contents/Frameworks` # must be here to avoid deletion - -install_name_tool -change @loader_path/../../../../opt/openblas/lib/libopenblas.0.dylib @rpath/libopenblas.0.dylib libarmadillo.12.dylib -install_name_tool -change @loader_path/../../../../opt/arpack/libexec/lib/libarpack.2.dylib @rpath/libarpack.2.dylib libarmadillo.12.dylib -install_name_tool -change @loader_path/../../../../opt/superlu/lib/libsuperlu.6.dylib @rpath/libsuperlu.6.dylib libarmadillo.12.dylib -# install_name_tool -change @loader_path/../../../../opt/libaec/lib/libsz.2.dylib @rpath/libsz.2.dylib libhdf5_cpp.310.dylib -# install_name_tool -change @loader_path/../../../../opt/libaec/lib/libsz.2.dylib @rpath/libsz.2.dylib libhdf5.310.dylib -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libReaderGUI.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libReaderGUI.dylib -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libReaderConfig.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libReaderConfig.dylib -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libImagingAlgorithms.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libImagingAlgorithms.dylib -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libkipl.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libkipl.dylib - - -codesign --force --deep --sign - $DEST # needed to fix signature issue on M1 - -rm -rf /tmp/muhrec - -if [ ! -d "/tmp/muhrec" ]; then - mkdir /tmp/muhrec -fi - -if [ ! -e "tmp/muhrec/Applications" ]; then - ln -s /Applications /tmp/muhrec -fi - -cp -r $DEST /tmp/muhrec - -hdiutil create -volname MuhRec -srcfolder /tmp/muhrec -ov -format UDZO $DIRECTORY/MuhRec-MacOS_$ARCH-build-$GITVER-`date +%Y%m%d`.dmg diff --git a/deploy/mac/deploy_muhrec_mac_arm64.sh b/deploy/mac/deploy_muhrec_mac_arm64.sh deleted file mode 100755 index 7b0c3964..00000000 --- a/deploy/mac/deploy_muhrec_mac_arm64.sh +++ /dev/null @@ -1,199 +0,0 @@ -DIRECTORY=$WORKSPACE/deployed - -DEST="$DIRECTORY/MuhRec.app" -REPOSPATH=$WORKSPACE -QTPATH=$QTBINPATH - -ARCH=`uname -m` - -GITVER=`git rev-parse --short HEAD` - -if [ ! -d "$DIRECTORY" ]; then - mkdir $DIRECTORY -fi - -echo $DIRECTORY -echo $QTPATH -echo $DEST -echo $REPOSPATH - -cp -r $REPOSPATH/install/applications/MuhRec.app $DIRECTORY - -pushd . -CPCMD="cp -f" - -cd $DEST/Contents -echo "This is where it lands..." -pwd -if [ ! -d "./Frameworks" ]; then - mkdir ./Frameworks -fi - -if [ ! -d "./MacOS" ]; then - mkdir ./MacOS -fi - -`$CPCMD $REPOSPATH/install/lib/libImagingAlgorithms.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libAdvancedFilters.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libModuleConfig.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libQtAddons.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libQtImaging.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReaderConfig.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReaderGUI.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libQtModuleConfigure.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReconFramework.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReconAlgorithms.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libStdBackProjectors.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libStdPreprocModules.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libkipl.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libStdPreprocModulesGUI.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libInspectorModulesGUI.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libInspectorModules.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libFDKBackProjectors.dylib $DEST/Contents/Frameworks` - -# `$CPCMD $REPOSPATH/ExternalDependencies/macos/$ARCH/lib/libNeXus.1.0.0.dylib $DEST/Contents/Frameworks` -# `$CPCMD $REPOSPATH/ExternalDependencies/macos/$ARCH/lib/libNeXusCPP.1.0.0.dylib $DEST/Contents/Frameworks` - -`$CPCMD /usr/local/lib/libNeXus.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD /usr/local/lib/libNeXusCPP.1.0.0.dylib $DEST/Contents/Frameworks` - -`$CPCMD /opt/homebrew/lib/libarmadillo.12.dylib $DEST/Contents/Frameworks` - -`$CPCMD /opt/homebrew/opt/openblas/lib/libopenblas.0.dylib $DEST/Contents/Frameworks` -`$CPCMD /opt/homebrew/opt/arpack/lib/libarpack.2.dylib $DEST/Contents/Frameworks` -`$CPCMD /opt/homebrew/opt/superlu/lib/libsuperlu.6.dylib $DEST/Contents/Frameworks` -`$CPCMD /opt/homebrew/lib/libzstd.1.dylib $DEST/Contents/Frameworks` -`$CPCMD /opt/homebrew/lib/libsz.2.dylib $DEST/Contents/Frameworks` -`$CPCMD /opt/homebrew/opt/gcc/lib/gcc/current/libgcc_s.1.1.dylib $DEST/Contents/Frameworks` -# `$CPCMD /Users/kaestner/anaconda3/lib/libgcc_s.1.1.dylib $DEST/Contents/Frameworks` - -if [ -e "$REPOSPATH/Applications/muhrecCLI" ]; then - `$CPCMD $REPOSPATH/Applications/muhrecCLI $DEST/Contents/MacOS` -fi - -rm -f ./MacOS/*.dylib -cd Frameworks -rm -f *.1.0.dylib -rm -f *.1.dylib - -if [ -e "/opt/local/lib/libzstd.1.dylib" ]; then - `$CPCMD /opt/local/lib/libzstd.1.dylib $DEST/Contents/MacOS` -fi - -if [ -e "/opt/local/lib/libzstd.9.dylib" ]; then - `$CPCMD /opt/local/lib/libzstd.9.dylib $DEST/Contents/MacOS` -fi - - - -cd .. - -if [ ! -d "./Resources" ]; then - mkdir ./Resources -fi - -cp $REPOSPATH/imagingsuite/applications/muhrec/Resources/* ./Resources - -#sed -i.bak s+com.yourcompany+ch.psi+g $DEST/Contents/Info.plist -echo "copy plugins" -pwd -if [ ! -d "./PlugIns" ]; then - mkdir ./PlugIns -fi - -if [ ! -d "./PlugIns/platforms" ]; then - mkdir ./PlugIns/platforms -fi - -if [ ! -f "./PlugIns/platforms/libqcocoa.dylib" ]; then - if [ -f "$QTPATH/plugins/platforms/libqcocoa.dylib" ]; then - cp $QTPATH/plugins/platforms/libqcocoa.dylib $DEST/Contents/PlugIns/platforms/ - fi -fi - -if [ ! -d "./PlugIns/printsupport" ]; then - mkdir ./PlugIns/printsupport -fi - -if [ ! -f "./PlugIns/printsupport/libcocoaprintersupport.dylib" ]; then - if [ -f "$QTPATH/plugins/printsupport/libcocoaprintersupport.dylib" ]; then - cp $QTPATH/plugins/printsupport/libcocoaprintersupport.dylib $DEST/Contents/PlugIns/printsupport/ - fi -fi - -if [ ! -d "./PlugIns/accessible" ]; then - mkdir ./PlugIns/accessible -fi - -if [ ! -f "./PlugIns/accessible/libqtaccessiblewidgets.dylib" ]; then - if [ -f "$QTPATH/plugins/accessible/libqtaccessiblewidgets.dylib" ] ; then - cp $QTPATH/plugins/accessible/libqtaccessiblewidgets.dylib $DEST/Contents/PlugIns/accessible/ - fi -fi - -pwd -ls PlugIns - -cd $QTBINPATH -echo "Do deploy..." -./macdeployqt $DEST #-dmg - -cd $DEST/Contents/MacOS - -# muhrec -install_name_tool -add_rpath @executable_path/../Frameworks MuhRec - -install_name_tool -change @executable_path/../Frameworks/libxml2.2.dylib @rpath/libxml2.2.dylib MuhRec -install_name_tool -change @executable_path/../Frameworks/libarmadillo.12.dylib @rpath/libarmadillo.12.dylib MuhRec -install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib MuhRec -install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib MuhRec -cd ../Frameworks - -chmod 666 libarmadillo.12.dylib -chmod 666 libhdf5_hl.dylib libhdf5_cpp.dylib -ln -s libNeXus.1.0.0.dylib libNeXus.1.dylib -ln -s libNeXusCPP.1.0.0.dylib libNeXusCPP.1.dylib -`$CPCMD /opt/homebrew/opt/gcc/lib/gcc/current/libgcc_s.1.1.dylib $DEST/Contents/Frameworks` # must be here to avoid deletion -`$CPCMD /opt/homebrew/lib/libzstd.1.dylib $DEST/Contents/Frameworks` - -install_name_tool -change @loader_path/../../../../opt/openblas/lib/libopenblas.0.dylib @rpath/libopenblas.0.dylib libarmadillo.12.dylib -install_name_tool -change @loader_path/../../../../opt/arpack/libexec/lib/libarpack.2.dylib @rpath/libarpack.2.dylib libarmadillo.12.dylib -install_name_tool -change @loader_path/../../../../opt/superlu/lib/libsuperlu.6.dylib @rpath/libsuperlu.6.dylib libarmadillo.12.dylib -install_name_tool -change @loader_path/../../../../opt/libaec/lib/libsz.2.dylib @rpath/libsz.2.dylib libhdf5_cpp.310.dylib -install_name_tool -change @loader_path/../../../../opt/libaec/lib/libsz.2.dylib @rpath/libsz.2.dylib libhdf5.310.dylib - -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libReaderGUI.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libReaderGUI.dylib -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libReaderConfig.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libReaderConfig.dylib -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libImagingAlgorithms.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libImagingAlgorithms.dylib -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libkipl.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libkipl.dylib -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libQtAddons.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libQtAddons.dylib -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libQtModuleConfigure.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libQtModuleConfigure.dylib -# #install_name_tool -change @executable_path/../Frameworks/libzstd.1.dylib @rpath/libzstd.1.dylib libtiff.6.dylib -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libReconFramework.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libReconFramework.dylib -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libModuleConfig.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libModuleConfig.dylib -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib libQtImaging.dylib -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib libQtImaging.dylib - -codesign --force --deep --sign - $DEST # needed to fix signature issue on M1 - -rm -rf /tmp/muhrec - -if [ ! -d "/tmp/muhrec" ]; then - mkdir /tmp/muhrec -fi - -if [ ! -e "tmp/muhrec/Applications" ]; then - ln -s /Applications /tmp/muhrec -fi - -cp -r $DEST /tmp/muhrec - -hdiutil create -volname MuhRec -srcfolder /tmp/muhrec -ov -format UDZO $DIRECTORY/MuhRec-MacOS_$ARCH-build-$GITVER-`date +%Y%m%d`.dmg diff --git a/deploy/mac/deploy_muhrec_mac_x86_64.sh b/deploy/mac/deploy_muhrec_mac_x86_64.sh deleted file mode 100755 index 19ac16dd..00000000 --- a/deploy/mac/deploy_muhrec_mac_x86_64.sh +++ /dev/null @@ -1,203 +0,0 @@ -DIRECTORY=$WORKSPACE/deployed - -DEST="$DIRECTORY/MuhRec.app" -REPOSPATH=$WORKSPACE -QTPATH=$QTBINPATH - -GITVER=`git rev-parse --short HEAD` - -if [ ! -d "$DIRECTORY" ]; then - mkdir $DIRECTORY -fi - -echo $DIRECTORY -echo $QTPATH -echo $DEST -echo $REPOSPATH - -cp -r $REPOSPATH/install/applications/MuhRec.app $DIRECTORY - -pushd . -CPCMD="cp" - -cd $DEST/Contents -echo "This is where it lands..." -pwd -if [ ! -d "./Frameworks" ]; then - mkdir ./Frameworks -fi - -if [ ! -d "./MacOS" ]; then - mkdir ./MacOS -fi - -`$CPCMD $REPOSPATH/install/lib/libImagingAlgorithms.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libModuleConfig.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libQtAddons.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libQtImaging.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReaderConfig.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReaderGUI.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libQtModuleConfigure.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReconFramework.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libReconAlgorithms.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libStdBackProjectors.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libStdPreprocModules.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libkipl.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libStdPreprocModulesGUI.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libInspectorModulesGUI.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libInspectorModules.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/install/lib/libFDKBackProjectors.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/imagingsuite/external/mac/lib/libNeXus.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/imagingsuite/external/mac/lib/libNeXusCPP.1.0.0.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/imagingsuite/external/mac/lib/libhdf5.10.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/imagingsuite/external/mac/lib/libhdf5_cpp.11.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/imagingsuite/external/mac/lib/libhdf5_hl.10.dylib $DEST/Contents/Frameworks` -`$CPCMD $REPOSPATH/imagingsuite/external/mac/lib/libsz.2.dylib $DEST/Contents/Frameworks` -`$CPCMD /opt/local/lib/libarmadillo*.dylib $DEST/Contents/Frameworks` - -if [ -e "$REPOSPATH/Applications/muhrecCLI" ]; then - `$CPCMD $REPOSPATH/Applications/muhrecCLI $DEST/Contents/MacOS` -fi - - -rm -f ./MacOS/*.dylib -cd Frameworks -rm -f *.1.0.dylib -rm -f *.1.dylib - -if [ -e "/opt/local/lib/libzstd.1.dylib" ]; then - `$CPCMD /opt/local/lib/libzstd.1.dylib $DEST/Contents/Frameworks` -fi - -if [ -e "/opt/local/lib/libzstd.9.dylib" ]; then - `$CPCMD /opt/local/lib/libzstd.9.dylib $DEST/Contents/Frameworks` -fi - -cd .. - -if [ ! -d "./Resources" ]; then - mkdir ./Resources -fi - -cp $REPOSPATH/imagingsuite/applications/muhrec/Resources/* ./Resources - -sed -i.bak s+com.yourcompany+ch.psi+g $DEST/Contents/Info.plist -echo "copy plugins" -pwd -if [ ! -d "./PlugIns" ]; then - mkdir ./PlugIns -fi - -if [ ! -d "./PlugIns/platforms" ]; then - mkdir ./PlugIns/platforms -fi - -if [ ! -f "./PlugIns/platforms/libqcocoa.dylib" ]; then - if [ -f "$QTPATH/plugins/platforms/libqcocoa.dylib" ]; then - cp $QTPATH/plugins/platforms/libqcocoa.dylib $DEST/Contents/PlugIns/platforms/ - fi -fi - -if [ ! -d "./PlugIns/printsupport" ]; then - mkdir ./PlugIns/printsupport -fi - -if [ ! -f "./PlugIns/printsupport/libcocoaprintersupport.dylib" ]; then - if [ -f "$QTPATH/plugins/printsupport/libcocoaprintersupport.dylib" ]; then - cp $QTPATH/plugins/printsupport/libcocoaprintersupport.dylib $DEST/Contents/PlugIns/printsupport/ - fi -fi - -if [ ! -d "./PlugIns/accessible" ]; then - mkdir ./PlugIns/accessible -fi - -if [ ! -f "./PlugIns/accessible/libqtaccessiblewidgets.dylib" ]; then - if [ -f "$QTPATH/plugins/accessible/libqtaccessiblewidgets.dylib" ] ; then - cp $QTPATH/plugins/accessible/libqtaccessiblewidgets.dylib $DEST/Contents/PlugIns/accessible/ - fi -fi - -pwd -ls PlugIns - -cd $QTBINPATH -echo "Do deploy..." -./macdeployqt $DEST #-dmg - -cd $DEST/Contents/MacOS - -install_name_tool -add_rpath @executable_path/../Frameworks MuhRec -# install_name_tool -change @rpath/libkipl.dylib @rpath/../Frameworks/libkipl.dylib MuhRec -# install_name_tool -change @rpath/libReaderGUI.dylib @rpath/../Frameworks/libReaderGUI.dylib MuhRec -# install_name_tool -change @rpath/libQtModuleConfigure.dylib @rpath/../Frameworks/libQtModuleConfigure.dylib MuhRec -# install_name_tool -change @rpath/libReconFramework.dylib @rpath/../Frameworks/libReconFramework.dylib MuhRec -# install_name_tool -change @rpath/libQtImaging.dylib @rpath/../Frameworks/libQtImaging.dylib MuhRec -# install_name_tool -change @rpath/libQtImaging.dylib @rpath/../Frameworks/libQtImaging.dylib MuhRec -# install_name_tool -change @rpath/libModuleConfig.dylib @rpath/../Frameworks/libModuleConfig.dylib MuhRec -# install_name_tool -change @rpath/libReaderConfig.dylib @rpath/../Frameworks/libReaderConfig.dylib MuhRec -# install_name_tool -change @rpath/libImagingAlgorithms.dylib @rpath/../Frameworks/libImagingAlgorithms.dylib MuhRec -# install_name_tool -change @rpath/libQtAddons.dylib @rpath/../Frameworks/libQtAddons.dylib MuhRec -# install_name_tool -change @rpath/QtWidgets.framework @rpath/../Frameworks/QtWidgets.framework MuhRec -# install_name_tool -change @rpath/QtGui.framework @rpath/../Frameworks/QtGui.framework MuhRec -# install_name_tool -change @rpath/QtConcurrent.framework @rpath/../Frameworks/QtConcurrent.framework MuhRec -# install_name_tool -change @rpath/QtCore.framework @rpath/../Frameworks/QtCore.framework MuhRec -cd $DEST/Contents/Frameworks -# # ReaderConfig -# install_name_tool -change libkipl.1.dylib @executable_path/../Frameworks/libkipl.1.dylib libReaderConfig.1.0.0.dylib -# install_name_tool -change libQtAddons.1.dylib @executable_path/../Frameworks/libQtAddons.1.dylib libReaderConfig.1.0.0.dylib -# install_name_tool -change libModuleConfig.1.dylib @executable_path/../Frameworks/libModuleConfig.1.dylib libReaderConfig.1.0.0.dylib -# install_name_tool -change libImagingAlgorithms.1.dylib @executable_path/../Frameworks/libImagingAlgorithms.1.dylib libReaderConfig.1.0.0.dylib -install_name_tool -change libNeXus.1.dylib @rpath/../Frameworks/libNeXus.1.0.0.dylib libReaderConfig.dylib -install_name_tool -change libNeXusCPP.1.dylib @rpath/../Frameworks/libNeXusCPP.1.0.0.dylib libReaderConfig.dylib - -# Nexus -# install_name_tool -change /usr/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib libNexus.1.dylib -# install_name_tool -change /usr/lib/libz.1.dylib @executable_path/../Frameworks/libz.1.dylib libNexusCPP.1.dylib -# install_name_tool -change libNeXus.1.dylib @executable_path/../Frameworks/libNeXus.1.dylib libNexusCPP.1.dylib -# install_name_tool -change libNeXus.1.dylib @executable_path/../Frameworks/libNeXus.1.dylib libkipl.1.0.0.dylib -# install_name_tool -change libNeXusCPP.1.dylib @executable_path/../Frameworks/libNeXusCPP.1.dylib libkipl.1.0.0.dylib -# install_name_tool -change libNeXus.1.dylib @executable_path/../Frameworks/libNeXus.1.dylib libReconFramework.1.0.0.dylib -# install_name_tool -change libNeXusCPP.1.dylib @executable_path/../Frameworks/libNeXusCPP.1.dylib libReconFramework.1.0.0.dylib -install_name_tool -change /usr/lib/libz.1.dylib @rpath/../Frameworks/libz.1.dylib libNexus.1.dylib -install_name_tool -change /usr/lib/libz.1.dylib @rpath/../Frameworks/libz.1.dylib libNexusCPP.1.dylib -install_name_tool -change libNeXus.1.dylib @rpath/../Frameworks/libNeXus.1.dylib libNexusCPP.1.dylib - -install_name_tool -change /usr/local/Cellar/hdf5/1.8.16_1/lib/libhdf5.10.dylib @rpath/../Frameworks/libhdf5.10.dylib libhdf5_cpp.11.dylib -install_name_tool -change /usr/local/Cellar/hdf5/1.8.16_1/lib/libhdf5.10.dylib @rpath/../Frameworks/libhdf5.10.dylib libhdf5_hl.10.dylib - -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_cpp.11.dylib @rpath/../Frameworks/libhdf5_cpp.11.dylib libNeXus.1.0.0.dylib -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5.10.dylib @rpath/../Frameworks/libhdf5.10.dylib libNeXus.1.0.0.dylib -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_hl.10.dylib @rpath/../Frameworks/libhdf5_hl.10.dylib libNeXus.1.0.0.dylib -install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @rpath/../Frameworks/libsz.2.dylib libNeXus.1.0.0.dylib - -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_cpp.11.dylib @rpath/../Frameworks/libhdf5_cpp.11.dylib libNeXusCPP.1.0.0.dylib -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5.10.dylib @rpath/../Frameworks/libhdf5.10.dylib libNeXusCPP.1.0.0.dylib -install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_hl.10.dylib @rpath/../Frameworks/libhdf5_hl.10.dylib libNeXusCPP.1.0.0.dylib -install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @rpath/../Frameworks/libsz.2.dylib libNeXusCPP.1.0.0.dylib - -# install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5.10.dylib libhdf5.10.dylib libhdf5.10.dylib -install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @rpath/../Frameworks/libsz.2.dylib libhdf5.10.dylib -install_name_tool -change /usr/lib/libz.1.dylib @rpath/../Frameworks/libz.1.dylib libhdf5.10.dylib - -# install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_cpp.11.dylib libhdf5_cpp.11.dylib libhdf5_cpp.11.dylib -install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @rpath/../Frameworks/libsz.2.dylib libhdf5_cpp.11.dylib -install_name_tool -change /usr/lib/libz.1.dylib @rpath/../Frameworks/libz.1.dylib libhdf5_cpp.11.dylib - -# install_name_tool -change /usr/local/opt/hdf5/lib/libhdf5_hl.10.dylib libhdf5_hl.10.dylib libhdf5_hl.10.dylib -install_name_tool -change /usr/local/opt/szip/lib/libsz.2.dylib @rpath/../Frameworks/libsz.2.dylib libhdf5_hl.10.dylib -install_name_tool -change /usr/lib/libz.1.dylib @rpath/../Frameworks/libz.1.dylib libhdf5_hl.10.dylib - -rm -rf /tmp/muhrec - -if [ ! -d "/tmp/muhrec" ]; then - mkdir /tmp/muhrec -fi - -if [ ! -e "tmp/muhrec/Applications" ]; then - ln -s /Applications /tmp/muhrec -fi - -cp -r $DEST /tmp/muhrec - -hdiutil create -volname MuhRec -srcfolder /tmp/muhrec -ov -format UDZO $DIRECTORY/MuhRec-MacOS_x86_64_build-$GITVER-`date +%Y%m%d`.dmg diff --git a/deploy/mac/deploy_pythonbindings_mac.sh b/deploy/mac/deploy_pythonbindings_mac.sh deleted file mode 100755 index 31028946..00000000 --- a/deploy/mac/deploy_pythonbindings_mac.sh +++ /dev/null @@ -1,56 +0,0 @@ -DIRECTORY=$WORKSPACE/deployed - -DEST="$DIRECTORY/nitools" - -BREWPATH="`brew --prefix`" - -mkdir -p $DEST -pushd . -cd $DEST -touch __init__.py -mkdir -p imgalg -cd imgalg -touch __init__.py -cp $WORKSPACE/install/lib/imgalg.cpython-*-darwin.so . -cp $WORKSPACE/install/lib/muhrectomo.cpython-*-darwin.so . -cp $WORKSPACE/install/lib/advfilters.cpython-*-darwin.so . -cp $WORKSPACE/install/lib/libAdvancedFilters.dylib . -cp $WORKSPACE/install/lib/libImagingAlgorithms.dylib . -cp $WORKSPACE/install/lib/libkipl.dylib . -cp $WORKSPACE/install/lib/libStdBackProjectors.dylib . -cp $WORKSPACE/install/lib/libFDKBackProjectors.dylib . -cp $WORKSPACE/install/lib/libReconFramework.dylib . -cp $WORKSPACE/install/lib/libModuleConfig.dylib . -cp $WORKSPACE/install/lib/libReaderConfig.dylib . - -cp $BREWPATH/opt/libtiff/lib/libtiff.6.dylib . -cp $BREWPATH/opt/armadillo/lib/libarmadillo.12.dylib . -cp $BREWPATH/opt/cfitsio/lib/libcfitsio.10.dylib . -# cp $WORKSPACE/ExternalDependencies/macos/arm64/lib/libNeXus.1.0.0.dylib . -# cp $WORKSPACE/ExternalDependencies/macos/arm64/lib/libNeXusCPP.1.0.0.dylib . -# cp /usr/local/lib/libNeXus.1.0.0.dylib . -# cp /usr/local/lib/libNeXusCPP.1.0.0.dylib . - -cp $BREWPATH/opt/fftw/lib/libfftw3.3.dylib . -cp $BREWPATH/opt/fftw/lib/libfftw3f.3.dylib . -cp $BREWPATH/opt/openblas/lib/libopenblas.0.dylib . -cp $BREWPATH/opt/arpack/libexec/lib/libarpack.2.dylib . -cp $BREWPATH/opt/superlu/lib/libsuperlu.6.dylib . -chmod 666 *.dylib - - -# rm -f libNeXus.1.dylib libNeXusCPP.1.dylib -# ln -s libNeXus.1.0.0.dylib libNeXus.1.dylib -# ln -s libNeXusCPP.1.0.0.dylib libNeXusCPP.1.dylib - -install_name_tool -add_rpath @executable_path muhrectomo.cpython-*-darwin.so -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib muhrectomo.cpython-*-darwin.so -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib muhrectomo.cpython-*-darwin.so -# install_name_tool -change libNeXus.1.dylib @rpath/libNeXus.1.dylib advfilters.cpython-*-darwin.so -# install_name_tool -change libNeXusCPP.1.dylib @rpath/libNeXusCPP.1.dylib advfilters.cpython-*-darwin.so - -cd .. -mkdir -p utils -cp $WORKSPACE/scripts/python/amglib/*.py utils - -popd \ No newline at end of file diff --git a/deploy/mac/pytester.py b/deploy/mac/pytester.py deleted file mode 100644 index 8f5fba21..00000000 --- a/deploy/mac/pytester.py +++ /dev/null @@ -1,6 +0,0 @@ -import sys -sys.path.append('../../../deployed/') - -from nitools.imgalg import imgalg -from nitools.imgalg import advfilters -from nitools.imgalg import muhrectomo \ No newline at end of file diff --git a/deploy/win/deploykiptool_win.bat b/deploy/win/deploykiptool_win.bat deleted file mode 100644 index 0ec94830..00000000 --- a/deploy/win/deploykiptool_win.bat +++ /dev/null @@ -1,81 +0,0 @@ -set REPOS=%WORKSPACE% -set DEST=%WORKSPACE%\deployed\kiptool - -IF NOT EXIST %DEST% mkdir %DEST% -pushd . -cd %DEST% - -copy %REPOS%\Applications\KipTool.exe . -copy %REPOS%\Applications\KipToolCLI.exe . -copy %REPOS%\lib\ImagingAlgorithms.dll . -copy %REPOS%\lib\ModuleConfig.dll . -copy %REPOS%\lib\ReaderConfig.dll . -copy %REPOS%\lib\ReaderGUI.dll . -copy %REPOS%\lib\QtAddons.dll . -copy %REPOS%\lib\QtModuleConfigure.dll . -copy %REPOS%\lib\kipl.dll . -copy %REPOS%\lib\ProcessFramework.dll . -copy %REPOS%\lib\AdvancedFilterModules.dll . -copy %REPOS%\lib\AdvancedFilterModulesGUI.dll . -copy %REPOS%\lib\BaseModules.dll . -copy %REPOS%\lib\BaseModulesGUI.dll . -copy %REPOS%\lib\ClassificationModules.dll . -copy %REPOS%\lib\ClassificationModulesGUI.dll . -copy %REPOS%\lib\ImagingModules.dll . -copy %REPOS%\lib\ImagingModulesGUI.dll . - -copy %REPOS%\imagingsuite\external\lib64\libtiff.dll . -copy %REPOS%\imagingsuite\external\lib64\libjpeg-62.dll . -copy %REPOS%\imagingsuite\external\lib64\zlib1.dll . -copy %REPOS%\imagingsuite\external\lib64\libfftw3-3.dll . -copy %REPOS%\imagingsuite\external\lib64\libfftw3f-3.dll . -copy %REPOS%\imagingsuite\external\lib64\libxml2-2.dll . -copy %REPOS%\imagingsuite\external\lib64\libiconv.dll . -copy %REPOS%\imagingsuite\external\lib64\cfitsio.dll . -copy %REPOS%\imagingsuite\external\lib64\nexus\NeXus.dll . -copy %REPOS%\imagingsuite\external\lib64\nexus\NexusCPP.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\hdf5.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\hdf5_cpp.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\zlib.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\szip.dll . - -copy %REPOS%\imagingsuite\external\lib64\libtiff.dll . -copy %REPOS%\imagingsuite\external\lib64\libjpeg-62.dll . -copy %REPOS%\imagingsuite\external\lib64\zlib1.dll . -copy %REPOS%\imagingsuite\external\lib64\libfftw3-3.dll . -copy %REPOS%\imagingsuite\external\lib64\libfftw3f-3.dll . -copy %REPOS%\imagingsuite\external\lib64\libxml2-2.dll . -copy %REPOS%\imagingsuite\external\lib64\libiconv.dll . -copy %REPOS%\imagingsuite\external\lib64\cfitsio.dll . -copy %REPOS%\imagingsuite\external\lib64\nexus\NeXus.dll . -copy %REPOS%\imagingsuite\external\lib64\nexus\NexusCPP.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\hdf5.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\hdf5_cpp.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\zlib.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\szip.dll . -copy %REPOS%\imagingsuite\external\lib64\libgcc_s_seh_64-1.dll . -copy %REPOS%\imagingsuite\external\lib64\libgcc_s_seh-1.dll . -copy %REPOS%\imagingsuite\external\lib64\libgfortran_64-3.dll . -copy %REPOS%\imagingsuite\external\lib64\libquadmath-0.dll . -copy %REPOS%\imagingsuite\external\lib64\libwinpthread-1.dll . -copy %REPOS%\imagingsuite\external\lib64\libblas.dll . -copy %REPOS%\imagingsuite\external\lib64\liblapack.dll . - -cd %QTBINPATH% - -windeployqt %DEST%\KipTool.exe -windeployqt %DEST%\KipToolCLI.exe -copy Qt5PrintSupport.dll %DEST% -copy Qt5Charts.dll %DEST% - -popd -for /F "usebackq tokens=1,2 delims==" %%i in (`wmic os get LocalDateTime /VALUE 2^>NUL`) do if '.%%i.'=='.LocalDateTime.' set ldt=%%j -set ldt=%ldt:~0,8% -FOR /F "tokens=*" %%g IN ('git rev-parse --short HEAD') do (set tag=%%g) - -if exist "C:\Program Files\7-Zip\7z.exe" ( - "C:\Program Files\7-Zip\7z.exe" a %DEST%\..\kiptool_build%tag%-%ldt%.zip %DEST% -) else ( - echo 7zip doesn't exist -) - diff --git a/deploy/win/deploymuhrec_cmake.bat b/deploy/win/deploymuhrec_cmake.bat deleted file mode 100644 index f4f15920..00000000 --- a/deploy/win/deploymuhrec_cmake.bat +++ /dev/null @@ -1,46 +0,0 @@ -set REPOS=%WORKSPACE% -set DEST=%WORKSPACE%\deployed\muhrec -set BDEST=%WORKSPACE%\install - -if not exist %DEST% mkdir %DEST% - -pushd . -cd %DEST% -mkdir resources - -copy %BDEST%\lib\*.dll . -copy %BDEST%\lib\*.cp* . - -copy %BDEST%\applications\MuhRec.exe . -copy %BDEST%\applications\ImageViewer.exe . -@REM copy %BDEST%\MuhRecCLI.exe . - -rem copy %REPOS%\lib\verticalslicer.exe -rem copy %REPOS%\lib\multiframesplitter.exe - -copy %REPOS%\imagingsuite\applications\muhrec\Resources resources - -cd %QTPATH%/bin - -rem windeployqt %DEST%\verticalslicer.exe -rem windeployqt %DEST%\multiframesplitter.exe -windeployqt %DEST%\muhrec.exe -windeployqt %DEST%\ImageViewer.exe -rem windeployqt %DEST%\muhrecCLI.exe - -copy Qt6PrintSupport.dll %DEST% -copy Qt6Charts.dll %DEST% -copy Qt6OpenGLWidgets.dll %DEST% -copy Qt6OpenGl.dll %DEST% - - -popd -for /F "usebackq tokens=1,2 delims==" %%i in (`wmic os get LocalDateTime /VALUE 2^>NUL`) do if '.%%i.'=='.LocalDateTime.' set ldt=%%j -set ldt=%ldt:~0,8% -FOR /F "tokens=*" %%g IN ('git rev-parse --short HEAD') do (set tag=%%g) - -if exist "C:\Program Files\7-Zip\7z.exe" ( - "C:\Program Files\7-Zip\7z.exe" a %DEST%\..\MuhRec-Windows_build%tag%-%ldt%.zip %DEST% -) else ( - echo 7zip doesn't exist -) \ No newline at end of file diff --git a/deploy/win/deploymuhrec_win.bat b/deploy/win/deploymuhrec_win.bat deleted file mode 100644 index 87a1a8bc..00000000 --- a/deploy/win/deploymuhrec_win.bat +++ /dev/null @@ -1,83 +0,0 @@ -set REPOS=%WORKSPACE% -set DEST=%WORKSPACE%\deployed\muhrec - - -if not exist %DEST% mkdir %DEST% - -pushd . -cd %DEST% -mkdir resources - -copy %REPOS%\lib\ImagingAlgorithms.dll . -copy %REPOS%\lib\ModuleConfig.dll . -copy %REPOS%\lib\QtAddons.dll . -copy %REPOS%\lib\QtModuleConfigure.dll . -copy %REPOS%\lib\kipl.dll . -copy %REPOS%\lib\ReconFramework.dll . -copy %REPOS%\lib\StdBackProjectors.dll . -copy %REPOS%\lib\StdPreprocModules.dll . -copy %REPOS%\lib\StdPreprocModulesGUI.dll . -copy %REPOS%\lib\InspectorModulesGUI.dll . -copy %REPOS%\lib\InspectorModules.dll . -copy %REPOS%\lib\FDKBackProjectors.dll . -copy %REPOS%\lib\ReaderConfig.dll . -copy %REPOS%\lib\ReaderGUI.dll . -rem copy %REPOS%\lib\ReconAlgorithms.dll . -copy %REPOS%\lib\QtImaging.dll . - -copy %REPOS%\imagingsuite\external\lib64\libtiff.dll . -copy %REPOS%\imagingsuite\external\lib64\libjpeg-62.dll . -copy %REPOS%\imagingsuite\external\lib64\zlib1.dll . -copy %REPOS%\imagingsuite\external\lib64\libfftw3-3.dll . -copy %REPOS%\imagingsuite\external\lib64\libfftw3f-3.dll . - - -copy %REPOS%\imagingsuite\external\lib64\nexus\NeXus.dll . -copy %REPOS%\imagingsuite\external\lib64\nexus\NexusCPP.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\hdf5.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\hdf5_cpp.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\zlib.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\szip.dll . -copy %REPOS%\imagingsuite\external\lib64\libgcc_s_seh_64-1.dll . -copy %REPOS%\imagingsuite\external\lib64\libgcc_s_seh-1.dll . -copy %REPOS%\imagingsuite\external\lib64\libgfortran_64-3.dll . -copy %REPOS%\imagingsuite\external\lib64\libquadmath-0.dll . -copy %REPOS%\imagingsuite\external\lib64\libwinpthread-1.dll . -copy %REPOS%\imagingsuite\external\lib64\libblas.dll . -copy %REPOS%\imagingsuite\external\lib64\liblapack.dll . - -copy %REPOS%\ExternalDependencies\windows\bin\libopenblas.dll . -copy %REPOS%\ExternalDependencies\windows\bin\cfitsio.dll . -copy %REPOS%\ExternalDependencies\windows\bin\libxml2.dll . - - -copy %REPOS%\Applications\MuhRec.exe . -copy %REPOS%\Applications\MuhRecCLI.exe . -copy %REPOS%\lib\verticalslicer.exe -copy %REPOS%\lib\multiframesplitter.exe - -copy %REPOS%\imagingsuite\applications\muhrec\Resources resources - -cd %QTBINPATH% - -windeployqt %DEST%\verticalslicer.exe -windeployqt %DEST%\multiframesplitter.exe -windeployqt %DEST%\muhrec.exe -windeployqt %DEST%\muhrecCLI.exe - -copy Qt6PrintSupport.dll %DEST% -copy Qt6Charts.dll %DEST% -copy Qt6OpenGLWidgets.dll %DEST% -copy Qt6OpenGl.dll %DEST% - - -popd -for /F "usebackq tokens=1,2 delims==" %%i in (`wmic os get LocalDateTime /VALUE 2^>NUL`) do if '.%%i.'=='.LocalDateTime.' set ldt=%%j -set ldt=%ldt:~0,8% -FOR /F "tokens=*" %%g IN ('git rev-parse --short HEAD') do (set tag=%%g) - -if exist "C:\Program Files\7-Zip\7z.exe" ( - "C:\Program Files\7-Zip\7z.exe" a %DEST%\..\MuhRec-Windows_build%tag%-%ldt%.zip %DEST% -) else ( - echo 7zip doesn't exist -) \ No newline at end of file diff --git a/deploy/win/deploymuhrec_win_Qt5.bat b/deploy/win/deploymuhrec_win_Qt5.bat deleted file mode 100644 index 7e1eeb6f..00000000 --- a/deploy/win/deploymuhrec_win_Qt5.bat +++ /dev/null @@ -1,80 +0,0 @@ -set REPOS=%WORKSPACE% -set DEST=%WORKSPACE%\deployed\muhrec - - -if not exist %DEST% mkdir %DEST% - -pushd . -cd %DEST% -mkdir resources - -copy %REPOS%\lib\ImagingAlgorithms.dll . -copy %REPOS%\lib\ModuleConfig.dll . -copy %REPOS%\lib\QtAddons.dll . -copy %REPOS%\lib\QtModuleConfigure.dll . -copy %REPOS%\lib\kipl.dll . -copy %REPOS%\lib\ReconFramework.dll . -copy %REPOS%\lib\StdBackProjectors.dll . -copy %REPOS%\lib\StdPreprocModules.dll . -copy %REPOS%\lib\StdPreprocModulesGUI.dll . -copy %REPOS%\lib\InspectorModulesGUI.dll . -copy %REPOS%\lib\InspectorModules.dll . -copy %REPOS%\lib\FDKBackProjectors.dll . -copy %REPOS%\lib\ReaderConfig.dll . -copy %REPOS%\lib\ReaderGUI.dll . -rem copy %REPOS%\lib\ReconAlgorithms.dll . -copy %REPOS%\lib\QtImaging.dll . - -copy %REPOS%\imagingsuite\external\lib64\libtiff.dll . -copy %REPOS%\imagingsuite\external\lib64\libjpeg-62.dll . -copy %REPOS%\imagingsuite\external\lib64\zlib1.dll . -copy %REPOS%\imagingsuite\external\lib64\libfftw3-3.dll . -copy %REPOS%\imagingsuite\external\lib64\libfftw3f-3.dll . - - -copy %REPOS%\imagingsuite\external\lib64\nexus\NeXus.dll . -copy %REPOS%\imagingsuite\external\lib64\nexus\NexusCPP.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\hdf5.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\hdf5_cpp.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\zlib.dll . -copy %REPOS%\imagingsuite\external\lib64\hdf5\szip.dll . -copy %REPOS%\imagingsuite\external\lib64\libgcc_s_seh_64-1.dll . -copy %REPOS%\imagingsuite\external\lib64\libgcc_s_seh-1.dll . -copy %REPOS%\imagingsuite\external\lib64\libgfortran_64-3.dll . -copy %REPOS%\imagingsuite\external\lib64\libquadmath-0.dll . -copy %REPOS%\imagingsuite\external\lib64\libwinpthread-1.dll . -copy %REPOS%\imagingsuite\external\lib64\libblas.dll . -copy %REPOS%\imagingsuite\external\lib64\liblapack.dll . - -copy %REPOS%\ExternalDependencies\windows\bin\libopenblas.dll . -copy %REPOS%\ExternalDependencies\windows\bin\cfitsio.dll . -copy %REPOS%\ExternalDependencies\windows\bin\libxml2.dll . - - -copy %REPOS%\Applications\MuhRec.exe . -copy %REPOS%\Applications\MuhRecCLI.exe . -copy %REPOS%\lib\verticalslicer.exe -copy %REPOS%\lib\multiframesplitter.exe - -copy %REPOS%\imagingsuite\applications\muhrec\Resources resources - -cd %QTBINPATH% - -windeployqt %DEST%\verticalslicer.exe -windeployqt %DEST%\multiframesplitter.exe -windeployqt %DEST%\muhrec.exe -windeployqt %DEST%\muhrecCLI.exe - -copy Qt5PrintSupport.dll %DEST% -copy Qt5Charts.dll %DEST% - -popd -for /F "usebackq tokens=1,2 delims==" %%i in (`wmic os get LocalDateTime /VALUE 2^>NUL`) do if '.%%i.'=='.LocalDateTime.' set ldt=%%j -set ldt=%ldt:~0,8% -FOR /F "tokens=*" %%g IN ('git rev-parse --short HEAD') do (set tag=%%g) - -if exist "C:\Program Files\7-Zip\7z.exe" ( - "C:\Program Files\7-Zip\7z.exe" a %DEST%\..\MuhRec-Windows_build%tag%-%ldt%.zip %DEST% -) else ( - echo 7zip doesn't exist -) \ No newline at end of file diff --git a/deploy/win/deploymuhrec_win_nofolder.bat b/deploy/win/deploymuhrec_win_nofolder.bat deleted file mode 100644 index 491a3c83..00000000 --- a/deploy/win/deploymuhrec_win_nofolder.bat +++ /dev/null @@ -1,55 +0,0 @@ -@echo ----------------- Deploy copy -------------- -set REPOS=C:\%HOMEPATH%\git -set DEST=C:\%HOMEPATH%\imagingscience - -if not exist %DEST% mkdir %DEST% - -pushd . -cd %DEST% -mkdir resources - -copy %REPOS%\lib\ImagingAlgorithms.dll . -copy %REPOS%\lib\ModuleConfig.dll . -copy %REPOS%\lib\QtAddons.dll . -copy %REPOS%\lib\QtModuleConfigure.dll . -copy %REPOS%\lib\kipl.dll . -copy %REPOS%\lib\ReconFramework.dll . -copy %REPOS%\lib\StdBackProjectors.dll . -copy %REPOS%\lib\StdPreprocModules.dll . -copy %REPOS%\lib\StdPreprocModulesGUI.dll . -copy %REPOS%\lib\InspectorModulesGUI.dll . -copy %REPOS%\lib\InspectorModules.dll . -copy %REPOS%\lib\FDKBackProjectors.dll . -copy %REPOS%\lib\UnpublishedImagingAlgorithms.dll . -copy %REPOS%\lib\UnpublPreProcessing.dll . -copy %REPOS%\lib\UnpublPreProcessingGUI.dll . - -copy %REPOS%\external\lib64\libtiff.dll . -copy %REPOS%\external\lib64\libjpeg-62.dll . -copy %REPOS%\external\lib64\zlib1.dll . -copy %REPOS%\external\lib64\libfftw3-3.dll . -copy %REPOS%\external\lib64\libfftw3f-3.dll . -copy %REPOS%\external\lib64\libxml2-2.dll . -copy %REPOS%\external\lib64\libiconv.dll . -copy %REPOS%\external\lib64\cfitsio.dll . -copy %REPOS%\external\lib64\nexus\NeXus.dll . -copy %REPOS%\external\lib64\nexus\NeXusCPP.dll . -copy %REPOS%\external\lib64\hdf5\hdf5.dll . -copy %REPOS%\external\lib64\hdf5\hdf5_cpp.dll . -copy %REPOS%\external\lib64\hdf5\zlib.dll . -copy %REPOS%\external\lib64\hdf5\szip.dll . - - -copy %REPOS%\Applications\muhrec3.exe . - -copy %REPOS%\applications\muhrec3\src\resources resources - -#rem cd C:\Qt\5.8\msvc2015_64\bin -#cd C:\Qt59\5.9.3\msvc2015_64\bin -#cd C:\Qt\5.8\msvc2015_64\bin -cd C:\Qt\5.9\msvc2015_64\bin - -windeployqt %DEST%\muhrec3.exe -copy Qt5PrintSupport.dll %DEST% - -popd \ No newline at end of file