From 88c1feaf3084de0b3a3ef968ae71328115e19b52 Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Tue, 19 Apr 2016 14:27:21 +0200 Subject: [PATCH] Fixed release script on Windows following its relocation --- release_scripts/windows/release.win7.vc9.bat | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/release_scripts/windows/release.win7.vc9.bat b/release_scripts/windows/release.win7.vc9.bat index 0052307f..2f2c1efd 100644 --- a/release_scripts/windows/release.win7.vc9.bat +++ b/release_scripts/windows/release.win7.vc9.bat @@ -14,6 +14,8 @@ REM You should have received a copy of the GNU General Public License REM along with this program. If not, see . REM --------------------------------------------------------------------- +set SCRIPT_PATH=%~dp0 +set PROJECT_ROOT=%SCRIPT_PATH%\..\.. set APPLICATION_NAME=OpenBoard set QT_DIR=C:\Qt\5.5\msvc2010 @@ -25,7 +27,7 @@ set GIT_BIN=%PROGRAMS_FILE_PATH%\Git\bin set VS_BIN=%PROGRAMS_FILE_PATH%\Microsoft Visual Studio 10.0\VC\bin set WIN_SDK_BIN=%PROGRAMS_FILE_PATH%\Microsoft SDKs\Windows\v6.0A\Bin set INNO_EXE=%PROGRAMS_FILE_PATH%\Inno Setup 5\iscc.exe -set BUILD_DIR=build\win32\release +set BUILD_DIR=%PROJECT_ROOT%\build\win32\release set LRELEASE=%QT_DIR%\bin\lrelease set BASE_QT_TRANSLATIONS_DIRECTORY=%QT_DIR%\translations @@ -35,11 +37,14 @@ call "%VS_BIN%\vcvars32.bat" echo %PATH% +cd %PROJECT_ROOT% + REM Third party impoter application set IMPORTER_NAME=OpenBoardImporter set IMPORTER_PATH="..\OpenBoard-Importer" IF NOT EXIST "%IMPORTER_PATH%" GOTO EXIT_WITH_ERROR + set HOME_DIR="%cd%" cd %IMPORTER_PATH% IF EXIST "release" (del "release\*.*" /Q) @@ -96,7 +101,7 @@ del build\win32\release\product\i18n\qt_help* del "build\win32\release\product\%APPLICATION_NAME%.pdb" -call "%INNO_EXE%" "%APPLICATION_NAME%.iss" /F"%APPLICATION_NAME%_Installer_%VERSION%" +call "%INNO_EXE%" "%SCRIPT_PATH%\%APPLICATION_NAME%.iss" /F"%APPLICATION_NAME%_Installer_%VERSION%" GOTO END