nightly fixed up paths and msys2. added _ between compiler

Author: danoli3

scripts/ci/package_builds.sh

@@ -31,10 +31,12 @@ $ROOT/scripts/dev/create_package.sh linuxarmv6l $lastversion master
 $ROOT/scripts/dev/create_package.sh linuxaarch64 $lastversion master
 $ROOT/scripts/dev/create_package.sh osx $lastversion master
 $ROOT/scripts/dev/create_package.sh ios $lastversion master
-$ROOT/scripts/dev/create_package.sh macos $lastversion master
+# $ROOT/scripts/dev/create_package.sh macos $lastversion master
 $ROOT/scripts/dev/create_package.sh msys2 $lastversion master mingw64
+$ROOT/scripts/dev/create_package.sh msys2 $lastversion master clang64
+$ROOT/scripts/dev/create_package.sh msys2 $lastversion master ucrt64
 $ROOT/scripts/dev/create_package.sh vs $lastversion master
-$ROOT/scripts/dev/create_package.sh vs_min $lastversion master
+$ROOT/scripts/dev/create_package.sh vs $lastversion master 64
 
 ls -la
 cd $ROOT

scripts/dev/create_package.sh

@@ -76,13 +76,6 @@ echoDots(){
     done
 }
 
-if [ "$platform" = "vs_min" ]; then
-    platform="vs"
-    min_package=1
-    libs_abi=_x64
-else
-    min_package=0
-fi
 
 if [ "$platform" != "msys2" ] && [ "$platform" != "linux" ] && [ "$platform" != "linux64" ] && [ "$platform" != "linuxarmv6l" ] && [ "$platform" != "linuxaarch64" ] && [ "$platform" != "linuxarmv7l" ] && [ "$platform" != "vs" ] && [ "$platform" != "osx" ] && [ "$platform" != "android" ] && [ "$platform" != "ios" ] && [ "$platform" != "macos" ]; then
     echo usage:
@@ -360,10 +353,10 @@ function createPackage {
         scripts/msys2/download_libs.sh -a $libs_abi
         scripts/emscripten/download_libs.sh -n
     elif [ "$pkg_platform" = "vs" ]; then
-        if [ $min_package == 1 ]; then
-            scripts/vs/download_latest_libs.sh -a 64
-        else
+        if [ "$libs_abi" = "" ]; then
             scripts/vs/download_latest_libs.sh
+        else
+            scripts/vs/download_latest_libs.sh -a $libs_abi
         fi
         scripts/emscripten/download_libs.sh -n
     elif [ "$pkg_platform" = "android" ]; then
@@ -644,18 +637,23 @@ function createPackage {
 
     #create compressed package
    if [[ "$pkg_platform" =~ ^(linux|linux64|android|linuxarmv6l|linuxarmv7l|linuxaarch64|macos|ios|osx)$ ]]; then
+        if [ "$libs_abi" = "" ]; then
+            pkg_name=of_v${pkg_version}_${pkg_platform}_release
+        else
+            pkg_name=of_v${pkg_version}_${pkg_platform}_${libs_abi}_release
+        fi 
         echo "compressing package to of_v${pkg_version}_${pkg_platform}${libs_abi}_release.tar.gz"
         cd $pkg_ofroot/..
-        mkdir of_v${pkg_version}_${pkg_platform}${libs_abi}_release
-        mv ${pkgfolder}/* of_v${pkg_version}_${pkg_platform}${libs_abi}_release
-        mv ${pkgfolder}/.* of_v${pkg_version}_${pkg_platform}${libs_abi}_release 2>/dev/null || true  # add hidden files 
-        COPYFILE_DISABLE=true tar czf of_v${pkg_version}_${pkg_platform}${libs_abi}_release.tar.gz of_v${pkg_version}_${pkg_platform}${libs_abi}_release
-        rm -Rf of_v${pkg_version}_${pkg_platform}${libs_abi}_release
+        mkdir ${pkg_name}
+        mv ${pkgfolder}/* ${pkg_name}
+        mv ${pkgfolder}/.* ${pkg_name} 2>/dev/null || true # add hidden files 
+        COPYFILE_DISABLE=true tar czf ${pkg_name}.tar.gz ${pkg_name}
+        rm -Rf ${pkg_name}
     else
         if [ "$libs_abi" = "" ]; then
             pkg_name=of_v${pkg_version}_${pkg_platform}_release
         else
-            pkg_name=of_v${pkg_version}_${pkg_platform}${libs_abi}_release
+            pkg_name=of_v${pkg_version}_${pkg_platform}_${libs_abi}_release
         fi 
         echo "compressing package to ${pkg_name}.zip"
         cd $pkg_ofroot/..

scripts/dev/nightlybuilds.sh

@@ -77,9 +77,9 @@ rm -f /var/www/versions/nightly/of_v*_nightly.*
 mv *.tar.gz /var/www/versions/nightly
 mv *.zip /var/www/versions/nightly
 
-#mv /var/www/versions/nightly/of_v${lastversion}_linux64gcc4_release.tar.gz /var/www/versions/nightly/of_v${lastversion}_linux64gcc4_nightly.tar.gz
-#mv /var/www/versions/nightly/of_v${lastversion}_linux64gcc5_release.tar.gz /var/www/versions/nightly/of_v${lastversion}_linux64gcc5_nightly.tar.gz
-mv /var/www/versions/nightly/of_v${lastversion}_linux64gcc6_release.tar.gz /var/www/versions/nightly/of_v${lastversion}_linux64gcc6_nightly.tar.gz
+#mv /var/www/versions/nightly/of_v${lastversion}_linux64_gcc4_release.tar.gz /var/www/versions/nightly/of_v${lastversion}_linux64_gcc4_nightly.tar.gz
+#mv /var/www/versions/nightly/of_v${lastversion}_linux64_gcc5_release.tar.gz /var/www/versions/nightly/of_v${lastversion}_linux64_gcc5_nightly.tar.gz
+mv /var/www/versions/nightly/of_v${lastversion}_linux64_gcc6_release.tar.gz /var/www/versions/nightly/of_v${lastversion}_linux64_gcc6_nightly.tar.gz
 #mv /var/www/versions/nightly/of_v${lastversion}_msys2_mingw32_release.zip /var/www/versions/nightly/of_v${lastversion}_msys2_mingw32_nightly.zip
 mv /var/www/versions/nightly/of_v${lastversion}_msys2_mingw64_release.zip /var/www/versions/nightly/of_v${lastversion}_msys2_mingw64_nightly.zip
 mv /var/www/versions/nightly/of_v${lastversion}_msys2_clang64_release.zip /var/www/versions/nightly/of_v${lastversion}_msys2_clang64_nightly.zip