From 8a02cf47320a9c2e8b6601ed61ee4d8264f4de09 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Thu, 28 Apr 2011 05:04:06 -0400 Subject: DISTS: Copy/use README-SDL to/from the build folder (it is copied from out of tree) --- devtools/create_project/scripts/postbuild.cmd | 17 +++++++++-------- dists/nsis/scummvm.nsi | 2 +- dists/nsis/scummvm.nsi.in | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd index aacf7255d0..a9ffecabcf 100644 --- a/devtools/create_project/scripts/postbuild.cmd +++ b/devtools/create_project/scripts/postbuild.cmd @@ -5,7 +5,7 @@ REM -- Post-Build Script REM --------------------------------------------------------------- REM REM Copy engine data, themes, translation and required dlls to the -REM output folder and optionnaly create an installer +REM output folder and optionally create an installer REM REM Expected parameters REM Root folder @@ -23,13 +23,13 @@ if "%~5"=="" goto error_installer echo Copying data files echo. -xcopy /F /Y "%~1/AUTHORS" %~2 > NUL 2>&1 -xcopy /F /Y "%~1/COPYING.GPL" %~2 > NUL 2>&1 -xcopy /F /Y "%~1/COPYING" %~2 > NUL 2>&1 -xcopy /F /Y "%~1/COPYING.LGPL" %~2 > NUL 2>&1 -xcopy /F /Y "%~1/COPYRIGHT" %~2 > NUL 2>&1 -xcopy /F /Y "%~1/NEWS" %~2 > NUL 2>&1 -xcopy /F /Y "%~1/README" %~2 > NUL 2>&1 +xcopy /F /Y "%~1/AUTHORS" %~2 > NUL 2>&1 +xcopy /F /Y "%~1/COPYING.GPL" %~2 > NUL 2>&1 +xcopy /F /Y "%~1/COPYING" %~2 > NUL 2>&1 +xcopy /F /Y "%~1/COPYING.LGPL" %~2 > NUL 2>&1 +xcopy /F /Y "%~1/COPYRIGHT" %~2 > NUL 2>&1 +xcopy /F /Y "%~1/NEWS" %~2 > NUL 2>&1 +xcopy /F /Y "%~1/README" %~2 > NUL 2>&1 xcopy /F /Y "%~1/dists/engine-data/*.dat" %~2 > NUL 2>&1 xcopy /F /Y "%~1/dists/engine-data/*.tbl" %~2 > NUL 2>&1 @@ -37,6 +37,7 @@ xcopy /F /Y "%~1/dists/engine-data/*.cpt" %~2 > NUL 2>&1 xcopy /F /Y "%~1/gui/themes/*.zip" %~2 > NUL 2>&1 xcopy /F /Y "%~1/gui/themes/translations.dat" %~2 > NUL 2>&1 xcopy /F /Y "%~4/lib/%~3/SDL.dll" %~2 > NUL 2>&1 +xcopy /F /Y "%~4/README-SDL" %~2 > NUL 2>&1 if "%~5"=="0" goto done diff --git a/dists/nsis/scummvm.nsi b/dists/nsis/scummvm.nsi index 5af535364a..a83cd251e0 100644 --- a/dists/nsis/scummvm.nsi +++ b/dists/nsis/scummvm.nsi @@ -205,7 +205,7 @@ Section "ScummVM" SecMain File /oname=COPYRIGHT.txt "${text_dir}\COPYRIGHT" File /oname=NEWS.txt "${text_dir}\NEWS" File /oname=README.txt "${text_dir}\README" - File /oname=README-SDL.txt "${text_dir}\README-SDL" + File /oname=README-SDL.txt "${build_dir}\README-SDL" # Engine data File "${engine_data}\drascula.dat" diff --git a/dists/nsis/scummvm.nsi.in b/dists/nsis/scummvm.nsi.in index 9dbb7c0568..eca619c312 100644 --- a/dists/nsis/scummvm.nsi.in +++ b/dists/nsis/scummvm.nsi.in @@ -205,7 +205,7 @@ Section "ScummVM" SecMain File /oname=COPYRIGHT.txt "${text_dir}\COPYRIGHT" File /oname=NEWS.txt "${text_dir}\NEWS" File /oname=README.txt "${text_dir}\README" - File /oname=README-SDL.txt "${text_dir}\README-SDL" + File /oname=README-SDL.txt "${build_dir}\README-SDL" # Engine data File "${engine_data}\drascula.dat" -- cgit v1.2.3