diff -r 5e30ef2e26cb -r ac96196b945c windowing/windowserver/test/scripts/wstest_config.cmd --- a/windowing/windowserver/test/scripts/wstest_config.cmd Fri Mar 12 15:50:05 2010 +0200 +++ b/windowing/windowserver/test/scripts/wstest_config.cmd Mon Mar 15 12:45:41 2010 +0200 @@ -2,7 +2,7 @@ rem Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). rem All rights reserved. rem This component and the accompanying materials are made available -rem under the terms of "Eclipse Public License v1.0" +rem under the terms of the License "Eclipse Public License v1.0" rem which accompanies this distribution, and is available rem at the URL "http://www.eclipse.org/legal/epl-v10.html". rem @@ -17,12 +17,11 @@ rem set nonnga=false if not defined EPOC_INI set EPOC_INI=\epoc32\data\epoc.ini -if /i "%1"=="uninstall" goto :uninstall -if /i "%2"=="changetracking" goto :install_changetracking if /i "%2"=="nonnga" set nonnga=true if /i "%3"=="nonnga" set nonnga=true if "%nonnga%"=="true" echo Configuring for Non-NGA - +if /i "%1"=="uninstall" goto :uninstall +if /i "%2"=="changetracking" goto :install_changetracking rem ================ install ================ :install @@ -34,36 +33,22 @@ call :doinstall %EMULATOR_DATA_DIR% multiscreen %2 %3 ) -rem Restore EPOC.INI from backup -if exist %EPOC_INI%.backup xcopy /r /y %EPOC_INI%.backup %EPOC_INI% >nul +echo If EPOC.INI isn't already backuped then backup EPOC.INI to EPOC.INI.bak +if not exist %EPOC_INI%.bak copy /y %EPOC_INI% %EPOC_INI%.bak -echo Backing up EPOC.INI. -if not exist %EPOC_INI%.backup copy %EPOC_INI% %EPOC_INI%.backup >nul - -echo -------------------------------------------------------------- -echo original epoc.ini: %EPOC_INI% -type %EPOC_INI% -echo -------------------------------------------------------------- echo Editing EPOC.INI to use multiscreen. echo. >> %EPOC_INI% echo StartupMode ^7>> %EPOC_INI% echo _NewScreen_ >> %EPOC_INI% echo ScreenWidth 640 >> %EPOC_INI% echo ScreenHeight 240 >> %EPOC_INI% - -echo -------------------------------------------------------------- -echo new epoc.ini: %EPOC_INI% -type %EPOC_INI% -echo -------------------------------------------------------------- - goto :EOF - :doinstall -rem Back up WSINI.INI -if not exist %1\z\system\data\wsini.bak if exist %1\z\system\data\wsini.ini copy %1\z\system\data\wsini.ini %1\z\system\data\wsini.bak >nul -if not exist %1\z\resource\data\wsini.bak if exist %1\z\resource\data\wsini.ini copy %1\z\resource\data\wsini.ini %1\z\resource\data\wsini.bak >nul +rem If WSINI.INI(s) aren't already backuped then backup WSINI.INI(s) +if not exist %1\z\system\data\wsini.bak if exist %1\z\system\data\wsini.ini copy /y %1\z\system\data\wsini.ini %1\z\system\data\wsini.bak >nul +if not exist %1\z\resource\data\wsini.bak if exist %1\z\resource\data\wsini.ini copy /y %1\z\resource\data\wsini.ini %1\z\resource\data\wsini.bak >nul rem Back up ECONS.DLL if exist %1\econs.dll copy /y %1\econs.dll %1\econs-temp.dll @@ -73,24 +58,21 @@ rem Replace WSINI.INI with test version if "%nonnga%"=="true" goto :doinstall_nonnga -if exist %1\z\system\data\wsini.ini xcopy /r /y %1\z\wstest\wservu_multiscreen.ini %1\z\system\data\wsini.ini >nul -if exist %1\z\resource\data\wsini.ini xcopy /r /y %1\z\wstest\wservu_multiscreen.ini %1\z\resource\data\wsini.ini >nul +if exist %1\z\system\data\wsini.ini copy /y %1\z\wstest\wservu_multiscreen.ini %1\z\system\data\wsini.ini +if exist %1\z\resource\data\wsini.ini copy /y %1\z\wstest\wservu_multiscreen.ini %1\z\resource\data\wsini.ini goto :doinstall_editwsini :doinstall_nonnga -if exist %1\z\system\data\wsini.ini xcopy /r /y \graphics\wserv\group\wservu_multiscreen-nonnga.ini %1\z\system\data\wsini.ini >nul -if exist %1\z\resource\data\wsini.ini xcopy /r /y \graphics\wserv\group\wservu_multiscreen-nonnga.ini %1\z\resource\data\wsini.ini >nul +if exist %1\z\system\data\wsini.ini copy /y %1\z\wstest\wservu_multiscreen-nonnga.ini %1\z\system\data\wsini.ini +if exist %1\z\resource\data\wsini.ini copy /y %1\z\wstest\wservu_multiscreen-nonnga.ini %1\z\resource\data\wsini.ini :doinstall_editwsini rem Edit WSINI.INI to run tests automatically/multiscreen -if exist %1\z\system\data\wsini.ini perl %1\z\wstest\wsini-writer.pl %1\z\system\data\wsini.ini %2 %3 %4 +if exist %1\z\system\data\wsini.ini perl %1\z\wstest\wsini-writer.pl %1\z\system\data\wsini.ini %2 %3 %4 if exist %1\z\resource\data\wsini.ini perl %1\z\wstest\wsini-writer.pl %1\z\resource\data\wsini.ini %2 %3 %4 goto :EOF - - - rem ================ install changetracking ================ :install_changetracking @@ -102,16 +84,8 @@ call :doinstall_changetracking %EMULATOR_DATA_DIR% multiscreen %2 %3 ) -rem Restore EPOC.INI from backup -if exist %EPOC_INI%.backup xcopy /r /y %EPOC_INI%.backup %EPOC_INI% >nul - -echo Backing up EPOC.INI. -if not exist %EPOC_INI%.backup copy %EPOC_INI% %EPOC_INI%.backup >nul - -echo -------------------------------------------------------------- -echo original epoc.ini: %EPOC_INI% -type %EPOC_INI% -echo -------------------------------------------------------------- +echo If EPOC.INI isn't already backuped then backup EPOC.INI to EPOC.INI.bak +if not exist %EPOC_INI%.bak copy /y %EPOC_INI% %EPOC_INI%.bak >nul echo Editing EPOC.INI to use multiscreen. echo. >> %EPOC_INI% @@ -119,11 +93,6 @@ echo _NewScreen_ >> %EPOC_INI% echo ScreenWidth 640 >> %EPOC_INI% echo ScreenHeight 240 >> %EPOC_INI% -echo -------------------------------------------------------------- -echo new epoc.ini: %EPOC_INI% -type %EPOC_INI% -echo -------------------------------------------------------------- - goto :EOF :doinstall_changetracking @@ -135,12 +104,12 @@ if exist %1\wsecons.dll copy /y %1\wsecons.dll %1\econs.dll rem Back up WSINI.INI -if not exist %1\z\system\data\wsini.bak if exist %1\z\system\data\wsini.ini copy %1\z\system\data\wsini.ini %1\z\system\data\wsini.bak >nul -if not exist %1\z\resource\data\wsini.bak if exist %1\z\resource\data\wsini.ini copy %1\z\resource\data\wsini.ini %1\z\resource\data\wsini.bak >nul +if not exist %1\z\system\data\wsini.bak if exist %1\z\system\data\wsini.ini copy /y %1\z\system\data\wsini.ini %1\z\system\data\wsini.bak >nul +if not exist %1\z\resource\data\wsini.bak if exist %1\z\resource\data\wsini.ini copy /y %1\z\resource\data\wsini.ini %1\z\resource\data\wsini.bak >nul rem Replace WSINI.INI with test changetracking version -if exist %1\z\system\data\wsini.ini xcopy /r /y %1\z\wstest\wservu_multiscreen_changetracking.ini %1\z\system\data\wsini.ini >nul -if exist %1\z\resource\data\wsini.ini xcopy /r /y %1\z\wstest\wservu_multiscreen_changetracking.ini %1\z\resource\data\wsini.ini >nul +if exist %1\z\system\data\wsini.ini copy /y %1\z\wstest\wservu_multiscreen_changetracking.ini %1\z\system\data\wsini.ini >nul +if exist %1\z\resource\data\wsini.ini copy /y %1\z\wstest\wservu_multiscreen_changetracking.ini %1\z\resource\data\wsini.ini >nul rem Edit WSINI.INI to run tests automatically/multiscreen if exist %1\z\system\data\wsini.ini perl %1\z\wstest\wsini-writer.pl %1\z\system\data\wsini.ini %2 %3 %4 @@ -159,15 +128,27 @@ call :douninstall %EMULATOR_DATA_DIR% ) -echo Restoring EPOC.INI. -if exist %EPOC_INI%.backup xcopy /r /y %EPOC_INI%.backup %EPOC_INI% >nul +echo If EPOC.INI was already backuped then restore EPOC.INI from EPOC.INI.bak +if exist %EPOC_INI%.bak ( + echo Restore EPOC.INI from backup + copy /y %EPOC_INI%.bak %EPOC_INI% >nul + del /f /q %EPOC_INI%.bak >nul +) goto :EOF :douninstall -rem Restore WSINI.INI -if exist %1\z\system\data\wsini.bak xcopy /r /y %1\z\system\data\wsini.bak %1\z\system\data\wsini.ini >nul -if exist %1\z\resource\data\wsini.bak xcopy /r /y %1\z\resource\data\wsini.bak %1\z\resource\data\wsini.ini >nul + +rem If WSINI.INI(s) were already backuped then restore WSINI.INI +if exist %1\z\system\data\wsini.bak ( +copy /y %1\z\system\data\wsini.bak %1\z\system\data\wsini.ini >nul +del /f /q %1\z\system\data\wsini.bak >nul +) +if exist %1\z\resource\data\wsini.bak ( +copy /y %1\z\resource\data\wsini.bak %1\z\resource\data\wsini.ini >nul +del /f /q %1\z\resource\data\wsini.bak >nul +) + echo Restoring backedup ECONS.DLL if exist %1\econs-temp.dll copy /y %1\econs-temp.dll %1\econs.dll goto :EOF