From e5e6213bff06d7767230fd24bef90a0a633f9f4c Mon Sep 17 00:00:00 2001
From: Jeremy Hu <huxingyi@msn.com>
Date: Wed, 15 Jan 2020 08:26:19 +0930
Subject: [PATCH] Remove x64 and x86_64 from the release file name

---
 .travis.yml  |  4 ++--
 appveyor.yml | 42 +++++++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e6008a92..d1617ddb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -131,10 +131,10 @@ script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./ci/linuxdeployqt.AppImage --appimage-extract || travis_terminate 1; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH=$(readlink -f ./squashfs-root/usr/bin):$PATH || travis_terminate 1; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then rm -v "./appdir/usr/lib/libxcb-dri2.so"* "./appdir/usr/lib/libxcb-dri3.so"*; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./squashfs-root/usr/bin/appimagetool -g ./appdir/ dust3d-$TAG-x86_64.AppImage || travis_terminate 1; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./squashfs-root/usr/bin/appimagetool -g ./appdir/ dust3d-$TAG.AppImage || travis_terminate 1; fi
 
   # Distribute
   - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then echo "No distribution on pull request"; fi
   - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then travis_terminate 0; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sh ci/upload-github-release-asset.sh github_api_token=${my_auth_token} branch=$BRANCH owner=huxingyi repo=dust3d tag=$TAG filename=dust3d-$TAG.dmg; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash ci/upload-github-release-asset.sh github_api_token=${my_auth_token} branch=$BRANCH owner=huxingyi repo=dust3d tag=$TAG filename=dust3d-$TAG-x86_64.AppImage; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash ci/upload-github-release-asset.sh github_api_token=${my_auth_token} branch=$BRANCH owner=huxingyi repo=dust3d tag=$TAG filename=dust3d-$TAG.AppImage; fi
diff --git a/appveyor.yml b/appveyor.yml
index e7fe6812..33a1c591 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -41,34 +41,34 @@ after_test:
   - if "%TAG%" == ""
     set TAG=unstable
   - if "%TAG%" == "unstable"
-    7z a dust3d-%TAG%-%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\release\dust3d.pdb
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\release\dust3d.exe
+    7z a dust3d-%TAG%.zip %APPVEYOR_BUILD_FOLDER%\release\dust3d.pdb
+  - 7z a dust3d-%TAG%.zip %APPVEYOR_BUILD_FOLDER%\release\dust3d.exe
   - if "%TAG%" == "unstable"
-    7z a dust3d-%TAG%-%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\instant-meshes\build\RelWithDebInfo\instant-meshes.pdb
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\instant-meshes\build\RelWithDebInfo\instant-meshes.dll
+    7z a dust3d-%TAG%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\instant-meshes\build\RelWithDebInfo\instant-meshes.pdb
+  - 7z a dust3d-%TAG%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\instant-meshes\build\RelWithDebInfo\instant-meshes.dll
   - if "%TAG%" == "unstable"
-    7z a dust3d-%TAG%-%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\instant-meshes\build\ext_build\tbb\RelWithDebInfo\tbb.pdb
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\instant-meshes\build\ext_build\tbb\RelWithDebInfo\tbb.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\cgal\CGAL-4.13\build\bin\Release\CGAL-vc140-mt-4.13.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\cgal\CGAL-4.13\auxiliary\gmp\lib\libgmp-10.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\cgal\CGAL-4.13\auxiliary\gmp\lib\libmpfr-4.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip C:\OpenSSL-v111-Win64\bin\libcrypto-1_1-x64.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip C:\OpenSSL-v111-Win64\bin\libssl-1_1-x64.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip %QTDIR%\bin\Qt5Widgets.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip %QTDIR%\bin\Qt5Gui.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip %QTDIR%\bin\Qt5Core.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip %QTDIR%\bin\Qt5Network.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip %QTDIR%\bin\opengl32sw.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip "%VCREDIST_CRT_DIR%\msvcp140.dll"
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip "%VCREDIST_CRT_DIR%\vcruntime140.dll"
+    7z a dust3d-%TAG%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\instant-meshes\build\ext_build\tbb\RelWithDebInfo\tbb.pdb
+  - 7z a dust3d-%TAG%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\instant-meshes\build\ext_build\tbb\RelWithDebInfo\tbb.dll
+  - 7z a dust3d-%TAG%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\cgal\CGAL-4.13\build\bin\Release\CGAL-vc140-mt-4.13.dll
+  - 7z a dust3d-%TAG%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\cgal\CGAL-4.13\auxiliary\gmp\lib\libgmp-10.dll
+  - 7z a dust3d-%TAG%.zip %APPVEYOR_BUILD_FOLDER%\thirdparty\cgal\CGAL-4.13\auxiliary\gmp\lib\libmpfr-4.dll
+  - 7z a dust3d-%TAG%.zip C:\OpenSSL-v111-Win64\bin\libcrypto-1_1-x64.dll
+  - 7z a dust3d-%TAG%.zip C:\OpenSSL-v111-Win64\bin\libssl-1_1-x64.dll
+  - 7z a dust3d-%TAG%.zip %QTDIR%\bin\Qt5Widgets.dll
+  - 7z a dust3d-%TAG%.zip %QTDIR%\bin\Qt5Gui.dll
+  - 7z a dust3d-%TAG%.zip %QTDIR%\bin\Qt5Core.dll
+  - 7z a dust3d-%TAG%.zip %QTDIR%\bin\Qt5Network.dll
+  - 7z a dust3d-%TAG%.zip %QTDIR%\bin\opengl32sw.dll
+  - 7z a dust3d-%TAG%.zip "%VCREDIST_CRT_DIR%\msvcp140.dll"
+  - 7z a dust3d-%TAG%.zip "%VCREDIST_CRT_DIR%\vcruntime140.dll"
   - mkdir platforms
   - copy %QTDIR%\plugins\platforms\qwindows.dll %APPVEYOR_BUILD_FOLDER%\platforms\qwindows.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip -r %APPVEYOR_BUILD_FOLDER%\platforms\
+  - 7z a dust3d-%TAG%.zip -r %APPVEYOR_BUILD_FOLDER%\platforms\
   - mkdir imageformats
   - copy %QTDIR%\plugins\imageformats\qjpeg.dll %APPVEYOR_BUILD_FOLDER%\imageformats\qjpeg.dll
-  - 7z a dust3d-%TAG%-%PLATFORM%.zip -r %APPVEYOR_BUILD_FOLDER%\imageformats\
+  - 7z a dust3d-%TAG%.zip -r %APPVEYOR_BUILD_FOLDER%\imageformats\
   - mkdir test
-  - 7z e dust3d-%TAG%-%PLATFORM%.zip -o%APPVEYOR_BUILD_FOLDER%\test *.* -r
+  - 7z e dust3d-%TAG%.zip -o%APPVEYOR_BUILD_FOLDER%\test *.* -r
   - cd /d %APPVEYOR_BUILD_FOLDER%\test
   - dust3d.exe :/resources/model-addax.ds3 -o addax.obj
   - dust3d.exe :/resources/model-addax.ds3 -o addax.fbx