diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | base/internal_version.h | 1 | ||||
| -rw-r--r-- | base/internal_version.h.in | 1 | ||||
| -rw-r--r-- | base/main.cpp | 5 | ||||
| -rw-r--r-- | dists/macosx/Info.plist (renamed from Info.plist) | 8 | ||||
| -rw-r--r-- | dists/macosx/Info.plist.in | 32 | ||||
| -rw-r--r-- | dists/redhat/scummvm.spec | 2 | ||||
| -rw-r--r-- | dists/redhat/scummvm.spec.in | 156 | ||||
| -rw-r--r-- | scummvm.rc | 4 | ||||
| -rw-r--r-- | scummvm.rc.in | 37 | ||||
| -rwxr-xr-x | tools/update-version.pl | 74 |
12 files changed, 312 insertions, 11 deletions
@@ -95,7 +95,7 @@ bundle: scummvm-static mkdir -p $(bundle_name)/Contents/MacOS mkdir -p $(bundle_name)/Contents/Resources echo "APPL????" > $(bundle_name)/Contents/PkgInfo - cp $(srcdir)/Info.plist $(bundle_name)/Contents/ + cp $(srcdir)/dists/macosx/Info.plist $(bundle_name)/Contents/ cp $(srcdir)/scummvm.icns $(bundle_name)/Contents/Resources/ cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm $(srcdir)/tools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf @@ -1,6 +1,5 @@ ScummVM README Last updated: $Date$ -Release version: 0.9.0-CVS ------------------------------------------------------------------------ For more information, compatibility lists, details on donating, the latest diff --git a/base/internal_version.h b/base/internal_version.h new file mode 100644 index 0000000000..1634c04d2c --- /dev/null +++ b/base/internal_version.h @@ -0,0 +1 @@ +#define SCUMMVM_VERSION "0.9.0cvs" diff --git a/base/internal_version.h.in b/base/internal_version.h.in new file mode 100644 index 0000000000..c994f24156 --- /dev/null +++ b/base/internal_version.h.in @@ -0,0 +1 @@ +#define SCUMMVM_VERSION "@VERSION@" diff --git a/base/main.cpp b/base/main.cpp index 8ede678bb6..84b26599af 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -32,6 +32,7 @@ #include "base/engine.h" #include "base/gameDetector.h" #include "base/plugins.h" +#include "base/internal_version.h" #include "base/version.h" #include "common/config-manager.h" #include "common/file.h" @@ -93,9 +94,9 @@ * to setup, but I have no idea if/how one can also change files which are not * currently being commit'ed. */ -const char *gScummVMVersion = "0.9.0CVS"; +const char *gScummVMVersion = SCUMMVM_VERSION; const char *gScummVMBuildDate = __DATE__ " " __TIME__; -const char *gScummVMFullVersion = "ScummVM 0.9.0CVS (" __DATE__ " " __TIME__ ")"; +const char *gScummVMFullVersion = "ScummVM " SCUMMVM_VERSION " (" __DATE__ " " __TIME__ ")"; const char *gScummVMFeatures = "" #ifdef USE_TREMOR "Tremor " diff --git a/Info.plist b/dists/macosx/Info.plist index e6b4999ec1..e968b552a8 100644 --- a/Info.plist +++ b/dists/macosx/Info.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>scummvm</string> <key>CFBundleGetInfoString</key> - <string>0.9.0CVS, Copyright 2001-2005 The ScummVM team</string> + <string>0.9.0cvs, Copyright 2001-2006 The ScummVM team</string> <key>CFBundleIconFile</key> <string>scummvm.icns</string> <key>CFBundleIdentifier</key> @@ -21,12 +21,12 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.9.0CVS</string> + <string>0.9.0cvs</string> <key>CFBundleVersion</key> - <string>0.9.0CVS</string> + <string>0.9.0cvs</string> <key>NSPrincipalClass</key> <string>NSApplication</string> <key>NSHumanReadableCopyright</key> - <string>Copyright 2001-2005 The ScummVM team</string> + <string>Copyright 2001-2006 The ScummVM team</string> </dict> </plist> diff --git a/dists/macosx/Info.plist.in b/dists/macosx/Info.plist.in new file mode 100644 index 0000000000..77095f6ff6 --- /dev/null +++ b/dists/macosx/Info.plist.in @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleDisplayName</key> + <string>ScummVM</string> + <key>CFBundleExecutable</key> + <string>scummvm</string> + <key>CFBundleGetInfoString</key> + <string>@VERSION@, Copyright 2001-2006 The ScummVM team</string> + <key>CFBundleIconFile</key> + <string>scummvm.icns</string> + <key>CFBundleIdentifier</key> + <string>org.scummvm.scummvm</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>ScummVM</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>@VERSION@</string> + <key>CFBundleVersion</key> + <string>@VERSION@</string> + <key>NSPrincipalClass</key> + <string>NSApplication</string> + <key>NSHumanReadableCopyright</key> + <string>Copyright 2001-2006 The ScummVM team</string> +</dict> +</plist> diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec index 4a618aa421..c9535256eb 100644 --- a/dists/redhat/scummvm.spec +++ b/dists/redhat/scummvm.spec @@ -7,7 +7,7 @@ # Prologue information #------------------------------------------------------------------------------ Name : scummvm -Version : 0.8.0 +Version : 0.9.0cvs Release : 1 Summary : Graphic adventure game interpreter Group : Interpreters diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in new file mode 100644 index 0000000000..8cd853e98b --- /dev/null +++ b/dists/redhat/scummvm.spec.in @@ -0,0 +1,156 @@ +#------------------------------------------------------------------------------ +# scummvm.spec +# This SPEC file controls the building of ScummVM RPM packages. +#------------------------------------------------------------------------------ + +#------------------------------------------------------------------------------ +# Prologue information +#------------------------------------------------------------------------------ +Name : scummvm +Version : @VERSION@ +Release : 1 +Summary : Graphic adventure game interpreter +Group : Interpreters +License : GPL + +Url : http://www.scummvm.org + +Source : %{name}-%{version}.tar.bz2 +Source1 : libmad-0.15.1b.tar.bz2 +Source2 : mpeg2dec-0.4.0b.tar.bz2 +BuildRoot : %{_tmppath}/%{name}-%{version}-root + +BuildRequires: desktop-file-utils +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: flac-devel +BuildRequires: zlib-devel +BuildRequires: nasm +BuildRequires: SDL-devel >= 1.2.2 + +#------------------------------------------------------------------------------ +# Description +#------------------------------------------------------------------------------ +%description +ScummVM is an interpreter that will play graphic adventure games written for +LucasArts' SCUMM virtual machine, Adventure Soft's Simon the Sorcerer 1 and 2, +Revolution Software Ltd's Beneath a Steel Sky and Renegade Software's +Flight of the Amazon Queen. It uses the SDL library for outputting graphics. + +#------------------------------------------------------------------------------ +# install scripts +#------------------------------------------------------------------------------ +%prep +%setup -q -a 1 -a 2 -n scummvm-%{version} +mkdir tmp + +%build +(cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) +(cd mpeg2dec-0.4.0; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) +./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-mpeg2-prefix=%{_builddir}/scummvm-%{version}/tmp +make + +%install +install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm +install -m644 -D scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6 +install -m644 -D scummvm.xpm %{buildroot}%{_datadir}/pixmaps/scummvm.xpm +desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications scummvm.desktop + +%clean +rm -Rf ${RPM_BUILD_ROOT} + +#------------------------------------------------------------------------------ +# Files listing. +#------------------------------------------------------------------------------ +%files +%defattr(0644,root,root,0755) +%doc AUTHORS README NEWS COPYING +%attr(0755,root,root)%{_bindir}/scummvm +%{_datadir}/applications/* +%{_datadir}/pixmaps/scummvm.xpm +%{_mandir}/man6/scummvm.6* + +#------------------------------------------------------------------------------ +# Change Log +#------------------------------------------------------------------------------ +%changelog +* Mon Dec 20 2004 (0.7.0) + - added AUTHORS file +* Thu Jul 15 2004 (0.6.0-2) + - added .desktop file (modified from patch 891909) + - used some elements of the .spec file for scummvm from http://livna.org/ +* Mon Mar 15 2004 (0.6.0) + - included libmad and libmpeg2 +* Sat Aug 02 2003 (0.5.0) + - Enhanced versions of Maniac Mansion and Zak McKracken are now supported and completable + - Beneath A Steel Sky is now supported and completable + - Added support for Amiga version of Monkey Island 1 + - Initial unplayable support for V1 version of Maniac Mansion/Zak McKracken + - Curse of Monkey Island (COMI) support for playing from CD improved on Mac OS X + - Loading COMI savegames for disk 2 doesn't anymore require disk 1 first + - Rewritten iMUSE enginee, and many Music fixes (exp. Monkey Island 2) + - Support for music in Humongous games and simon2dos/simon2talkie (XMIDI format) + - Support for music in simon1demo (Proprietary format) + - Complete music support for Simon the Sorcerer 2 + - Improved music and sound support in Zak256 + - Added Aspect Ratio option + - Many other bug fixes, improvements and optimisations +* Sun May 25 2003 (0.4.1) + - Added AdvMame3x filter + - Fixed crash in Curse of Monkey Island (and possibly other games as well) + - Fixed airport doors in Zak256 + - Fixed crash in SDL backend + - Fixed various iMuse bugs +* Sun May 11 2003 (0.4.0) + - Curse of Monkey Island (comi) support (experimental) + - Added support for the EGA versions of Loom, Monkey Island and Indy3 + - Improved music support in Indy3 and the floppy versions of Monkey Islands + - Many Simon the Sorcerer 1 & 2 improvements and fixes + - Very pre-alpha Beneath a Steel Sky code. Don't expect it to do anything. + - Even more pre-alpha support for V2 SCUMM games (Maniac Mansion and Zak) + - Preliminary support for early Humongous Entertainment titles (very experimental) + - New debug console and several GUI/Launcher enhancements + - New Save/Load code (easier to expand while retaining compatibility) + - DreamCast port now works with new games added for 0.3.0b + - New official PalmOS port + - Various minor and not so minor SCUMM game fixes + - Large memory leak fixed for The Dig/ComI + - SMUSH code optimised, frame dropping added for slower machines + - Code cleanups +* Sun Dec 01 2002 (0.3.0) + - massive cleanup work for iMUSE. Sam and Max music now plays correctly + - many bugfixes for Zak256, + sound and music support + - music support for Simon the Sorcerer on any platform with real MIDI + - experimental support for Indy3 (VGA) - Indiana Jones + Last Crusade + - completed support for Monkey1 VGA Floppy, The Dig + - added akos16 implementation for The Dig and Full Throttle costumes + - added digital iMUSE implementation for The Dig and Full Throttle music. + - Loom CD speech+music syncronisation improved greatly + - added midi-emulation via adlib, for platforms without sequencer support + - code separation of various engine parts into several libraries + - several fixes to prevent Simon the Sorcerer crashing and hanging + - hundreds of bugfixes for many other games + - new SMUSH video engine, for Full Throttle and The Dig + - new in-game GUI + - launcher dialog +* Sun Apr 14 2002 (0.2.0) + - core engine rewrite + - enhanced ingame GUI, including options/volume settings. + - auto-save feature + - added more command-line options, and configuration file + - new ports and platforms (MorphOS, Macintosh, Dreamcast, Solaris, IRIX, etc) + - graphics filtering added (2xSAI, Super2xSAI, SuperEagle, AdvMame2x) + - support for MAD MP3 compressed audio + - support for first non-SCUMM games (Simon the Sorcerer) + - support for V4 games (Loom CD) + - enhanced V6 game support (Sam and Max is now completable) + - experimental support for V7 games (Full Throttle/The Dig) + - experimental support for V3 games (Zak256/Indy3) +* Sun Jan 13 2002 (0.1.0) + - loads of changes +* Fri Oct 12 2001 (0.0.2) + - bug fixes + - save & load support +* Mon Oct 8 2001 (0.0.1) + - initial version + diff --git a/scummvm.rc b/scummvm.rc index 164febbbfb..ee85cfc4fc 100644 --- a/scummvm.rc +++ b/scummvm.rc @@ -21,13 +21,13 @@ BEGIN BEGIN VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0" VALUE "FileDescription", "http://www.scummvm.org/\0" - VALUE "FileVersion", "0.9.0CVS\0" + VALUE "FileVersion", "0.9.0cvs\0" VALUE "InternalName", "scummvm\0" VALUE "LegalCopyright", "Copyright © 2001-2005 The ScummVM Team\0" VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0" VALUE "OriginalFilename", "scummvm.exe\0" VALUE "ProductName", "ScummVM\0" - VALUE "ProductVersion", "0.9.0CVS\0" + VALUE "ProductVersion", "0.9.0cvs\0" END END BLOCK "VarFileInfo" diff --git a/scummvm.rc.in b/scummvm.rc.in new file mode 100644 index 0000000000..a2cc32bc73 --- /dev/null +++ b/scummvm.rc.in @@ -0,0 +1,37 @@ +#include "winresrc.h" + +IDI_ICON ICON DISCARDABLE "scummvm.ico" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0 + PRODUCTVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0" + VALUE "FileDescription", "http://www.scummvm.org/\0" + VALUE "FileVersion", "@VERSION@\0" + VALUE "InternalName", "scummvm\0" + VALUE "LegalCopyright", "Copyright © 2001-2005 The ScummVM Team\0" + VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0" + VALUE "OriginalFilename", "scummvm.exe\0" + VALUE "ProductName", "ScummVM\0" + VALUE "ProductVersion", "@VERSION@\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/tools/update-version.pl b/tools/update-version.pl new file mode 100755 index 0000000000..08ab9ec3aa --- /dev/null +++ b/tools/update-version.pl @@ -0,0 +1,74 @@ +#!/usr/bin/perl + +# +# This script is a hack to update the ScummVM version in all (?) files that +# contain it. Obviously, it should be used before a release. + +use strict; + +if ($#ARGV+1 < 3 or $#ARGV+1 > 4) { + # TODO: Allow the user to specify the version as "1.2.3cvs" + # and automatically split that into 1, 2, 3, cvs + print STDERR "Usage: $0 MAJOR MINOR PATCH [EXTRA]\n"; + print STDERR " TODO\n"; + exit 1; +} + +# TODO: Verify that major/minor/patch are actually numbers +my $VER_MAJOR = $ARGV[0]; +my $VER_MINOR = $ARGV[1]; +my $VER_PATCH = $ARGV[2]; +my $VER_EXTRA = $ARGV[3]; +my $VERSION = "$VER_MAJOR.$VER_MINOR.$VER_PATCH$VER_EXTRA"; + +die "MAJOR must be a natural number\n" unless ($VER_MAJOR =~ /^\d+$/); +die "MINOR must be a natural number\n" unless ($VER_MINOR =~ /^\d+$/); +die "PATCH must be a natural number\n" unless ($VER_PATCH =~ /^\d+$/); + + +print "Setting version to '$VERSION'\n"; + + +# List of the files in which we need to perform substitution. +my @subs_files = qw( + scummvm.rc + base/internal_version.h + dists/macosx/Info.plist + dists/redhat/scummvm.spec + ); + +# The following files also contain version data and should possible be modified +# by this script, too. However, the relevant parts of these documentation files +# talk about "Known issues", and I am not sure if we really should automatically +# update these... in fact, it might be better to factor out that information and +# put it into a single "ISSUES" or "KNOWN_ISSUES" file like other projects do... +# * README +# * doc/03_10.tex / doc/03_11.tex (depends on which branch you look at <shudder>) + +# TODO: The following substituion table could easily be extended. In particular +# one could add a function similar to autoconf's AC_SUBST: +# addSubst(FOO) +# which would automagically add FOO => $FOO to the table +my %subs = ( + VER_MAJOR => $VER_MAJOR, + VER_MINOR => $VER_MINOR, + VER_PATCH => $VER_PATCH, + VER_EXTRA => $VER_EXTRA, + VERSION => $VERSION + ); + +foreach my $file (@subs_files) { + print "Processing $file...\n"; + open(INPUT, "< $file.in") or die "Can't open '$file.in' for reading: $!\n"; + open(OUTPUT, "> $file") or die "Can't open '$file' for writing: $!\n"; + + while (<INPUT>) { + while (my ($key, $value) = each(%subs)) { + s/\@$key\@/$value/; + } + print OUTPUT; + } + + close(INPUT); + close(OUTPUT); +} |