From 6c8e9e8524a4a7322d444a5f10dabbb64cc1f17a Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 12 Apr 2010 18:19:33 +0000 Subject: [PATCH] fix for deployment --- mac/deploy_mac.sh | 5 ++++- windows/deploy_windows.bat | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mac/deploy_mac.sh b/mac/deploy_mac.sh index 6d55664d..6bbba513 100755 --- a/mac/deploy_mac.sh +++ b/mac/deploy_mac.sh @@ -3,7 +3,7 @@ cd .. # TODO add tag to CVS with current version number -# cvs -n update 2>null | grep -i "M " # error if any file is locally modified!!! -> TODO +# cvs -n update 2>null | grep -i "M " # error if any file is locally modified!!! -> TODO # first clean up @@ -19,6 +19,9 @@ macdeployqt llcon.app -dmg # create zip file including COPYING file zip llcon-version-mac.zip llcon.dmg COPYING +# move new file in deploy directory +mv llcon-version-mac.zip deploy/llcon-version-mac.zip + # cleanup and go back to original directory rm llcon.dmg cd mac diff --git a/windows/deploy_windows.bat b/windows/deploy_windows.bat index 67d81044..e85b3923 100755 --- a/windows/deploy_windows.bat +++ b/windows/deploy_windows.bat @@ -12,6 +12,8 @@ devenv llcon.sln /build "Release|Win32" rem create installer ----------------------------------------------------------- %NSIS_PATH%\makensis.exe installer.nsi +move llconinstaller.exe ../deploy/llcon-version-installer.exe + goto endofskript :vsenvproblem