diff --git a/src/install/macx/macinstall_latest.sh b/src/install/macx/macinstall_latest.sh index 2c3d89424..f10d91f27 100755 --- a/src/install/macx/macinstall_latest.sh +++ b/src/install/macx/macinstall_latest.sh @@ -51,7 +51,7 @@ do cp ./$x $BUNDLE/meshlab.app/Contents/PlugIns/ done -for x in $BUNDLE/meshlab.app/Contents/plugins/*.dylib +for x in $BUNDLE/meshlab.app/Contents/PlugIns/*.dylib do install_name_tool -change libcommon.1.dylib @executable_path/libcommon.1.dylib $x done @@ -61,12 +61,12 @@ echo 'Copying other files' cp ../../LICENSE.txt $BUNDLE cp ../../docs/readme.txt $BUNDLE -mkdir $BUNDLE/$APPNAME/Contents/plugins/U3D_OSX -cp plugins/U3D_OSX/IDTFConverter.out $BUNDLE/$APPNAME/Contents/plugins/U3D_OSX -cp plugins/U3D_OSX/IDTFConverter.sh $BUNDLE/$APPNAME/Contents/plugins/U3D_OSX -cp plugins/U3D_OSX/libIFXCore.so $BUNDLE/$APPNAME/Contents/plugins/U3D_OSX -mkdir $BUNDLE/$APPNAME/Contents/plugins/U3D_OSX/Plugins -cp plugins/U3D_OSX/Plugins/libIFXExporting.so $BUNDLE/$APPNAME/Contents/plugins/U3D_OSX/Plugins +mkdir $BUNDLE/$APPNAME/Contents/PlugIns/U3D_OSX +cp plugins/U3D_OSX/IDTFConverter.out $BUNDLE/$APPNAME/Contents/PlugIns/U3D_OSX +cp plugins/U3D_OSX/IDTFConverter.sh $BUNDLE/$APPNAME/Contents/PlugIns/U3D_OSX +cp plugins/U3D_OSX/libIFXCore.so $BUNDLE/$APPNAME/Contents/PlugIns/U3D_OSX +mkdir $BUNDLE/$APPNAME/Contents/PlugIns/U3D_OSX/Plugins +cp plugins/U3D_OSX/Plugins/libIFXExporting.so $BUNDLE/$APPNAME/Contents/PlugIns/U3D_OSX/Plugins mkdir $BUNDLE/$APPNAME/Contents/textures cp textures/*.png $BUNDLE/$APPNAME/Contents/textures/ @@ -89,9 +89,9 @@ echo "Changing the paths of the qt component frameworks using the qt tool macdep if [ -e $QTDIR/bin/macdeployqt ] then echo -$QTDIR/bin/macdeployqt $BUNDLE/$APPNAME -verbose=2 +$QTDIR/bin/macdeployqt $BUNDLE/$APPNAME -executable=$BUNDLE/$APPNAME/Contents/MacOS/meshlabserver else -macdeployqt $BUNDLE/$APPNAME -verbose=2 +macdeployqt $BUNDLE/$APPNAME -executable=$BUNDLE/$APPNAME/Contents/MacOS/meshlabserver fi cd ../install/macx diff --git a/src/install/macx/macinstall_v11.sh b/src/install/macx/old_scripts/macinstall_v11.sh similarity index 100% rename from src/install/macx/macinstall_v11.sh rename to src/install/macx/old_scripts/macinstall_v11.sh diff --git a/src/install/macx/macinstall_v12.sh b/src/install/macx/old_scripts/macinstall_v12.sh similarity index 100% rename from src/install/macx/macinstall_v12.sh rename to src/install/macx/old_scripts/macinstall_v12.sh diff --git a/src/install/macx/macinstall_v13.sh b/src/install/macx/old_scripts/macinstall_v13.sh similarity index 100% rename from src/install/macx/macinstall_v13.sh rename to src/install/macx/old_scripts/macinstall_v13.sh diff --git a/src/install/macx/macinstall_v2016.sh b/src/install/macx/old_scripts/macinstall_v2016.sh similarity index 100% rename from src/install/macx/macinstall_v2016.sh rename to src/install/macx/old_scripts/macinstall_v2016.sh diff --git a/src/install/macx/macinstall_v2018.sh b/src/install/macx/old_scripts/macinstall_v2018.sh similarity index 100% rename from src/install/macx/macinstall_v2018.sh rename to src/install/macx/old_scripts/macinstall_v2018.sh diff --git a/src/install/macx/meshlab_dmg.json b/src/install/macx/old_scripts/meshlab_dmg.json similarity index 100% rename from src/install/macx/meshlab_dmg.json rename to src/install/macx/old_scripts/meshlab_dmg.json