rename install folder to scripts

.github/workflows/Linux.yml

@@ -14,23 +14,23 @@ jobs:
         submodules: true
     - name: Install dependencies
       run: |
-        sh install/linux/linux_setup_env_ubuntu.sh
+        sh scripts/linux/linux_setup_env_ubuntu.sh
     - name: Setup env variables
       id: envs
       run: |
         echo  ::set-output name=date::"$(cat ML_VERSION)"
     - name: Configure and Build
       run: |
-        sh install/linux/linux_build.sh
+        sh scripts/linux/linux_build.sh
     - name: Make bundle
       run: |
-        sh install/linux/linux_make_bundle.sh
+        sh scripts/linux/linux_make_bundle.sh
     - name: Deploy
       run: |
-        sh install/linux/linux_deploy.sh
+        sh scripts/linux/linux_deploy.sh
     - name: Build MeshLab AppImage
       run : |
-        sh install/linux/linux_appimage.sh
+        sh scripts/linux/linux_appimage.sh
     - name: Upload Meshlab Portable
       uses: actions/upload-artifact@v1
       with:
@@ -64,16 +64,16 @@ jobs:
         echo  ::set-output name=date::"$(cat ML_VERSION)"
     - name: Build MeshLab
       run: |
-        sh install/linux/qmake/linux_build.sh
+        sh scripts/linux/qmake/linux_build.sh
     - name: Make MeshLab Bundle
       run: |
-        sh install/linux/qmake/linux_make_bundle.sh
+        sh scripts/linux/qmake/linux_make_bundle.sh
     - name: Deploy MeshLab and MeshLabServer
       run : |
-        sh install/linux/qmake/linux_deploy.sh
+        sh scripts/linux/qmake/linux_deploy.sh
     - name: Build MeshLab and MeshLabServer AppImages
       run : |
-        sh install/linux/qmake/linux_appimages.sh
+        sh scripts/linux/qmake/linux_appimages.sh
     - name: Upload Meshlab Portable
       uses: actions/upload-artifact@v1
       with:
@@ -89,4 +89,3 @@ jobs:
       with:
         name: meshlab_linux_appimage_qmake
         path: MeshLab${{steps.envs.outputs.date}}-linux.AppImage
-

.github/workflows/MacOS.yml

@@ -7,7 +7,7 @@ jobs:
   macos_build_cmake:
     name: Build MeshLab (MacOS - CMake)
     runs-on: macos-latest
-    
+
     steps:
     - uses: actions/checkout@v2
       with:
@@ -27,22 +27,22 @@ jobs:
         echo  ::set-output name=date::"$(cat ML_VERSION)"
     - name: Configure and Build
       run: |
-        sh install/macos/macos_build.sh
+        sh scripts/macos/macos_build.sh
     - name: Deploy
       run: |
-        sh install/macos/macos_deploy.sh
+        sh scripts/macos/macos_deploy.sh
     - name: Create DMG
       run: |
-         sh install/macos/macos_dmg.sh
+         sh scripts/macos/macos_dmg.sh
          mv src/install/MeshLab${{steps.envs.outputs.date}}.dmg src/install/MeshLab${{steps.envs.outputs.date}}-macos_cmake.dmg
     - name: Upload DMG
       uses: actions/upload-artifact@v1
       with:
         name: meshlab_macos_dmg_cmake
         path: src/install/MeshLab${{steps.envs.outputs.date}}-macos_cmake.dmg
-    
-    
-    
+
+
+
   macos_build_qmake:
     name: Build MeshLab (MacOS - QMake)
     runs-on: macos-latest
@@ -66,13 +66,13 @@ jobs:
         echo  ::set-output name=date::"$(cat ML_VERSION)"
     - name: Build MeshLab
       run: |
-        sh install/macos/qmake/macos_build.sh
+        sh scripts/macos/qmake/macos_build.sh
     - name: Deploy MeshLab
       run: |
-        sh install/macos/qmake/macos_deploy.sh
+        sh scripts/macos/qmake/macos_deploy.sh
     - name: Create DMG
       run: |
-         sh install/macos/qmake/macos_dmg.sh
+         sh scripts/macos/qmake/macos_dmg.sh
          mv distrib/MeshLab${{steps.envs.outputs.date}}.dmg distrib/MeshLab${{steps.envs.outputs.date}}-macos_qmake.dmg
     - name: Upload DMG
       uses: actions/upload-artifact@v1

.github/workflows/Windows.yml

@@ -30,22 +30,22 @@ jobs:
     - name: Configure and Build
       shell: bash
       run: |
-        sh install/windows/windows_build.sh
+        sh scripts/windows/windows_build.sh
     - name: Deploy
       shell: bash
       run: |
-        sh install/windows/windows_deploy.sh
+        sh scripts/windows/windows_deploy.sh
     - name: NSIS script
       shell: bash
       run: |
-        sh install/windows/resources/windows_nsis_script.sh
+        sh scripts/windows/resources/windows_nsis_script.sh
     - name: Create Installer
       uses: joncloud/makensis-action@v1
       with:
-        script-file: "install/windows/resources/meshlab_final.nsi"
+        script-file: "scripts/windows/resources/meshlab_final.nsi"
     - name: Rename Installer
       run: |
-        Rename-Item -Path install\windows\resources\MeshLab${{steps.envs.outputs.date}}.exe -NewName MeshLab${{steps.envs.outputs.date}}-windows_cmake.exe
+        Rename-Item -Path scripts\windows\resources\MeshLab${{steps.envs.outputs.date}}.exe -NewName MeshLab${{steps.envs.outputs.date}}-windows_cmake.exe
     - name: Uploading MeshLab Portable
       uses: actions/upload-artifact@v1
       with:
@@ -55,8 +55,8 @@ jobs:
       uses: actions/upload-artifact@v1
       with:
         name: meshlab_windows_installer_cmake
-        path: install/windows/resources/MeshLab${{steps.envs.outputs.date}}-windows_cmake.exe
- 
+        path: scripts/windows/resources/MeshLab${{steps.envs.outputs.date}}-windows_cmake.exe
+
   windows_build_qmake:
     name: Build MeshLab (Windows - QMake)
     runs-on: windows-latest
@@ -85,20 +85,20 @@ jobs:
         modules: xmlpatterns
     - name: Build MeshLab
       run: |
-        .\install\windows\qmake\windows_build.ps1
+        .\scripts\windows\qmake\windows_build.ps1
     - name: Deploy MeshLab
       run: |
-        .\install\windows\qmake\windows_deploy.ps1
+        .\scripts\windows\qmake\windows_deploy.ps1
     - name: NSIS script
       run: |
-        .\install\windows\resources\windows_nsis_script.ps1
+        .\scripts\windows\resources\windows_nsis_script.ps1
     - name: Create Installer
       uses: joncloud/makensis-action@v1
       with:
-        script-file: "install/windows/resources/meshlab_final.nsi"
+        script-file: "scripts/windows/resources/meshlab_final.nsi"
     - name: Rename Installer
       run: |
-        Rename-Item -Path install\windows\resources\MeshLab${{steps.envs.outputs.date}}.exe -NewName MeshLab${{steps.envs.outputs.date}}-windows_qmake.exe
+        Rename-Item -Path scripts\windows\resources\MeshLab${{steps.envs.outputs.date}}.exe -NewName MeshLab${{steps.envs.outputs.date}}-windows_qmake.exe
     - name: Upload Meshlab Portable
       uses: actions/upload-artifact@v1
       with:
@@ -108,4 +108,4 @@ jobs:
       uses: actions/upload-artifact@v1
       with:
         name: meshlab_windows_installer_qmake
-        path: install/windows/resources/MeshLab${{steps.envs.outputs.date}}-windows_qmake.exe
+        path: scripts/windows/resources/MeshLab${{steps.envs.outputs.date}}-windows_qmake.exe

README.md

@@ -32,7 +32,7 @@ The MeshLab repository is organized as follows:
 
 * `distrib`: this folder contains a set of prebuilt libraries, shaders and plugins that will be used by MeshLab once it is compiled. Binaries and plugins will be placed in this folder after MeshLab is built, or a copy of this folder will be placed in the chosen shadow build directory. For more details, check the readme [here](https://github.com/cnr-isti-vclab/meshlab/tree/master/distrib/README.md);
 * `docs`: doxygen scripts for generating MeshLab documentation. For more details, check the readme [here](https://github.com/cnr-isti-vclab/meshlab/tree/master/docs);
-* `install`: in this folder there are a set of platform-dependent script to build and deploy MeshLab. For more details, check the readme [here](https://github.com/cnr-isti-vclab/meshlab/tree/master/install/README.md);
+* `scripts`: in this folder there is a set of platform-dependent scripts to build and deploy MeshLab. For more details, check the readme [here](https://github.com/cnr-isti-vclab/meshlab/tree/master/scripts/README.md);
 * `sample`: a set of files (meshes, images) used for tests;
 * `src`: this folder contains all the source code of MeshLab, its plugins and the external libraries that it requires. For more details, check the readme [here](https://github.com/cnr-isti-vclab/meshlab/blob/master/src/README.md); 
 * `vcglib`: submodule of [VCGLib](https://github.com/cnr-isti-vclab/vcglib).

install/windows/resources/windows_nsis_script.sh

@@ -9,9 +9,6 @@
 # After running this script, a meshlab_final.script can be found in the resources folder.
 # This script is ready to be run by makensis.exe
 
-#saving location where script has been run
-DIR=$PWD
-
 SCRIPTS_PATH="$(dirname "$(realpath "$0")")"/..
 SOURCE_PATH=$SCRIPTS_PATH/../../src
 
@@ -23,8 +20,6 @@ else
     BUNDLE_PATH=$(realpath $1)
 fi
 
-cd $BUNDLE_PATH
-
 #if(! (Test-Path meshlab.exe)){ #meshlab.exe not found inside $DISTRIB_PATH
 #    cd $DIR
 #	throw 'meshlab.exe not found in ' + ($BUNDLE_PATH) + '. Exiting.'
@@ -32,10 +27,5 @@ cd $BUNDLE_PATH
 
 VERSION=$(cat $SOURCE_PATH/../ML_VERSION)
 
-cd $SCRIPTS_PATH
-
-sed "s%MESHLAB_VERSION%$VERSION%g" resources/meshlab.nsi > resources/meshlab_final.nsi
-sed -i '' "s%DISTRIB_PATH%$BUNDLE_PATH%g" resources/meshlab_final.nsi
-
-#going back to original location
-cd $DIR
+sed "s%MESHLAB_VERSION%$VERSION%g" $SCRIPTS_PATH/resources/meshlab.nsi > $SCRIPTS_PATH/resources/meshlab_final.nsi
+sed -i '' "s%DISTRIB_PATH%$BUNDLE_PATH%g" $SCRIPTS_PATH/resources/meshlab_final.nsi

scripts/README.md

@@ -1,4 +1,4 @@
-# install folder
+#scripts folder
 
 **Work in Progress**
 

scripts/windows/resources/windows_nsis_script.sh

@@ -0,0 +1,41 @@
+# This is a powershell script for computing the meshlab_final.nsi script.
+# Requires:
+# - a properly deployed meshlab (see windows_deploy.ps1);
+#
+# Without given arguments, the folder that will be deployed is meshlab/distrib.
+#
+# You can give as argument the DISTRIB_PATH.
+#
+# After running this script, a meshlab_final.script can be found in the resources folder.
+# This script is ready to be run by makensis.exe
+
+#saving location where script has been run
+DIR=$PWD
+
+SCRIPTS_PATH="$(dirname "$(realpath "$0")")"/..
+SOURCE_PATH=$SCRIPTS_PATH/../../src
+
+#checking for parameters
+if [ "$#" -eq 0 ]
+then
+    BUNDLE_PATH=$SOURCE_PATH/install
+else
+    BUNDLE_PATH=$(realpath $1)
+fi
+
+cd $BUNDLE_PATH
+
+#if(! (Test-Path meshlab.exe)){ #meshlab.exe not found inside $DISTRIB_PATH
+#    cd $DIR
+#	throw 'meshlab.exe not found in ' + ($BUNDLE_PATH) + '. Exiting.'
+#}
+
+VERSION=$(cat $SOURCE_PATH/../ML_VERSION)
+
+cd $SCRIPTS_PATH
+
+sed "s%MESHLAB_VERSION%$VERSION%g" resources/meshlab.nsi > resources/meshlab_final.nsi
+sed -i '' "s%DISTRIB_PATH%$BUNDLE_PATH%g" resources/meshlab_final.nsi
+
+#going back to original location
+cd $DIR