From 175e441efa06a62d482695062dd331213ffeb5f6 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Tue, 26 Apr 2011 09:50:24 -0400 Subject: TOOLS: Add NSIS installer script template to update-version.pl list of files to process --- devtools/update-version.pl | 1 + 1 file changed, 1 insertion(+) (limited to 'devtools') diff --git a/devtools/update-version.pl b/devtools/update-version.pl index 91e9e2492b..788cbc7e40 100755 --- a/devtools/update-version.pl +++ b/devtools/update-version.pl @@ -39,6 +39,7 @@ my @subs_files = qw( dists/macosx/Info.plist dists/iphone/Info.plist dists/irix/scummvm.spec + dists/nsis/scummvm.nsi dists/wii/meta.xml dists/android/AndroidManifest.xml dists/android/plugin-manifest.xml -- cgit v1.2.3 From 3f2b25f8790708cfdfd9c357acf7e43b95330077 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Tue, 26 Apr 2011 20:10:46 -0400 Subject: TOOLS: Update create_project to optionally create an installer after a successful build --- devtools/create_project/create_project.cpp | 5 + devtools/create_project/create_project.h | 6 +- devtools/create_project/msbuild.cpp | 2 +- devtools/create_project/msvc.cpp | 7 +- devtools/create_project/msvc.h | 9 +- .../create_project/msvc10/create_project.vcxproj | 1 + .../msvc10/create_project.vcxproj.filters | 3 + .../create_project/msvc8/create_project.vcproj | 4 + .../create_project/msvc9/create_project.vcproj | 4 + devtools/create_project/scripts/installer.vbs | 170 +++++++++++++++++++++ devtools/create_project/scripts/postbuild.cmd | 41 +++-- devtools/create_project/visualstudio.cpp | 2 +- 12 files changed, 236 insertions(+), 18 deletions(-) create mode 100644 devtools/create_project/scripts/installer.vbs (limited to 'devtools') diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index a597ba36e9..affd8f8675 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -245,6 +245,9 @@ int main(int argc, char *argv[]) { } else if (!std::strcmp(argv[i], "--build-events")) { setup.runBuildEvents = true; + } else if (!std::strcmp(argv[i], "--installer")) { + setup.runBuildEvents = true; + setup.createInstaller = true; } else { std::cerr << "ERROR: Unknown parameter \"" << argv[i] << "\"\n"; return -1; @@ -487,6 +490,8 @@ void displayHelp(const char *exe) { " The default is \"9\", thus \"Visual Studio 2008\"\n" " --build-events Run custom build events as part of the build\n" " (default: false)\n" + " --installer Create NSIS installer after the build (implies --build-events)\n" + " (default: false)\n" "\n" "Engines settings:\n" " --list-engines list all available engines and their default state\n" diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h index c228c34898..8968610e99 100644 --- a/devtools/create_project/create_project.h +++ b/devtools/create_project/create_project.h @@ -220,10 +220,12 @@ struct BuildSetup { StringList defines; ///< List of all defines for the build. StringList libraries; ///< List of all external libraries required for the build. - bool runBuildEvents; + bool runBuildEvents; ///< Run build events as part of the build (generate revision number and copy engine/theme data & needed files to the build folder + bool createInstaller; ///< Create NSIS installer after the build BuildSetup() { - runBuildEvents = false; + runBuildEvents = false; + createInstaller = false; } }; diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index 9d8b9c0407..36ea710c82 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -275,7 +275,7 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s // Copy data files to the build folder project << "\t\t\n" "\t\t\tCopy data files to the build folder\n" - "\t\t\t" << getPostBuildEvent(isWin32) << "\n" + "\t\t\t" << getPostBuildEvent(isWin32, setup.createInstaller) << "\n" "\t\t\n"; } } diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp index 49998cd738..af3aa4a519 100644 --- a/devtools/create_project/msvc.cpp +++ b/devtools/create_project/msvc.cpp @@ -158,7 +158,7 @@ std::string MSVCProvider::getPreBuildEvent() const { return cmdLine; } -std::string MSVCProvider::getPostBuildEvent(bool isWin32) const { +std::string MSVCProvider::getPostBuildEvent(bool isWin32, bool createInstaller) const { std::string cmdLine = ""; cmdLine = "@echo off\n" @@ -168,7 +168,10 @@ std::string MSVCProvider::getPostBuildEvent(bool isWin32) const { cmdLine += (isWin32) ? "x86" : "x64"; - cmdLine += " %SCUMMVM_LIBS%"; + cmdLine += " %SCUMMVM_LIBS% "; + + // Specify if installer needs to be built or not + cmdLine += (createInstaller ? "1" : "0"); cmdLine += "\n" "EXIT /B0"; diff --git a/devtools/create_project/msvc.h b/devtools/create_project/msvc.h index b2f2a5d33f..6c8ac33a76 100644 --- a/devtools/create_project/msvc.h +++ b/devtools/create_project/msvc.h @@ -89,11 +89,14 @@ protected: std::string getPreBuildEvent() const; /** - * Get the command line for copying data files to the build directory + * Get the command line for copying data files to the build directory. * - * @param isWin32 Bitness of property file + * @param isWin32 Bitness of property file. + * @param createInstaller true to NSIS create installer + * + * @return The post build event. */ - std::string getPostBuildEvent(bool isWin32) const; + std::string getPostBuildEvent(bool isWin32, bool createInstaller) const; }; } // End of CreateProjectTool namespace diff --git a/devtools/create_project/msvc10/create_project.vcxproj b/devtools/create_project/msvc10/create_project.vcxproj index 15ce217bfc..bf5e415b5d 100644 --- a/devtools/create_project/msvc10/create_project.vcxproj +++ b/devtools/create_project/msvc10/create_project.vcxproj @@ -108,6 +108,7 @@ xcopy /Y $(TargetPath) $(SolutionDir)\..\..\..\dists\codeblocks\ + diff --git a/devtools/create_project/msvc10/create_project.vcxproj.filters b/devtools/create_project/msvc10/create_project.vcxproj.filters index 42db5aa97e..b5e870824e 100644 --- a/devtools/create_project/msvc10/create_project.vcxproj.filters +++ b/devtools/create_project/msvc10/create_project.vcxproj.filters @@ -58,5 +58,8 @@ scripts + + scripts + \ No newline at end of file diff --git a/devtools/create_project/msvc8/create_project.vcproj b/devtools/create_project/msvc8/create_project.vcproj index 9cd833ea23..639b23d6e7 100644 --- a/devtools/create_project/msvc8/create_project.vcproj +++ b/devtools/create_project/msvc8/create_project.vcproj @@ -232,6 +232,10 @@ RelativePath="..\scripts\revision.vbs" > + + diff --git a/devtools/create_project/msvc9/create_project.vcproj b/devtools/create_project/msvc9/create_project.vcproj index 4e0375c35e..f56cbd711c 100644 --- a/devtools/create_project/msvc9/create_project.vcproj +++ b/devtools/create_project/msvc9/create_project.vcproj @@ -233,6 +233,10 @@ RelativePath="..\scripts\revision.vbs" > + + diff --git a/devtools/create_project/scripts/installer.vbs b/devtools/create_project/scripts/installer.vbs new file mode 100644 index 0000000000..3348b692e5 --- /dev/null +++ b/devtools/create_project/scripts/installer.vbs @@ -0,0 +1,170 @@ +' +' ScummVM - Graphic Adventure Engine +' +' ScummVM is the legal property of its developers, whose names +' are too numerous to list here. Please refer to the COPYRIGHT +' file distributed with this source distribution. +' +' This program is free software; you can redistribute it and/or +' modify it under the terms of the GNU General Public License +' as published by the Free Software Foundation, version 2 +' of the License. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program; if not, write to the Free Software +' Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +' +'/ + +Option Explicit + +Dim FSO : Set FSO = CreateObject("Scripting.FileSystemObject") +Dim WshShell : Set WshShell = CreateObject("WScript.Shell") + +' Folders +Dim rootFolder : rootFolder = "" +Dim targetFolder : targetFolder = "" + +' Parse our command line arguments +If ParseCommandLine() Then + CreateInstaller() +End If + +'//////////////////////////////////////////////////////////////// +'// Installer creation +'//////////////////////////////////////////////////////////////// +Sub CreateInstaller() + ' Get nsis installation folder + Dim nsisPath : nsisPath = GetNSISPath() + If (nsisPath = "") Then + Exit Sub + End If + + ' Build command line + Dim commandLine : commandLine = """" & nsisPath & "\makensis.exe"" /V2" & _ + " /Dtop_srcdir=""" & rootFolder & """" & _ + " /Dbuild_dir=""" & targetFolder & """" & _ + " /Dtext_dir=""" & targetFolder & """" & _ + " """ & rootFolder & "\dists\nsis\scummvm.nsi""" + + Dim oExec: Set oExec = WshShell.Exec(commandline) + If Err.Number <> 0 Then + Wscript.StdErr.WriteLine "Error running makensis.exe!" + Exit Sub + End If + + ' Wait till the application is finished ... + Dim ostdOut : Set oStdOut = oExec.StdOut + Do While oExec.Status = 0 + If Not ostdOut.AtEndOfStream Then + Wscript.StdErr.WriteLine ostdOut.ReadAll + End If + + WScript.Sleep 100 + Loop + + If oExec.ExitCode <> 0 Then + Wscript.StdErr.WriteLine "Error while creating installer!" + Exit Sub + End If +End Sub + +Function GetNSISPath() + ' Get the directory where NSIS (should) reside(s) + Dim sNSIS + + ' First, try with 32-bit architecture + sNSIS = ReadRegistryKey("HKLM", "SOFTWARE\NSIS", "", 32) + + If sNSIS = "" Or IsNull(sNSIS) Then + ' No 32-bit version of TortoiseSVN installed, try 64-bit version (doesn't hurt on 32-bit machines, it returns nothing or is ignored) + sNSIS = ReadRegistryKey("HKLM", "SOFTWARE\NSIS", "", 64) + End If + + ' Check if Tortoise is present + If sNSIS = "" Then + Wscript.StdErr.WriteLine "NSIS not installed!" + Exit Function + End If + + GetNSISPath = sNSIS +End Function + +'//////////////////////////////////////////////////////////////// +'// Utilities +'//////////////////////////////////////////////////////////////// +Function ParseCommandLine() + ParseCommandLine = True + + If Wscript.Arguments.Count <> 2 Then + Wscript.StdErr.WriteLine "[Error] Invalid number of arguments (was: " & Wscript.Arguments.Count & ", expected: 2)" + + ParseCommandLine = False + Exit Function + End If + + ' Get our arguments + rootFolder = Wscript.Arguments.Item(0) + targetFolder = Wscript.Arguments.Item(1) + + ' Check that the folders are valid + If Not FSO.FolderExists(rootFolder) Then + Wscript.StdErr.WriteLine "[Error] Invalid root folder (" & rootFolder & ")" + + ParseCommandLine = False + Exit Function + End If + + If Not FSO.FolderExists(targetFolder) Then + Wscript.StdErr.WriteLine "[Error] Invalid target folder (" & targetFolder & ")" + + ParseCommandLine = False + Exit Function + End If + + ' Set absolute paths + rootFolder = FSO.GetAbsolutePathName(rootFolder) + targetFolder = FSO.GetAbsolutePathName(targetFolder) +End Function + +Function ReadRegistryKey(shive, subkey, valuename, architecture) + Dim hiveKey, objCtx, objLocator, objServices, objReg, Inparams, Outparams + + ' First, get the Registry Provider for the requested architecture + Set objCtx = CreateObject("WbemScripting.SWbemNamedValueSet") + objCtx.Add "__ProviderArchitecture", architecture ' Must be 64 of 32 + Set objLocator = CreateObject("Wbemscripting.SWbemLocator") + Set objServices = objLocator.ConnectServer("","root\default","","",,,,objCtx) + Set objReg = objServices.Get("StdRegProv") + + ' Check the hive and give it the right value + Select Case shive + Case "HKCR", "HKEY_CLASSES_ROOT" + hiveKey = &h80000000 + Case "HKCU", "HKEY_CURRENT_USER" + hiveKey = &H80000001 + Case "HKLM", "HKEY_LOCAL_MACHINE" + hiveKey = &h80000002 + Case "HKU", "HKEY_USERS" + hiveKey = &h80000003 + Case "HKCC", "HKEY_CURRENT_CONFIG" + hiveKey = &h80000005 + Case "HKDD", "HKEY_DYN_DATA" ' Only valid for Windows 95/98 + hiveKey = &h80000006 + Case Else + MsgBox "Hive not valid (ReadRegistryKey)" + End Select + + Set Inparams = objReg.Methods_("GetStringValue").Inparameters + Inparams.Hdefkey = hiveKey + Inparams.Ssubkeyname = subkey + Inparams.Svaluename = valuename + Set Outparams = objReg.ExecMethod_("GetStringValue", Inparams,,objCtx) + + ReadRegistryKey = Outparams.SValue +End Function \ No newline at end of file diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd index 6c062f7ab1..aacf7255d0 100644 --- a/devtools/create_project/scripts/postbuild.cmd +++ b/devtools/create_project/scripts/postbuild.cmd @@ -1,34 +1,49 @@ -REM @echo off +@echo off REM --------------------------------------------------------------- REM -- Post-Build Script REM --------------------------------------------------------------- REM REM Copy engine data, themes, translation and required dlls to the -REM output folder. +REM output folder and optionnaly create an installer REM REM Expected parameters REM Root folder REM Output folder REM Architecture REM Libs folder +REM Installer ("1" to build, "0" to skip) if "%~1"=="" goto error_root if "%~2"=="" goto error_output if "%~3"=="" goto error_arch if "%~4"=="" goto error_libs +if "%~5"=="" goto error_installer echo Copying data files echo. -REM Copy files -xcopy /F /Y "%~1/dists/engine-data/*.dat" %~2 > NUL 2>&1 -xcopy /F /Y "%~1/dists/engine-data/*.tbl" %~2 > NUL 2>&1 -xcopy /F /Y "%~1/dists/engine-data/*.cpt" %~2 > NUL 2>&1 -xcopy /F /Y "%~1/dists/engine-data/README" %~2 > NUL 2>&1 -xcopy /F /Y "%~1/gui/themes/*.zip" %~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 +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/lib/%~3/SDL.dll" %~2 > NUL 2>&1 + +if "%~5"=="0" goto done + +echo Running installer script +echo. +@call cscript "%~1/devtools/create_project/scripts/installer.vbs" %~1 %~2 1>NUL +if not %errorlevel% == 0 goto error_script goto done :error_root @@ -47,5 +62,13 @@ goto done echo Invalid libs folder (%~4)! goto done +:error_installer +echo Invalid installer parameter. Should be "0" or "1" (was %~5)! +goto done + +:error_script: +echo An error occured while running the installer script! +goto done + :done exit /B0 diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 2997e3096a..e405e42e54 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -63,7 +63,7 @@ int VisualStudioProvider::getVisualStudioVersion() { "\t\t\t\tCommandLine=\"" << getPreBuildEvent() << "\"\n" \ "\t\t\t/>\n" \ "\t\t\t\n"; \ } -- cgit v1.2.3 From 5618276f1884788f44c0f43d7a287e800ba8b5e8 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Thu, 28 Apr 2011 05:02:39 -0400 Subject: TOOLS: Add documentation to create_project installer/revision build scripts --- devtools/create_project/scripts/installer.vbs | 16 +++++++++++++++- devtools/create_project/scripts/revision.vbs | 17 ++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) (limited to 'devtools') diff --git a/devtools/create_project/scripts/installer.vbs b/devtools/create_project/scripts/installer.vbs index 3348b692e5..716fa279a9 100644 --- a/devtools/create_project/scripts/installer.vbs +++ b/devtools/create_project/scripts/installer.vbs @@ -21,6 +21,20 @@ ' '/ +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +' This script calls the makensis tool to generate a NSIS Windows installer for ScummVM +' +' It tries to read the NSIS installation folder from the registry and then calls the +' command line script compiler to create the installer. +' +' This is called from the postbuild.cmd batch file +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +'================================================================ +' TODO: Reduce duplication with revision.vbs script +' (ReadRegistryKey and ParseCommandLine are identical) +'================================================================ + Option Explicit Dim FSO : Set FSO = CreateObject("Scripting.FileSystemObject") @@ -167,4 +181,4 @@ Function ReadRegistryKey(shive, subkey, valuename, architecture) Set Outparams = objReg.ExecMethod_("GetStringValue", Inparams,,objCtx) ReadRegistryKey = Outparams.SValue -End Function \ No newline at end of file +End Function diff --git a/devtools/create_project/scripts/revision.vbs b/devtools/create_project/scripts/revision.vbs index 9c29a88f2d..fb904856ec 100644 --- a/devtools/create_project/scripts/revision.vbs +++ b/devtools/create_project/scripts/revision.vbs @@ -23,6 +23,21 @@ ' '/ +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +' This script tries to determine a revision number based on the current working tree +' by trying revision control tools in the following order: +' - git (with hg-git detection) +' - mercurial +' - TortoiseSVN +' - SVN +' +' It then writes a new header file to be included during build, with the revision +' information, the current branch, the revision control system (when not git) and +' a flag when the tree is dirty. +' +' This is called from the prebuild.cmd batch file +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + Option Explicit ' Working copy check priority: @@ -216,7 +231,7 @@ Function DetermineGitVersion() Wscript.StdErr.Write " Git... " tool = "git" - ' First check if we have both a .git & .svn folders (in case hg-git has been set up to have the git folder at the working copy level) + ' First check if we have both a .git & .hg folders (in case hg-git has been set up to have the git folder at the working copy level) If FSO.FolderExists(rootFolder & "/.git") And FSO.FolderExists(rootFolder & "/.hg") Then Wscript.StdErr.WriteLine "Mercurial clone with git repository in tree!" Exit Function -- cgit v1.2.3 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 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'devtools') 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 -- cgit v1.2.3 From ef6d9216aa23f82519e01df1c2a99ae785e49196 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Thu, 28 Apr 2011 13:33:08 -0400 Subject: TOOLS: Fix indentation with whitespaces in create_project --- devtools/create_project/create_project.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'devtools') diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index affd8f8675..3f28790a6e 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -490,8 +490,8 @@ void displayHelp(const char *exe) { " The default is \"9\", thus \"Visual Studio 2008\"\n" " --build-events Run custom build events as part of the build\n" " (default: false)\n" - " --installer Create NSIS installer after the build (implies --build-events)\n" - " (default: false)\n" + " --installer Create NSIS installer after the build (implies --build-events)\n" + " (default: false)\n" "\n" "Engines settings:\n" " --list-engines list all available engines and their default state\n" -- cgit v1.2.3 From ca9ed0a9798b1d44541a73950a01f1f5b4e3b442 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Thu, 5 May 2011 13:11:57 -0400 Subject: CREATE_PROJECT: Pass architecture to nsis setup in post-build step --- devtools/create_project/scripts/installer.vbs | 16 ++++++++++++++-- devtools/create_project/scripts/postbuild.cmd | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'devtools') diff --git a/devtools/create_project/scripts/installer.vbs b/devtools/create_project/scripts/installer.vbs index 716fa279a9..6bcd794bef 100644 --- a/devtools/create_project/scripts/installer.vbs +++ b/devtools/create_project/scripts/installer.vbs @@ -43,6 +43,7 @@ Dim WshShell : Set WshShell = CreateObject("WScript.Shell") ' Folders Dim rootFolder : rootFolder = "" Dim targetFolder : targetFolder = "" +Dim arch : arch = "" ' Parse our command line arguments If ParseCommandLine() Then @@ -59,11 +60,21 @@ Sub CreateInstaller() Exit Sub End If + ' Preprocess architecture + Select Case arch + Case "x86" + arch = "win32" + + Case "x64" + arch = "win64" + End Select + ' Build command line Dim commandLine : commandLine = """" & nsisPath & "\makensis.exe"" /V2" & _ " /Dtop_srcdir=""" & rootFolder & """" & _ " /Dbuild_dir=""" & targetFolder & """" & _ " /Dtext_dir=""" & targetFolder & """" & _ + " /DARCH=""" & arch & """" & _ " """ & rootFolder & "\dists\nsis\scummvm.nsi""" Dim oExec: Set oExec = WshShell.Exec(commandline) @@ -115,8 +126,8 @@ End Function Function ParseCommandLine() ParseCommandLine = True - If Wscript.Arguments.Count <> 2 Then - Wscript.StdErr.WriteLine "[Error] Invalid number of arguments (was: " & Wscript.Arguments.Count & ", expected: 2)" + If Wscript.Arguments.Count <> 3 Then + Wscript.StdErr.WriteLine "[Error] Invalid number of arguments (was: " & Wscript.Arguments.Count & ", expected: 3)" ParseCommandLine = False Exit Function @@ -125,6 +136,7 @@ Function ParseCommandLine() ' Get our arguments rootFolder = Wscript.Arguments.Item(0) targetFolder = Wscript.Arguments.Item(1) + arch = Wscript.Arguments.Item(2) ' Check that the folders are valid If Not FSO.FolderExists(rootFolder) Then diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd index da61afcc3c..e78861463a 100644 --- a/devtools/create_project/scripts/postbuild.cmd +++ b/devtools/create_project/scripts/postbuild.cmd @@ -45,7 +45,7 @@ if "%~5"=="0" goto done echo Running installer script echo. -@call cscript "%~1/devtools/create_project/scripts/installer.vbs" %~1 %~2 1>NUL +@call cscript "%~1/devtools/create_project/scripts/installer.vbs" %~1 %~2 %~3 1>NUL if not %errorlevel% == 0 goto error_script goto done -- cgit v1.2.3 From 3f370629020d0d13c2612a55566b2c3480acc4eb Mon Sep 17 00:00:00 2001 From: Littleboy Date: Thu, 5 May 2011 13:53:32 -0400 Subject: CREATE_PROJECT: Generate the same revision numbers as the configure script The revision number now includes the number of commits since the last tag --- devtools/create_project/scripts/revision.vbs | 31 +++++++++++++++++++++------- 1 file changed, 23 insertions(+), 8 deletions(-) (limited to 'devtools') diff --git a/devtools/create_project/scripts/revision.vbs b/devtools/create_project/scripts/revision.vbs index fb904856ec..3e1212521c 100644 --- a/devtools/create_project/scripts/revision.vbs +++ b/devtools/create_project/scripts/revision.vbs @@ -97,14 +97,15 @@ Sub DetermineRevision() End If End If End If - - Wscript.StdErr.WriteLine "Found revision " & revision & " on branch " & branch & vbCrLf - + + Dim outputInfo : outputInfo = "Found revision " & revision & " on branch " & branch + ' Setup our revision string Dim revisionString : revisionString = revision If (modified) Then revisionString = revisionString & "-dirty" + outputInfo = outputInfo & " (dirty)" End If ' If we are not on trunk, add the branch name to the revision string @@ -115,7 +116,10 @@ Sub DetermineRevision() ' Add the DVCS name at the end (when not git) If (tool <> "git") Then revisionString = revisionString & "-" & tool + outputInfo = outputInfo & " using " & tool End If + + Wscript.StdErr.WriteLine outputInfo & vbCrLf ' Output revision header file FSO.CopyFile rootFolder & "\\base\\internal_revision.h.in", targetFolder & "\\internal_revision.h" @@ -228,6 +232,7 @@ Function DetermineGitVersion() Err.Clear On Error Resume Next DetermineGitVersion = False + Dim line Wscript.StdErr.Write " Git... " tool = "git" @@ -265,10 +270,10 @@ Function DetermineGitVersion() End If ' Get the version hash - Dim hash: hash = oExec.StdOut.ReadLine() + Dim hash : hash = oExec.StdOut.ReadLine() ' Make sure index is in sync with disk - Set oExec = WshShell.Exec(gitPath & "update-index --refresh") + Set oExec = WshShell.Exec(gitPath & "update-index --refresh --unmerged") If Err.Number = 0 Then ' Wait till the application is finished ... Do While oExec.Status = 0 @@ -276,7 +281,7 @@ Function DetermineGitVersion() Loop End If - Set oExec = WshShell.Exec(gitPath & "diff-index --exit-code --quiet HEAD " & rootFolder) + Set oExec = WshShell.Exec(gitPath & "diff-index --quiet HEAD " & rootFolder) If oExec.ExitCode <> 0 Then Wscript.StdErr.WriteLine "Error parsing git revision!" Exit Function @@ -294,14 +299,24 @@ Function DetermineGitVersion() ' Get branch name Set oExec = WshShell.Exec(gitPath & "symbolic-ref HEAD") If Err.Number = 0 Then - Dim line: line = oExec.StdOut.ReadLine() + line = oExec.StdOut.ReadLine() line = Mid(line, InStrRev(line, "/") + 1) If line <> "master" Then branch = line End If End If - ' Fallback to abbreviated revision number + ' Get revision description + Set oExec = WshShell.Exec(gitPath & "describe --match desc/*") + If Err.Number = 0 Then + line = oExec.StdOut.ReadLine() + line = Mid(line, InStr(line, "-") + 1) + If line <> "" Then + revision = line + End If + End If + + ' Fallback to abbreviated revision number if needed If revision = "" Then revision = Mid(hash, 1, 7) End If -- cgit v1.2.3 From d41c32d363e985f4d5b64795bbccebe976bdd5c4 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Thu, 5 May 2011 20:28:43 +0200 Subject: BUILD: Get rid of old MSVC style win resource support. --- devtools/create_project/msbuild.cpp | 1 - devtools/create_project/visualstudio.cpp | 1 - 2 files changed, 2 deletions(-) (limited to 'devtools') diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index 06425dd4aa..8143c92c35 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -340,7 +340,6 @@ void MSBuildProvider::outputGlobalPropFile(std::ofstream &properties, int bits, "\t\t\tWinMainCRTStartup\n" "\t\t\n" "\t\t\n" - "\t\t\tHAS_INCLUDE_SET;%(PreprocessorDefinitions)\n" "\t\t\t" << prefix << ";%(AdditionalIncludeDirectories)\n" "\t\t\n" "\t\n" diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 77af8aeca1..1c52e9d3c1 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -241,7 +241,6 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b "\t/>\n" "\t\n" "\n"; -- cgit v1.2.3 From 3758dcbbcc6006aa2d16b90501fd0ea818a47d79 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 6 May 2011 19:39:12 +1000 Subject: DEVTOOLS: Bugfix for CREATE_PROJECT creating duplicate tag in Visual Studio projects --- devtools/create_project/visualstudio.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'devtools') diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index f0901907e2..3acb283652 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -223,8 +223,7 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b properties << "\t\tRuntimeTypeInfo=\"false\"\n"; #endif - properties << "\t\tRuntimeTypeInfo=\"false\"\n" - "\t\tWarningLevel=\"4\"\n" + properties << "\t\tWarningLevel=\"4\"\n" "\t\tWarnAsError=\"false\"\n" "\t\tCompileAs=\"0\"\n" "\t\t/>\n" -- cgit v1.2.3 From c35ef00c4a10bcd4d1c8d8e57d8a368b879fb059 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 6 May 2011 21:09:44 +1000 Subject: DEVTOOLS: Fix linking failure in Visual Studio created project --- devtools/create_project/visualstudio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 3acb283652..a7a6ac84a7 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -148,7 +148,7 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std: void VisualStudioProvider::outputConfiguration(std::ostream &project, const BuildSetup &setup, const std::string &libraries, const std::string &config, const std::string &platform, const std::string &props, const bool isWin32) { project << "\t\t\n" "\t\t\t\n" - "\t\t\t\n"; outputBuildEvents(project, setup, isWin32); -- cgit v1.2.3 From dea5aa8a2017ec9b9abc16b34683a1e37aafbe46 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Fri, 6 May 2011 20:41:21 +0200 Subject: CREATE_PROJECT: Fix module.mk parsing. Formerly create_project incorrectly assumed that a given object file is only present once in an module.mk file. This is not the case for backends/module.mk for example. There the Windows FS object files are in two different if blocks. In this particular case it resulted in the object file being added to both the include list and the exclude list. Now the module.mk handler prefers files being in the include list. --- devtools/create_project/create_project.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'devtools') diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 7d112c7ffe..de82dd1698 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -1225,10 +1225,20 @@ void ProjectProvider::createModuleList(const std::string &moduleDir, const Strin tokens = tokenize(line); i = tokens.begin(); } else { - if (shouldInclude.top()) - includeList.push_back(moduleDir + "/" + unifyPath(*i)); - else - excludeList.push_back(moduleDir + "/" + unifyPath(*i)); + const std::string filename = moduleDir + "/" + unifyPath(*i); + + if (shouldInclude.top()) { + // In case we should include a file, we need to make + // sure it is not in the exclude list already. If it + // is we just drop it from the exclude list. + excludeList.remove(filename); + + includeList.push_back(filename); + } else if (std::find(includeList.begin(), includeList.end(), filename) == includeList.end()) { + // We only add the file to the exclude list in case it + // has not yet been added to the include list. + excludeList.push_back(filename); + } ++i; } } -- cgit v1.2.3 From 7cc965d24b9e7c67f54de520504fa5ead0970bd5 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Wed, 11 May 2011 18:13:22 -0400 Subject: CREATE_PROJECT: Only copy necessary data files in postbuild script --- devtools/create_project/scripts/installer.vbs | 2 +- devtools/create_project/scripts/postbuild.cmd | 35 ++++++++++++++------------- 2 files changed, 19 insertions(+), 18 deletions(-) (limited to 'devtools') diff --git a/devtools/create_project/scripts/installer.vbs b/devtools/create_project/scripts/installer.vbs index 6bcd794bef..d752355acd 100644 --- a/devtools/create_project/scripts/installer.vbs +++ b/devtools/create_project/scripts/installer.vbs @@ -73,7 +73,7 @@ Sub CreateInstaller() Dim commandLine : commandLine = """" & nsisPath & "\makensis.exe"" /V2" & _ " /Dtop_srcdir=""" & rootFolder & """" & _ " /Dbuild_dir=""" & targetFolder & """" & _ - " /Dtext_dir=""" & targetFolder & """" & _ + " /Dtext_dir=""" & rootFolder & """" & _ " /DARCH=""" & arch & """" & _ " """ & rootFolder & "\dists\nsis\scummvm.nsi""" diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd index e78861463a..75a916db49 100644 --- a/devtools/create_project/scripts/postbuild.cmd +++ b/devtools/create_project/scripts/postbuild.cmd @@ -23,23 +23,24 @@ 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/dists/engine-data/*.dat" %~2 > NUL 2>&1 -xcopy /F /Y "%~1/dists/engine-data/*.tbl" %~2 > NUL 2>&1 -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 - -xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" %~2 > NUL 2>&1 +REM xcopy /F /Y "%~1/AUTHORS" %~2 1>NUL 2>&1 +REM xcopy /F /Y "%~1/COPYING.GPL" %~2 1>NUL 2>&1 +REM xcopy /F /Y "%~1/COPYING" %~2 1>NUL 2>&1 +REM xcopy /F /Y "%~1/COPYING.LGPL" %~2 1>NUL 2>&1 +REM xcopy /F /Y "%~1/COPYRIGHT" %~2 1>NUL 2>&1 +REM xcopy /F /Y "%~1/NEWS" %~2 1>NUL 2>&1 +REM xcopy /F /Y "%~1/README" %~2 1>NUL 2>&1 + +REM xcopy /F /Y "%~1/dists/engine-data/*.dat" %~2 1>NUL 2>&1 +REM xcopy /F /Y "%~1/dists/engine-data/*.tbl" %~2 1>NUL 2>&1 +REM xcopy /F /Y "%~1/dists/engine-data/*.cpt" %~2 1>NUL 2>&1 +REM xcopy /F /Y "%~1/gui/themes/*.zip" %~2 1>NUL 2>&1 +REM xcopy /F /Y "%~1/gui/themes/translations.dat" %~2 1>NUL 2>&1 + +xcopy /F /Y "%~4/lib/%~3/SDL.dll" %~2 1>NUL 2>&1 +xcopy /F /Y "%~4/README-SDL" %~2 1>NUL 2>&1 + +xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" %~2 1>NUL 2>&1 if "%~5"=="0" goto done -- cgit v1.2.3 From 69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e Mon Sep 17 00:00:00 2001 From: strangerke Date: Thu, 12 May 2011 01:13:57 +0200 Subject: GIT: Clean up: Suppress SVN tags, now useless --- devtools/construct-pred-dict.pl | 3 --- devtools/convbdf.c | 3 --- devtools/create_drascula/create_drascula.cpp | 3 --- devtools/create_drascula/create_drascula.h | 3 --- devtools/create_drascula/module.mk | 2 -- devtools/create_drascula/staticdata.h | 3 --- devtools/create_hugo/create_hugo.cpp | 3 --- devtools/create_hugo/create_hugo.h | 3 --- devtools/create_hugo/staticdata.h | 3 --- devtools/create_hugo/staticdisplay.h | 3 --- devtools/create_hugo/staticengine.h | 3 --- devtools/create_hugo/staticfont.h | 3 --- devtools/create_hugo/staticintro.h | 3 --- devtools/create_hugo/staticmouse.h | 3 --- devtools/create_hugo/staticparser.h | 3 --- devtools/create_hugo/staticutil.h | 3 --- devtools/create_kyradat/create_kyradat.cpp | 3 --- devtools/create_kyradat/create_kyradat.h | 3 --- devtools/create_kyradat/extract.cpp | 3 --- devtools/create_kyradat/extract.h | 3 --- devtools/create_kyradat/games.cpp | 3 --- devtools/create_kyradat/md5.cpp | 3 --- devtools/create_kyradat/md5.h | 3 --- devtools/create_kyradat/module.mk | 2 -- devtools/create_kyradat/pak.cpp | 3 --- devtools/create_kyradat/pak.h | 3 --- devtools/create_kyradat/search.cpp | 3 --- devtools/create_kyradat/search.h | 3 --- devtools/create_kyradat/tables.cpp | 3 --- devtools/create_kyradat/tables.h | 3 --- devtools/create_kyradat/util.cpp | 3 --- devtools/create_kyradat/util.h | 3 --- devtools/create_lure/create_lure_dat.cpp | 3 --- devtools/create_lure/create_lure_dat.h | 3 --- devtools/create_lure/module.mk | 2 -- devtools/create_lure/process_actions.cpp | 3 --- devtools/create_mads/main.cpp | 3 --- devtools/create_mads/module.mk | 2 -- devtools/create_mads/parser.cpp | 3 --- devtools/create_mads/parser.h | 3 --- devtools/create_project/codeblocks.cpp | 3 --- devtools/create_project/codeblocks.h | 3 --- devtools/create_project/config.h | 3 --- devtools/create_project/create_project.cpp | 3 --- devtools/create_project/create_project.h | 3 --- devtools/create_project/module.mk | 2 -- devtools/create_project/msbuild.cpp | 3 --- devtools/create_project/msbuild.h | 3 --- devtools/create_project/msvc.cpp | 3 --- devtools/create_project/msvc.h | 3 --- devtools/create_project/visualstudio.cpp | 3 --- devtools/create_project/visualstudio.h | 3 --- devtools/create_teenagent/create_teenagent.cpp | 3 --- devtools/create_teenagent/md5.cpp | 3 --- devtools/create_teenagent/md5.h | 3 --- devtools/create_teenagent/module.mk | 2 -- devtools/create_teenagent/util.h | 3 --- devtools/create_toon/create_toon.cpp | 3 --- devtools/create_toon/create_toon.h | 3 --- devtools/create_toon/staticdata.h | 3 --- devtools/dist-scummvm.sh | 2 -- devtools/extract-words-tok.pl | 3 --- devtools/make-scumm-fontdata.c | 2 -- devtools/md5table.c | 3 --- devtools/module.mk | 2 -- devtools/qtable/module.mk | 2 -- devtools/sci/musicplayer.cpp | 3 --- devtools/sci/scidisasm.cpp | 3 --- devtools/sci/scipack.cpp | 3 --- devtools/sci/scitrace.asm | 3 --- devtools/skycpt/AsciiCptCompile.cpp | 3 --- devtools/skycpt/KmpSearch.cpp | 3 --- devtools/skycpt/KmpSearch.h | 3 --- devtools/skycpt/TextFile.cpp | 3 --- devtools/skycpt/TextFile.h | 3 --- devtools/skycpt/cptcompiler.cpp | 3 --- devtools/skycpt/cpthelp.cpp | 3 --- devtools/skycpt/cpthelp.h | 3 --- devtools/skycpt/idFinder.cpp | 3 --- devtools/skycpt/module.mk | 2 -- devtools/skycpt/stdafx.cpp | 3 --- devtools/skycpt/stdafx.h | 3 --- devtools/themeparser.py | 2 -- 83 files changed, 237 deletions(-) (limited to 'devtools') diff --git a/devtools/construct-pred-dict.pl b/devtools/construct-pred-dict.pl index a092429ff6..73feeba893 100755 --- a/devtools/construct-pred-dict.pl +++ b/devtools/construct-pred-dict.pl @@ -20,9 +20,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# $URL$ -# $Id$ -# # This script constructs dictionary for use with predictive input # diff --git a/devtools/convbdf.c b/devtools/convbdf.c index fc13cff6ce..4b1640dba7 100644 --- a/devtools/convbdf.c +++ b/devtools/convbdf.c @@ -27,9 +27,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include #include diff --git a/devtools/create_drascula/create_drascula.cpp b/devtools/create_drascula/create_drascula.cpp index 9ea2da380a..20b60ab05f 100644 --- a/devtools/create_drascula/create_drascula.cpp +++ b/devtools/create_drascula/create_drascula.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * * This is a utility for storing all the hardcoded data of Drascula in a separate * data file, used by the game engine */ diff --git a/devtools/create_drascula/create_drascula.h b/devtools/create_drascula/create_drascula.h index 13903e9564..754050c172 100644 --- a/devtools/create_drascula/create_drascula.h +++ b/devtools/create_drascula/create_drascula.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_DRASCULA_H diff --git a/devtools/create_drascula/module.mk b/devtools/create_drascula/module.mk index b5a32d8d00..bbc2f7bce0 100644 --- a/devtools/create_drascula/module.mk +++ b/devtools/create_drascula/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_drascula diff --git a/devtools/create_drascula/staticdata.h b/devtools/create_drascula/staticdata.h index f45af487b1..21b9a82622 100644 --- a/devtools/create_drascula/staticdata.h +++ b/devtools/create_drascula/staticdata.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef STATICDATA_H diff --git a/devtools/create_hugo/create_hugo.cpp b/devtools/create_hugo/create_hugo.cpp index 1dffa0edf1..e54ade2b28 100644 --- a/devtools/create_hugo/create_hugo.cpp +++ b/devtools/create_hugo/create_hugo.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * * This is a utility for storing all the hardcoded data of Hugo in a separate * data file, used by the game engine */ diff --git a/devtools/create_hugo/create_hugo.h b/devtools/create_hugo/create_hugo.h index f30c186877..16d15fe317 100644 --- a/devtools/create_hugo/create_hugo.h +++ b/devtools/create_hugo/create_hugo.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_HUGO_H diff --git a/devtools/create_hugo/staticdata.h b/devtools/create_hugo/staticdata.h index c12191c11d..582d5aaa8e 100644 --- a/devtools/create_hugo/staticdata.h +++ b/devtools/create_hugo/staticdata.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_hugo/staticdisplay.h b/devtools/create_hugo/staticdisplay.h index 790bf74d3b..03800017b5 100644 --- a/devtools/create_hugo/staticdisplay.h +++ b/devtools/create_hugo/staticdisplay.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_hugo/staticengine.h b/devtools/create_hugo/staticengine.h index 362100b8f0..0091182c3c 100644 --- a/devtools/create_hugo/staticengine.h +++ b/devtools/create_hugo/staticengine.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_hugo/staticfont.h b/devtools/create_hugo/staticfont.h index c5700cdf58..9fa87d194a 100644 --- a/devtools/create_hugo/staticfont.h +++ b/devtools/create_hugo/staticfont.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef STATICFONT_H diff --git a/devtools/create_hugo/staticintro.h b/devtools/create_hugo/staticintro.h index 2fe18b8231..d9880b707c 100644 --- a/devtools/create_hugo/staticintro.h +++ b/devtools/create_hugo/staticintro.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_hugo/staticmouse.h b/devtools/create_hugo/staticmouse.h index 2d4987a30c..b4d784210b 100644 --- a/devtools/create_hugo/staticmouse.h +++ b/devtools/create_hugo/staticmouse.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_hugo/staticparser.h b/devtools/create_hugo/staticparser.h index 9e67e98c26..a2e28c1790 100644 --- a/devtools/create_hugo/staticparser.h +++ b/devtools/create_hugo/staticparser.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_hugo/staticutil.h b/devtools/create_hugo/staticutil.h index 050655a4de..9003788ec9 100644 --- a/devtools/create_hugo/staticutil.h +++ b/devtools/create_hugo/staticutil.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp index 7a4b8d73a1..6a8e6a0fbe 100644 --- a/devtools/create_kyradat/create_kyradat.cpp +++ b/devtools/create_kyradat/create_kyradat.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h index d82e16fed0..22a6db4b39 100644 --- a/devtools/create_kyradat/create_kyradat.h +++ b/devtools/create_kyradat/create_kyradat.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_KYRADAT_CREATE_KYRADAT_H diff --git a/devtools/create_kyradat/extract.cpp b/devtools/create_kyradat/extract.cpp index 6b801d14f9..2b6499d3fb 100644 --- a/devtools/create_kyradat/extract.cpp +++ b/devtools/create_kyradat/extract.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/extract.h b/devtools/create_kyradat/extract.h index 0903852dd2..fc473b33d1 100644 --- a/devtools/create_kyradat/extract.h +++ b/devtools/create_kyradat/extract.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_KYRADAT_EXTRACT_H diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp index 75a956cab0..f65ff14e1e 100644 --- a/devtools/create_kyradat/games.cpp +++ b/devtools/create_kyradat/games.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/md5.cpp b/devtools/create_kyradat/md5.cpp index 214b5ef7ed..9f90122981 100644 --- a/devtools/create_kyradat/md5.cpp +++ b/devtools/create_kyradat/md5.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/md5.h b/devtools/create_kyradat/md5.h index dd50efece8..3746521002 100644 --- a/devtools/create_kyradat/md5.h +++ b/devtools/create_kyradat/md5.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef COMMON_MD5_H diff --git a/devtools/create_kyradat/module.mk b/devtools/create_kyradat/module.mk index 60cd1f8578..fb458b43ff 100644 --- a/devtools/create_kyradat/module.mk +++ b/devtools/create_kyradat/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_kyradat diff --git a/devtools/create_kyradat/pak.cpp b/devtools/create_kyradat/pak.cpp index 4179f42df0..0203285a8f 100644 --- a/devtools/create_kyradat/pak.cpp +++ b/devtools/create_kyradat/pak.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/pak.h b/devtools/create_kyradat/pak.h index ee6dabb672..cf415676dd 100644 --- a/devtools/create_kyradat/pak.h +++ b/devtools/create_kyradat/pak.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef KYRA_PAK_H diff --git a/devtools/create_kyradat/search.cpp b/devtools/create_kyradat/search.cpp index 28631fa652..36b59d948c 100644 --- a/devtools/create_kyradat/search.cpp +++ b/devtools/create_kyradat/search.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/search.h b/devtools/create_kyradat/search.h index 6459606ef8..bd6aa0355b 100644 --- a/devtools/create_kyradat/search.h +++ b/devtools/create_kyradat/search.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SEARCH_H diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp index 777f237650..090b32debc 100644 --- a/devtools/create_kyradat/tables.cpp +++ b/devtools/create_kyradat/tables.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/tables.h b/devtools/create_kyradat/tables.h index c990043f5d..b9687a5949 100644 --- a/devtools/create_kyradat/tables.h +++ b/devtools/create_kyradat/tables.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_KYRADAT_TABLES_H diff --git a/devtools/create_kyradat/util.cpp b/devtools/create_kyradat/util.cpp index 702a36bc0e..3b9f621949 100644 --- a/devtools/create_kyradat/util.cpp +++ b/devtools/create_kyradat/util.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/util.h b/devtools/create_kyradat/util.h index 077597ac07..0d8e15cc37 100644 --- a/devtools/create_kyradat/util.h +++ b/devtools/create_kyradat/util.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef UTIL_H diff --git a/devtools/create_lure/create_lure_dat.cpp b/devtools/create_lure/create_lure_dat.cpp index 4964b26903..c55252410c 100644 --- a/devtools/create_lure/create_lure_dat.cpp +++ b/devtools/create_lure/create_lure_dat.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * * This is a utility for extracting needed resource data from different language * version of the Lure of the Temptress lure.exe executable files into a new file * lure.dat - this file is required for the ScummVM Lure of the Temptress module diff --git a/devtools/create_lure/create_lure_dat.h b/devtools/create_lure/create_lure_dat.h index 23090072bd..9259a8dcc8 100644 --- a/devtools/create_lure/create_lure_dat.h +++ b/devtools/create_lure/create_lure_dat.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_LURE_DAT_H diff --git a/devtools/create_lure/module.mk b/devtools/create_lure/module.mk index 5d8192cb7a..410cd26ba3 100644 --- a/devtools/create_lure/module.mk +++ b/devtools/create_lure/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_lure diff --git a/devtools/create_lure/process_actions.cpp b/devtools/create_lure/process_actions.cpp index 30e7eed9e4..8539391d57 100644 --- a/devtools/create_lure/process_actions.cpp +++ b/devtools/create_lure/process_actions.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_mads/main.cpp b/devtools/create_mads/main.cpp index 26ae2a7558..c5cd6d5b2e 100644 --- a/devtools/create_mads/main.cpp +++ b/devtools/create_mads/main.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // HACK to allow building with the SDL backend on MinGW diff --git a/devtools/create_mads/module.mk b/devtools/create_mads/module.mk index c773da8366..20d8deb8af 100644 --- a/devtools/create_mads/module.mk +++ b/devtools/create_mads/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_mads diff --git a/devtools/create_mads/parser.cpp b/devtools/create_mads/parser.cpp index c37b3a7a80..2daaff0d33 100644 --- a/devtools/create_mads/parser.cpp +++ b/devtools/create_mads/parser.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include diff --git a/devtools/create_mads/parser.h b/devtools/create_mads/parser.h index d404e8395f..a7141c497a 100644 --- a/devtools/create_mads/parser.h +++ b/devtools/create_mads/parser.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_MADS_PARSER diff --git a/devtools/create_project/codeblocks.cpp b/devtools/create_project/codeblocks.cpp index 8ca139e515..e73dc11089 100644 --- a/devtools/create_project/codeblocks.cpp +++ b/devtools/create_project/codeblocks.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "config.h" diff --git a/devtools/create_project/codeblocks.h b/devtools/create_project/codeblocks.h index ba75daeafd..8d35eb068e 100644 --- a/devtools/create_project/codeblocks.h +++ b/devtools/create_project/codeblocks.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TOOLS_CREATE_PROJECT_CODEBLOCKS_H diff --git a/devtools/create_project/config.h b/devtools/create_project/config.h index 1609e9e99a..fecd95691e 100644 --- a/devtools/create_project/config.h +++ b/devtools/create_project/config.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TOOLS_CREATE_PROJECT_CONFIG_H diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index de82dd1698..b75b22a290 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // HACK to allow building with the SDL backend on MinGW diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h index e4ccd7313a..9b9e4cfd1b 100644 --- a/devtools/create_project/create_project.h +++ b/devtools/create_project/create_project.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TOOLS_CREATE_PROJECT_H diff --git a/devtools/create_project/module.mk b/devtools/create_project/module.mk index 4382fe176c..4238452c5d 100644 --- a/devtools/create_project/module.mk +++ b/devtools/create_project/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_project diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index f9a2e936f0..f8ce80acfd 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "config.h" diff --git a/devtools/create_project/msbuild.h b/devtools/create_project/msbuild.h index 98bb65e19b..681c893d95 100644 --- a/devtools/create_project/msbuild.h +++ b/devtools/create_project/msbuild.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TOOLS_CREATE_PROJECT_MSBUILD_H diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp index af3aa4a519..aa347b1081 100644 --- a/devtools/create_project/msvc.cpp +++ b/devtools/create_project/msvc.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "config.h" diff --git a/devtools/create_project/msvc.h b/devtools/create_project/msvc.h index 6c8ac33a76..ead4bf949a 100644 --- a/devtools/create_project/msvc.h +++ b/devtools/create_project/msvc.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TOOLS_CREATE_PROJECT_MSVC_H diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 8642f071ff..4fadfd2509 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "config.h" diff --git a/devtools/create_project/visualstudio.h b/devtools/create_project/visualstudio.h index 0e4b441e63..dad923e49c 100644 --- a/devtools/create_project/visualstudio.h +++ b/devtools/create_project/visualstudio.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TOOLS_CREATE_PROJECT_VISUALSTUDIO_H diff --git a/devtools/create_teenagent/create_teenagent.cpp b/devtools/create_teenagent/create_teenagent.cpp index 9a9c00d4b4..9551acbaea 100644 --- a/devtools/create_teenagent/create_teenagent.cpp +++ b/devtools/create_teenagent/create_teenagent.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_teenagent/md5.cpp b/devtools/create_teenagent/md5.cpp index 214b5ef7ed..9f90122981 100644 --- a/devtools/create_teenagent/md5.cpp +++ b/devtools/create_teenagent/md5.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_teenagent/md5.h b/devtools/create_teenagent/md5.h index dd50efece8..3746521002 100644 --- a/devtools/create_teenagent/md5.h +++ b/devtools/create_teenagent/md5.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef COMMON_MD5_H diff --git a/devtools/create_teenagent/module.mk b/devtools/create_teenagent/module.mk index 5c9b876140..a9d102addb 100644 --- a/devtools/create_teenagent/module.mk +++ b/devtools/create_teenagent/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_teenagent diff --git a/devtools/create_teenagent/util.h b/devtools/create_teenagent/util.h index 077597ac07..0d8e15cc37 100644 --- a/devtools/create_teenagent/util.h +++ b/devtools/create_teenagent/util.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef UTIL_H diff --git a/devtools/create_toon/create_toon.cpp b/devtools/create_toon/create_toon.cpp index 3cf252cbcd..bdd57be7df 100644 --- a/devtools/create_toon/create_toon.cpp +++ b/devtools/create_toon/create_toon.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * * This is a utility for storing all the hardcoded data of Toonstruck in a separate * data file, used by the game engine */ diff --git a/devtools/create_toon/create_toon.h b/devtools/create_toon/create_toon.h index 0695944b17..60b33013f4 100644 --- a/devtools/create_toon/create_toon.h +++ b/devtools/create_toon/create_toon.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_TOON_H diff --git a/devtools/create_toon/staticdata.h b/devtools/create_toon/staticdata.h index efcb893024..2164512337 100644 --- a/devtools/create_toon/staticdata.h +++ b/devtools/create_toon/staticdata.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef STATICDATA_H diff --git a/devtools/dist-scummvm.sh b/devtools/dist-scummvm.sh index de76c9f6a9..ac411c55a3 100755 --- a/devtools/dist-scummvm.sh +++ b/devtools/dist-scummvm.sh @@ -23,8 +23,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# $URL$ -# $Id$ ### configuration diff --git a/devtools/extract-words-tok.pl b/devtools/extract-words-tok.pl index 9209d49eb5..1157ef557f 100755 --- a/devtools/extract-words-tok.pl +++ b/devtools/extract-words-tok.pl @@ -20,9 +20,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# $URL$ -# $Id$ -# # This script extracts AGI words.tok file # diff --git a/devtools/make-scumm-fontdata.c b/devtools/make-scumm-fontdata.c index 991d49831a..73b21846ec 100644 --- a/devtools/make-scumm-fontdata.c +++ b/devtools/make-scumm-fontdata.c @@ -18,8 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ */ #include diff --git a/devtools/md5table.c b/devtools/md5table.c index 7d76b7541d..9e57edbc35 100644 --- a/devtools/md5table.c +++ b/devtools/md5table.c @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include diff --git a/devtools/module.mk b/devtools/module.mk index fdbc13f645..1ff5ba6da9 100644 --- a/devtools/module.mk +++ b/devtools/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools diff --git a/devtools/qtable/module.mk b/devtools/qtable/module.mk index 5aab9ad0c7..fbc18f2fe3 100644 --- a/devtools/qtable/module.mk +++ b/devtools/qtable/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/qtable diff --git a/devtools/sci/musicplayer.cpp b/devtools/sci/musicplayer.cpp index 139ce451ef..e4d0779848 100644 --- a/devtools/sci/musicplayer.cpp +++ b/devtools/sci/musicplayer.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifdef HAVE_CONFIG_H diff --git a/devtools/sci/scidisasm.cpp b/devtools/sci/scidisasm.cpp index 39ea7f9c41..9b212c208d 100644 --- a/devtools/sci/scidisasm.cpp +++ b/devtools/sci/scidisasm.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifdef HAVE_CONFIG_H diff --git a/devtools/sci/scipack.cpp b/devtools/sci/scipack.cpp index f70d91fabc..ff52e25061 100644 --- a/devtools/sci/scipack.cpp +++ b/devtools/sci/scipack.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include diff --git a/devtools/sci/scitrace.asm b/devtools/sci/scitrace.asm index 360e0b7ffc..2e541326f2 100644 --- a/devtools/sci/scitrace.asm +++ b/devtools/sci/scitrace.asm @@ -18,9 +18,6 @@ ; along with this program; if not, write to the Free Software ; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ; -; $URL$ -; $Id$ -; ;--------------------------------------------------------------------------- ; ; SCITRACE diff --git a/devtools/skycpt/AsciiCptCompile.cpp b/devtools/skycpt/AsciiCptCompile.cpp index 1169de5aea..154c13b8cd 100644 --- a/devtools/skycpt/AsciiCptCompile.cpp +++ b/devtools/skycpt/AsciiCptCompile.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // HACK to allow building with the SDL backend on MinGW diff --git a/devtools/skycpt/KmpSearch.cpp b/devtools/skycpt/KmpSearch.cpp index b0512a8d3e..9551156295 100644 --- a/devtools/skycpt/KmpSearch.cpp +++ b/devtools/skycpt/KmpSearch.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/KmpSearch.h b/devtools/skycpt/KmpSearch.h index 6f13ace4a5..f39b993bd2 100644 --- a/devtools/skycpt/KmpSearch.h +++ b/devtools/skycpt/KmpSearch.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKYCPT_KMPSEARCH_H diff --git a/devtools/skycpt/TextFile.cpp b/devtools/skycpt/TextFile.cpp index ee64d22f5f..e9887dc87b 100644 --- a/devtools/skycpt/TextFile.cpp +++ b/devtools/skycpt/TextFile.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/TextFile.h b/devtools/skycpt/TextFile.h index a9ad65417c..6c390c050d 100644 --- a/devtools/skycpt/TextFile.h +++ b/devtools/skycpt/TextFile.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKYCPT_TEXTFILE_H diff --git a/devtools/skycpt/cptcompiler.cpp b/devtools/skycpt/cptcompiler.cpp index 7453b383b6..264646816c 100644 --- a/devtools/skycpt/cptcompiler.cpp +++ b/devtools/skycpt/cptcompiler.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/cpthelp.cpp b/devtools/skycpt/cpthelp.cpp index 134e440fd7..0780888097 100644 --- a/devtools/skycpt/cpthelp.cpp +++ b/devtools/skycpt/cpthelp.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/cpthelp.h b/devtools/skycpt/cpthelp.h index 722e756edf..71d760af3f 100644 --- a/devtools/skycpt/cpthelp.h +++ b/devtools/skycpt/cpthelp.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/idFinder.cpp b/devtools/skycpt/idFinder.cpp index 53c9f1f1a0..99e4378867 100644 --- a/devtools/skycpt/idFinder.cpp +++ b/devtools/skycpt/idFinder.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/module.mk b/devtools/skycpt/module.mk index 84a59cee9f..eaf1679ba8 100644 --- a/devtools/skycpt/module.mk +++ b/devtools/skycpt/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/skycpt diff --git a/devtools/skycpt/stdafx.cpp b/devtools/skycpt/stdafx.cpp index 8a5c78bc36..e91ca09470 100644 --- a/devtools/skycpt/stdafx.cpp +++ b/devtools/skycpt/stdafx.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/stdafx.h b/devtools/skycpt/stdafx.h index 3e5c6042eb..d4d389a2b6 100644 --- a/devtools/skycpt/stdafx.h +++ b/devtools/skycpt/stdafx.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // stdafx.h : Includedatei für Standardsystem-Includedateien, diff --git a/devtools/themeparser.py b/devtools/themeparser.py index 993f7c79bc..a3524461a0 100644 --- a/devtools/themeparser.py +++ b/devtools/themeparser.py @@ -22,8 +22,6 @@ " along with this program; if not, write to the Free Software " Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. " - " $URL$ - " $Id$ """ from __future__ import with_statement -- cgit v1.2.3 From 65a82610d15214eee56d0719c0f80c1e86b3039a Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 13 May 2011 14:30:56 +0200 Subject: DEVTOOLS: Remove obsolete TeX mode from credits.pl, mention Credits.rtf --- devtools/credits.pl | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) (limited to 'devtools') diff --git a/devtools/credits.pl b/devtools/credits.pl index c45f16eec9..46c75402c1 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -5,10 +5,9 @@ # of the credits in other places from this source. In particular: # - The AUTHORS file # - The gui/credits.h header file +# - The Credits.rtf file used by the Mac OS X port # - The credits.xml file, part of the DocBook manual # - Finally, credits.xml, for use on the website (different format than the DocBook one) -# And maybe in the future, also "doc/10.tex", the LaTeX version of the README. -# Although that might soon be obsolete, if the manual evolves enough. # # Initial version written by Fingolfin in December 2004. # @@ -37,7 +36,6 @@ if ($#ARGV >= 0) { $mode = "CPP" if ($ARGV[0] eq "--cpp"); # credits.h (for use by about.cpp) $mode = "XML-DOC" if ($ARGV[0] eq "--xml-docbook"); # credits.xml (DocBook) $mode = "RTF" if ($ARGV[0] eq "--rtf"); # Credits.rtf (Mac OS X About box) - $mode = "TEX" if ($ARGV[0] eq "--tex"); # 10.tex (LaTeX) } if ($mode eq "") { @@ -184,10 +182,6 @@ sub begin_credits { if ($mode eq "TEXT") { #print html_entities_to_ascii($title)."\n"; - } elsif ($mode eq "TEX") { - print "% This file was generated by credits.pl. Do not edit by hand!\n"; - print '\section{Credits}' . "\n"; - print '\begin{trivlist}' . "\n"; } elsif ($mode eq "RTF") { print '{\rtf1\mac\ansicpg10000' . "\n"; print '{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}' . "\n"; @@ -219,9 +213,6 @@ sub begin_credits { sub end_credits { if ($mode eq "TEXT") { - } elsif ($mode eq "TEX") { - print '\end{trivlist}' . "\n"; - print "\n"; } elsif ($mode eq "RTF") { print "}\n"; } elsif ($mode eq "CPP") { @@ -252,15 +243,6 @@ sub begin_section { } elsif ($section_level eq 1) { print " " x $section_level . "-" x (length $title)."\n"; } - } elsif ($mode eq "TEX") { - print '\item \textbf{'; - if ($section_level eq 0) { - print '\LARGE'; - } elsif ($section_level eq 1) { - print '\large'; - } - print " " . html_entities_to_tex($title) . "}\n"; - print '\begin{list}{}{\setlength{\leftmargin}{0.2cm}}' . "\n"; } elsif ($mode eq "RTF") { $title = html_entities_to_rtf($title); @@ -327,8 +309,6 @@ sub end_section { if ($mode eq "TEXT") { # nothing - } elsif ($mode eq "TEX") { - print '\end{list}' . "\n"; } elsif ($mode eq "RTF") { # nothing } elsif ($mode eq "CPP") { @@ -352,16 +332,12 @@ sub begin_persons { print "\t\t\t\n"; print "\t\t\t\t" . $title . "\n"; #print "\t\t\t\t\n"; - } elsif ($mode eq "TEX") { - print '\item \begin{tabular}[h]{p{0.3\linewidth}p{0.6\linewidth}}' . "\n"; } } sub end_persons { if ($mode eq "TEXT") { print "\n"; - } elsif ($mode eq "TEX") { - print ' \end{tabular}' . "\n"; } elsif ($mode eq "RTF") { # nothing } elsif ($mode eq "XML-WEB") { @@ -392,12 +368,6 @@ sub add_person { print " - " . substr(wrap($multitab, $multitab, $desc), $inner_indent); } print "\n"; - } elsif ($mode eq "TEX") { - $name = $nick if $name eq ""; - $name = html_entities_to_tex($name); - $desc = html_entities_to_tex($desc); - - print " $name & \\textit{$desc}\\\\\n"; } elsif ($mode eq "RTF") { $name = $nick if $name eq ""; $name = html_entities_to_rtf($name); @@ -447,11 +417,6 @@ sub add_paragraph { $tab = " " x ($section_level * 2 + 1); print wrap($tab, $tab, html_entities_to_ascii($text))."\n"; print "\n"; - } elsif ($mode eq "TEX") { - $text = html_entities_to_tex($text); - print '\item' . "\n"; - print $text; - print "\n"; } elsif ($mode eq "RTF") { $text = html_entities_to_rtf($text); # Center text -- cgit v1.2.3 From a08158a004425afb89ca984379c6d27fa71e763b Mon Sep 17 00:00:00 2001 From: Littleboy Date: Fri, 13 May 2011 01:26:52 -0400 Subject: CREATE_PROJECT: Generate a default revision header when no revision can be determined --- devtools/create_project/scripts/revision.vbs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'devtools') diff --git a/devtools/create_project/scripts/revision.vbs b/devtools/create_project/scripts/revision.vbs index 3e1212521c..e6fef57030 100644 --- a/devtools/create_project/scripts/revision.vbs +++ b/devtools/create_project/scripts/revision.vbs @@ -80,6 +80,7 @@ Sub DetermineRevision() If Not DetermineGitVersion() Then If Not DetermineHgVersion() Then Wscript.StdErr.WriteLine "Could not determine the current revision, skipping..." + OutputRevisionHeader "" Exit Sub End If End If @@ -91,6 +92,7 @@ Sub DetermineRevision() If Not DetermineTortoiseSVNVersion() Then If Not DetermineSVNVersion() Then Wscript.StdErr.WriteLine "Could not determine the current revision, skipping..." + OutputRevisionHeader "" Exit Sub End If End If @@ -121,9 +123,13 @@ Sub DetermineRevision() Wscript.StdErr.WriteLine outputInfo & vbCrLf - ' Output revision header file + OutputRevisionHeader revisionString +End Sub + +' Output revision header file +Sub OutputRevisionHeader(str) FSO.CopyFile rootFolder & "\\base\\internal_revision.h.in", targetFolder & "\\internal_revision.h" - FindReplaceInFile targetFolder & "\\internal_revision.h", "@REVISION@", revisionString + FindReplaceInFile targetFolder & "\\internal_revision.h", "@REVISION@", str End Sub Function DetermineTortoiseSVNVersion() -- cgit v1.2.3 From c24f0775cd262c789f7d17ea0ed461c57e7c5f6e Mon Sep 17 00:00:00 2001 From: Littleboy Date: Fri, 13 May 2011 01:27:27 -0400 Subject: CREATE_PROJECT: Handle paths with spaces in pre/post-build scripts --- devtools/create_project/scripts/postbuild.cmd | 8 ++++---- devtools/create_project/scripts/prebuild.cmd | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'devtools') diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd index 75a916db49..a5051d8228 100644 --- a/devtools/create_project/scripts/postbuild.cmd +++ b/devtools/create_project/scripts/postbuild.cmd @@ -37,16 +37,16 @@ REM xcopy /F /Y "%~1/dists/engine-data/*.cpt" %~2 1>NUL 2>&1 REM xcopy /F /Y "%~1/gui/themes/*.zip" %~2 1>NUL 2>&1 REM xcopy /F /Y "%~1/gui/themes/translations.dat" %~2 1>NUL 2>&1 -xcopy /F /Y "%~4/lib/%~3/SDL.dll" %~2 1>NUL 2>&1 -xcopy /F /Y "%~4/README-SDL" %~2 1>NUL 2>&1 +xcopy /F /Y "%~4/lib/%~3/SDL.dll" "%~2" 1>NUL 2>&1 +xcopy /F /Y "%~4/README-SDL" "%~2" 1>NUL 2>&1 -xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" %~2 1>NUL 2>&1 +xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" "%~2" 1>NUL 2>&1 if "%~5"=="0" goto done echo Running installer script echo. -@call cscript "%~1/devtools/create_project/scripts/installer.vbs" %~1 %~2 %~3 1>NUL +@call cscript "%~1/devtools/create_project/scripts/installer.vbs" "%~1" "%~2" "%~3" 1>NUL if not %errorlevel% == 0 goto error_script goto done diff --git a/devtools/create_project/scripts/prebuild.cmd b/devtools/create_project/scripts/prebuild.cmd index dd4d12a851..fbab426137 100644 --- a/devtools/create_project/scripts/prebuild.cmd +++ b/devtools/create_project/scripts/prebuild.cmd @@ -14,7 +14,7 @@ if "%~1"=="" goto error_root if "%~2"=="" goto error_target REM Run the revision script -@call cscript "%~1/devtools/create_project/scripts/revision.vbs" %~1 %~2 1>NUL +@call cscript "%~1/devtools/create_project/scripts/revision.vbs" "%~1" "%~2" 1>NUL if not %errorlevel% == 0 goto error_script goto done -- cgit v1.2.3 From 3c59e37035742ce843f3e12039b5169e4bdd0168 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 15 May 2011 15:50:09 +0100 Subject: ENGINES: Unify engine names This unifies the engine names in MetaEngine::getName() and the credits. In particular drop "Engine" or "engine" from the names when it was present and use expanded names in credits when the MetaEngine uses it (e.g. "Beneath a Steel Sky" instead of "BASS"). --- devtools/credits.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'devtools') diff --git a/devtools/credits.pl b/devtools/credits.pl index 46c75402c1..8d02891576 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -500,7 +500,7 @@ begin_credits("Credits"); add_person("Ludvig Strigeus", "ludde", "(retired)"); end_section(); - begin_section("BASS"); # Beneath a Steel Sky + begin_section("Beneath a Steel Sky"); add_person("Robert Göffringmann", "lavosspawn", "(retired)"); add_person("Oliver Kiehl", "olki", "(retired)"); add_person("Joost Peters", "joostp", ""); @@ -539,7 +539,7 @@ begin_credits("Credits"); add_person("Vincent Hamm", "yaz0r", "(retired)"); end_section(); - begin_section("Draci"); + begin_section("Draci Historie"); add_person("Denis Kasak", "dkasak13", ""); add_person("Robert Špalek", "spalek", ""); end_section(); @@ -549,7 +549,7 @@ begin_credits("Credits"); add_person("Paweł Kołodziejski", "aquadran", ""); end_section(); - begin_section("FOTAQ"); # Flight of the Amazon Queen + begin_section("Flight of the Amazon Queen"); add_person("David Eriksson", "twogood", "(retired)"); add_person("Gregory Montoir", "cyx", ""); add_person("Joost Peters", "joostp", ""); @@ -574,7 +574,7 @@ begin_credits("Credits"); add_person("Eugene Sandulenko", "sev", ""); end_section(); - begin_section("Kyra"); + begin_section("Legend of Kyrandia"); add_person("Torbjörn Andersson", "eriktorbjorn", "VQA Player"); add_person("Oystein Eftevaag", "vinterstum", ""); add_person("Florian Kagerer", "athrxx", ""); @@ -588,7 +588,7 @@ begin_credits("Credits"); add_person("Julien Templier", "littleboy", ""); end_section(); - begin_section("Lure"); + begin_section("Lure of the Temptress"); add_person("Paul Gilbert", "dreammaster", ""); end_section(); @@ -636,7 +636,7 @@ begin_credits("Credits"); add_person("Lars Skovlund", "lskovlun", ""); end_section(); - begin_section("TeenAgent"); + begin_section("Teen Agent"); add_person("Robert Megone", "sanguine", "Help with callback rewriting"); add_person("Vladimir Menshakov", "whoozle", ""); end_section(); -- cgit v1.2.3 From 3062681eb592fbe7b688e0378d3260e171d43837 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Mon, 16 May 2011 23:56:12 +0100 Subject: KYRA: Change engine name to Kyra --- devtools/credits.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/credits.pl b/devtools/credits.pl index 8d02891576..b50ea2e18b 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -574,7 +574,7 @@ begin_credits("Credits"); add_person("Eugene Sandulenko", "sev", ""); end_section(); - begin_section("Legend of Kyrandia"); + begin_section("Kyra"); add_person("Torbjörn Andersson", "eriktorbjorn", "VQA Player"); add_person("Oystein Eftevaag", "vinterstum", ""); add_person("Florian Kagerer", "athrxx", ""); -- cgit v1.2.3 From 143f9de38ad61e2917be123ec28557ed5c816482 Mon Sep 17 00:00:00 2001 From: strangerke Date: Tue, 17 May 2011 21:51:26 +0200 Subject: CREDITS: retire Kirben --- devtools/credits.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'devtools') diff --git a/devtools/credits.pl b/devtools/credits.pl index b50ea2e18b..f515844e4d 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -467,7 +467,7 @@ begin_credits("Credits"); add_person("Jonathan Gray", "khalek", "(retired)"); add_person("Vincent Hamm", "yaz0r", "(retired)"); add_person("Max Horn", "Fingolfin", ""); - add_person("Travis Howell", "Kirben", ""); + add_person("Travis Howell", "Kirben", "(retired)"); add_person("Paweł Kołodziejski", "aquadran", "Codecs, iMUSE, Smush, etc."); add_person("Gregory Montoir", "cyx", ""); add_person("Eugene Sandulenko", "sev", "FT INSANE, MM NES, MM C64, game detection, Herc/CGA"); @@ -476,7 +476,7 @@ begin_credits("Credits"); begin_section("HE"); add_person("Jonathan Gray", "khalek", "(retired)"); - add_person("Travis Howell", "Kirben", ""); + add_person("Travis Howell", "Kirben", "(retired)"); add_person("Gregory Montoir", "cyx", ""); add_person("Eugene Sandulenko", "sev", ""); end_section(); @@ -495,7 +495,7 @@ begin_credits("Credits"); begin_section("AGOS"); add_person("Torbjörn Andersson", "eriktorbjorn", ""); add_person("Paul Gilbert", "dreammaster", ""); - add_person("Travis Howell", "Kirben", ""); + add_person("Travis Howell", "Kirben", "(retired)"); add_person("Oliver Kiehl", "olki", "(retired)"); add_person("Ludvig Strigeus", "ludde", "(retired)"); end_section(); @@ -873,7 +873,7 @@ begin_credits("Credits"); end_section(); begin_section("Win32"); - add_person("Travis Howell", "Kirben", ""); + add_person("Travis Howell", "Kirben", "(retired)"); end_section(); begin_section("Win64"); -- cgit v1.2.3