From b75b0ff3d52d8218d46ed537ec07e5a42ff529bd Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 30 Aug 2023 07:37:53 -0400 Subject: [PATCH] sync naming of resulting archives with macOS --- cmake/packaging/build_linux_tgz.sh | 4 ++-- cmake/packaging/build_windows_vs.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/packaging/build_linux_tgz.sh b/cmake/packaging/build_linux_tgz.sh index e0222858ce..48e3017f61 100755 --- a/cmake/packaging/build_linux_tgz.sh +++ b/cmake/packaging/build_linux_tgz.sh @@ -4,7 +4,7 @@ APP_NAME=lammps-gui DESTDIR=${PWD}/../LAMMPS_GUI echo "Delete old files, if they exist" -rm -rf ${DESTDIR} ../LAMMPS-Linux-amd64.tar.gz +rm -rf ${DESTDIR} ../LAMMPS_GUI-Linux-amd64.tar.gz echo "Create staging area for deployment and populate" DESTDIR=${DESTDIR} cmake --install . --prefix "/" @@ -69,7 +69,7 @@ do \ done pushd .. -tar -czvvf LAMMPS-Linux-amd64.tar.gz LAMMPS_GUI +tar -czvvf LAMMPS_GUI-Linux-amd64.tar.gz LAMMPS_GUI popd echo "Cleanup dir" diff --git a/cmake/packaging/build_windows_vs.cmake b/cmake/packaging/build_windows_vs.cmake index f051ff351f..bd55f3f442 100644 --- a/cmake/packaging/build_windows_vs.cmake +++ b/cmake/packaging/build_windows_vs.cmake @@ -1,7 +1,7 @@ # CMake script to be run post installation to build zipped package # clean up old zipfile and deployment tree -file(REMOVE LAMMPS-Win10-amd64.zip) +file(REMOVE LAMMPS_GUI-Win10-amd64.zip) file(REMOVE_RECURSE LAMMPS_GUI) file(RENAME ${INSTNAME} LAMMPS_GUI) @@ -22,7 +22,7 @@ execute_process(COMMAND cmd.exe /c qtdeploy.bat COMMAND_ECHO STDERR) file(REMOVE qtdeploy.bat) # create zip archive -file(WRITE makearchive.ps1 "Compress-Archive -Path LAMMPS_GUI -CompressionLevel Optimal -DestinationPath LAMMPS-Win10-amd64.zip") +file(WRITE makearchive.ps1 "Compress-Archive -Path LAMMPS_GUI -CompressionLevel Optimal -DestinationPath LAMMPS_GUI-Win10-amd64.zip") execute_process(COMMAND powershell -ExecutionPolicy Bypass -File makearchive.ps1) file(REMOVE makearchive.ps1) file(REMOVE_RECURSE LAMMPS_GUI)