From 54c0746602918c24f3dc08e9efe3a796fa7b16e6 Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Fri, 17 Jan 2020 14:12:14 +0100
Subject: [PATCH 1/3] deploying also meshlabserver

---
 src/install/macx/macinstall_latest.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/install/macx/macinstall_latest.sh b/src/install/macx/macinstall_latest.sh
index 2c3d89424..7c5eba42e 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/
@@ -91,7 +91,7 @@ then
 echo
 $QTDIR/bin/macdeployqt $BUNDLE/$APPNAME -verbose=2
 else
-macdeployqt $BUNDLE/$APPNAME -verbose=2
+macdeployqt $BUNDLE/$APPNAME -verbose=2 -executable=$BUNDLE/$APPNAME/Contents/MacOS/meshlabserver
 fi
 
 cd ../install/macx

From cd4b406e3a2049d6c17638d907d29b19282ab2ea Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Fri, 17 Jan 2020 15:04:30 +0100
Subject: [PATCH 2/3] mac deployment meshlabserver fix and check

---
 src/install/macx/macinstall_latest.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/install/macx/macinstall_latest.sh b/src/install/macx/macinstall_latest.sh
index 7c5eba42e..2dcf13c58 100755
--- a/src/install/macx/macinstall_latest.sh
+++ b/src/install/macx/macinstall_latest.sh
@@ -89,11 +89,13 @@ 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 -verbose=2 -executable=$BUNDLE/$APPNAME/Contents/MacOS/meshlabserver
 else
 macdeployqt $BUNDLE/$APPNAME -verbose=2 -executable=$BUNDLE/$APPNAME/Contents/MacOS/meshlabserver
 fi
 
+otool -L $BUNDLE/$APPNAME/Contents/MacOS/meshlabserver
+
 cd ../install/macx
 # final step create the dmg using appdmg
 # appdmg is installed with 'npm install -g appdmg'",

From 7591d01d367513a7240109979ac3459e4fa80576 Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Fri, 17 Jan 2020 16:06:31 +0100
Subject: [PATCH 3/3] removing debug prints and moving old mac scripts

---
 src/install/macx/macinstall_latest.sh                  | 6 ++----
 src/install/macx/{ => old_scripts}/macinstall_v11.sh   | 0
 src/install/macx/{ => old_scripts}/macinstall_v12.sh   | 0
 src/install/macx/{ => old_scripts}/macinstall_v13.sh   | 0
 src/install/macx/{ => old_scripts}/macinstall_v2016.sh | 0
 src/install/macx/{ => old_scripts}/macinstall_v2018.sh | 0
 src/install/macx/{ => old_scripts}/meshlab_dmg.json    | 0
 7 files changed, 2 insertions(+), 4 deletions(-)
 rename src/install/macx/{ => old_scripts}/macinstall_v11.sh (100%)
 rename src/install/macx/{ => old_scripts}/macinstall_v12.sh (100%)
 rename src/install/macx/{ => old_scripts}/macinstall_v13.sh (100%)
 rename src/install/macx/{ => old_scripts}/macinstall_v2016.sh (100%)
 rename src/install/macx/{ => old_scripts}/macinstall_v2018.sh (100%)
 rename src/install/macx/{ => old_scripts}/meshlab_dmg.json (100%)

diff --git a/src/install/macx/macinstall_latest.sh b/src/install/macx/macinstall_latest.sh
index 2dcf13c58..f10d91f27 100755
--- a/src/install/macx/macinstall_latest.sh
+++ b/src/install/macx/macinstall_latest.sh
@@ -89,13 +89,11 @@ 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 -executable=$BUNDLE/$APPNAME/Contents/MacOS/meshlabserver
+$QTDIR/bin/macdeployqt $BUNDLE/$APPNAME -executable=$BUNDLE/$APPNAME/Contents/MacOS/meshlabserver
 else
-macdeployqt $BUNDLE/$APPNAME -verbose=2 -executable=$BUNDLE/$APPNAME/Contents/MacOS/meshlabserver
+macdeployqt $BUNDLE/$APPNAME -executable=$BUNDLE/$APPNAME/Contents/MacOS/meshlabserver
 fi
 
-otool -L $BUNDLE/$APPNAME/Contents/MacOS/meshlabserver
-
 cd ../install/macx
 # final step create the dmg using appdmg
 # appdmg is installed with 'npm install -g appdmg'",
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