diff --git a/.gitignore b/.gitignore index 797c67d1e..49265bccd 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,8 @@ Software/dmg/contents build-vars.prf debug/ release/ -Software/dist_windows/content +Software/dist_windows/content/* +!Software/dist_windows/content/UpdateElevate.exe Software/lib Software/.vs *.vcxproj diff --git a/Software/UpdateElevate b/Software/UpdateElevate index 4daa88378..70c80e67e 160000 --- a/Software/UpdateElevate +++ b/Software/UpdateElevate @@ -1 +1 @@ -Subproject commit 4daa88378fc9f55697326e632786f80d78a6e1c2 +Subproject commit 70c80e67e3397e8b80c6fb896d21ca25530191df diff --git a/Software/dist_windows/content/UpdateElevate.exe b/Software/dist_windows/content/UpdateElevate.exe new file mode 100644 index 000000000..fd9e11580 Binary files /dev/null and b/Software/dist_windows/content/UpdateElevate.exe differ diff --git a/Software/scripts/win32/prepare_installer.sh b/Software/scripts/win32/prepare_installer.sh index 0dc308708..e2d0fe12c 100644 --- a/Software/scripts/win32/prepare_installer.sh +++ b/Software/scripts/win32/prepare_installer.sh @@ -3,11 +3,15 @@ set -e # build UpdateElevate -echo "#define NAME L\"Prismatik\"" > UpdateElevate/UpdateElevate/command.h -echo "#define EXT L\".exe\"" >> UpdateElevate/UpdateElevate/command.h -echo "#define ARGS L\" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART\"" >> UpdateElevate/UpdateElevate/command.h -cmd //c scripts\\win32\\build_UpdateElevate.bat -cp UpdateElevate/x64/Release/UpdateElevate.exe dist_windows/content/ +if [ -f dist_windows/content/UpdateElevate.exe ]; then + echo "Using existing (frozen) UpdateElevate"; +else + echo "#define NAME L\"Prismatik\"" > UpdateElevate/UpdateElevate/command.h + echo "#define EXT L\".exe\"" >> UpdateElevate/UpdateElevate/command.h + echo "#define ARGS L\" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART\"" >> UpdateElevate/UpdateElevate/command.h + cmd //c scripts\\win32\\build_UpdateElevate.bat + cp UpdateElevate/x64/Release/UpdateElevate.exe dist_windows/content/ +fi