From 43c0556f3739ef7b6c51a9e885e82e1bc73c7878 Mon Sep 17 00:00:00 2001 From: stephena Date: Thu, 18 Jun 2009 17:38:42 +0000 Subject: [PATCH] Updated documentation for recent Win32 APPDATA changes. Bumped version info for impending release. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1779 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- Announce.txt | 20 ++++++++++---------- Changes.txt | 11 +++++++++++ Readme.txt | 4 ++-- debian/changelog | 7 +++++++ docs/index.html | 14 +++++++------- src/common/Version.hxx | 2 +- src/emucore/OSystem.hxx | 2 +- src/gui/FileSnapDialog.cxx | 2 -- src/macosx/Info-StellaOSX__Upgraded_.plist | 6 +++--- src/unix/stella.SlackBuild | 2 +- src/unix/stella.spec | 5 ++++- src/win32/HomeFinder.hxx | 5 +++++ src/win32/stella.iss | 12 ++++++------ src/win32/stella.rc | 8 ++++---- 14 files changed, 62 insertions(+), 38 deletions(-) diff --git a/Announce.txt b/Announce.txt index cfc0d6da7..12e2a6720 100644 --- a/Announce.txt +++ b/Announce.txt @@ -9,7 +9,7 @@ SSSS ttt eeeee llll llll aaaaa =============================================================================== - Release 2.8 for Linux, Mac OSX and Windows + Release 2.8.1 for Linux, Mac OSX and Windows =============================================================================== The Atari 2600 Video Computer System (VCS), introduced in 1977, was the most @@ -21,25 +21,25 @@ of your favorite Atari 2600 games again! Stella was originally developed for Linux by Bradford W. Mott, however, it has been ported to a number of other platforms. -This is the 2.8 release of Stella for Linux, Mac OSX and Windows. +This is the 2.8.1 release of Stella for Linux, Mac OSX and Windows. Distributions for other operating systems will appear as they become available. The distributions currently available are: - * Binary distribution in 32-bit RPM format for Linux (stella-2.8-1.i586.rpm) + * Binary distribution in 32-bit RPM format for Linux (stella-2.8.1-1.i586.rpm) - * Binary distribution in 32-bit Ubuntu DEB format (stella_2.8-1_i386.deb) + * Binary distribution in 32-bit Ubuntu DEB format (stella_2.8.1-1_i386.deb) - * Binary distribution in 64-bit Ubuntu DEB format (stella_2.8-1_amd64.deb) + * Binary distribution in 64-bit Ubuntu DEB format (stella_2.8.1-1_amd64.deb) - * Binary distribution for Mac OSX (StellaOSX2.8.dmg.gz) + * Binary distribution for Mac OSX (StellaOSX2.8.1.dmg.gz) - * Binary installer (exe) for Windows (stella-2.8-win32.exe) + * Binary installer (exe) for Windows (stella-2.8.1-win32.exe) - * Binary zip for Windows (stella-2.8-win32.zip) + * Binary zip for Windows (stella-2.8.1-win32.zip) - * Binary zip for 64-bit Windows (stella-2.8-win64.zip) + * Binary zip for 64-bit Windows (stella-2.8.1-win64.zip) - * Source code distribution for all platforms (stella-2.8-src.tar.gz) + * Source code distribution for all platforms (stella-2.8.1-src.tar.gz) PLEASE DO NOT WRITE ASKING FOR ROM IMAGES TO USE WITH STELLA! ALL SUCH REQUESTS WILL BE IGNORED! diff --git a/Changes.txt b/Changes.txt index 989b0e96b..5292d1c8c 100644 --- a/Changes.txt +++ b/Changes.txt @@ -14,6 +14,10 @@ 2.8 to 2.8.1: (June 19, 2009) + * NOTE: Windows users will have to reset their options or manually move + their config folder in this release, since the location of the config + files has changed. + * Fixed OpenGL issue for some Windows users whereby the OpenGL TV effects weren't available, even if the available version of OpenGL was sufficient. Related to this, the OpenGL version found by @@ -34,6 +38,13 @@ * Tweaked PAL autodetection; it was marking some PAL ROMs as NTSC. + * Changed default location for Stella config files in Windows to + the users' APPDATA folder (for XP and Vista, this is + '~/Application Data/Stella'). The '~' symbol now represents the + users PROFILE/home directory, matching its usage in Linux and OSX. + The ability to override this with 'basedir.txt' is still + available, but not advised. + * Changed '-exitlauncher' commandline argument to '-uselauncher'. This works as before except the launcher is never used at all if the option is set to false. diff --git a/Readme.txt b/Readme.txt index 4dea00792..55e65cdfb 100644 --- a/Readme.txt +++ b/Readme.txt @@ -1,4 +1,4 @@ -This is release 2.8 of Stella. Stella is a multi-platform Atari 2600 VCS +This is release 2.8.1 of Stella. Stella is a multi-platform Atari 2600 VCS emulator which allows you to play all of your favorite Atari 2600 games on your PC. You'll find the Stella Users Manual in the docs subdirectory. If you'd like to verify that you have the latest release of Stella visit @@ -9,4 +9,4 @@ the Stella Website at: Enjoy, The Stella Team -June 9, 2009 +June 19, 2009 diff --git a/debian/changelog b/debian/changelog index 8dc9f8e49..79033538b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +stella (2.8.1-1) stable; urgency=low + + * Version 2.8.1 release + + -- Stephen Anthony Fri, 19 June 2009 18:38:25 +0200 + + stella (2.8-1) stable; urgency=low * Version 2.8 release diff --git a/docs/index.html b/docs/index.html index a7a46c691..b6ade02c3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -10,7 +10,7 @@

A multi-platform Atari 2600 VCS emulator

-

Release 2.8

+

Release 2.8.1



User's Guide

@@ -2289,8 +2289,8 @@ Windows - %MY_DOCUMENTS%\Stella\atarivox_eeprom.dat
- %MY_DOCUMENTS%\Stella\savekey_eeprom.dat    + %APPDATA%\Stella\atarivox_eeprom.dat
+ %APPDATA%\Stella\savekey_eeprom.dat    OR
_BASEDIR_\atarivox_eeprom.dat
_BASEDIR_\savekey_eeprom.dat
 @@ -2410,7 +2410,7 @@ Windows - %MY_DOCUMENTS%\Stella\stella.ini    + %APPDATA%\Stella\stella.ini    OR
_BASEDIR_\stella.ini    (if a file named 'basedir.txt' exists in the application @@ -2512,7 +2512,7 @@ Ms Pac-Man (Stella extended codes): Windows - %MY_DOCUMENTS%\Stella\stella.cht    + %APPDATA%\Stella\stella.cht    OR
_BASEDIR_\stella.cht    (if a file named 'basedir.txt' exists in the application @@ -2767,7 +2767,7 @@ Ms Pac-Man (Stella extended codes): Windows - %MY_DOCUMENTS%\Stella\stella.pro    + %APPDATA%\Stella\stella.pro    OR
_BASEDIR_\stella.pro    (if a file named 'basedir.txt' exists in the application @@ -2836,7 +2836,7 @@ Ms Pac-Man (Stella extended codes): Windows - %MY_DOCUMENTS%\Stella\stella.pal    + %APPDATA%\Stella\stella.pal    OR
_BASEDIR_\stella.pal    (if a file named 'basedir.txt' exists in the application diff --git a/src/common/Version.hxx b/src/common/Version.hxx index 91d0c478e..fe7522bed 100644 --- a/src/common/Version.hxx +++ b/src/common/Version.hxx @@ -19,7 +19,7 @@ #ifndef VERSION_HXX #define VERSION_HXX -#define STELLA_BASE_VERSION "2.8.1_svn" +#define STELLA_BASE_VERSION "2.8.1" #ifdef NIGHTLY_BUILD #define STELLA_VERSION STELLA_BASE_VERSION "pre-" NIGHTLY_BUILD diff --git a/src/emucore/OSystem.hxx b/src/emucore/OSystem.hxx index db42b2b4e..2cc6b5c87 100644 --- a/src/emucore/OSystem.hxx +++ b/src/emucore/OSystem.hxx @@ -491,7 +491,7 @@ class OSystem private: enum { kNumUIPalettes = 2 }; - string myBaseDir, myBaseDirExpanded; + string myBaseDir; string myStateDir; string mySnapshotDir; string myEEPROMDir; diff --git a/src/gui/FileSnapDialog.cxx b/src/gui/FileSnapDialog.cxx index a67f335e8..da58cc076 100644 --- a/src/gui/FileSnapDialog.cxx +++ b/src/gui/FileSnapDialog.cxx @@ -199,8 +199,6 @@ void FileSnapDialog::setDefaults() { FilesystemNode node; string basedir = instance().baseDir(); - - const char* end = basedir.c_str() + basedir.length(); if(basedir.compare(basedir.length()-1, 1, BSPF_PATH_SEPARATOR, 0, 1) != 0) basedir.append(BSPF_PATH_SEPARATOR); diff --git a/src/macosx/Info-StellaOSX__Upgraded_.plist b/src/macosx/Info-StellaOSX__Upgraded_.plist index 7238ac142..0e59f1a40 100644 --- a/src/macosx/Info-StellaOSX__Upgraded_.plist +++ b/src/macosx/Info-StellaOSX__Upgraded_.plist @@ -33,7 +33,7 @@ CFBundleExecutable StellaOSX CFBundleGetInfoString - StellaOSX 2.8 + StellaOSX 2.8.1 CFBundleHelpBookFolder docs CFBundleHelpBookName @@ -45,13 +45,13 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - StellaOSX 2.8 + StellaOSX 2.8.1 CFBundlePackageType APPL CFBundleSignature StLa CFBundleVersion - StellaOSX 2.8 + StellaOSX 2.8.1 NSMainNibFile SDLMain.nib NSPrincipalClass diff --git a/src/unix/stella.SlackBuild b/src/unix/stella.SlackBuild index d6f1dad65..ae849132d 100644 --- a/src/unix/stella.SlackBuild +++ b/src/unix/stella.SlackBuild @@ -13,7 +13,7 @@ die() { exit 1 } -VERSION=2.8 +VERSION=2.8.1 ARCH=${ARCH-i486} BUILD=1 diff --git a/src/unix/stella.spec b/src/unix/stella.spec index 5eb69d4c4..f08072e60 100644 --- a/src/unix/stella.spec +++ b/src/unix/stella.spec @@ -1,5 +1,5 @@ %define name stella -%define version 2.8 +%define version 2.8.1 %define rel 1 %define enable_gl 1 @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %_datadir/icons/large/%{name}.png %changelog +* Fri Jun 19 2009 Stephen Anthony 2.8.1-1 +- Version 2.8.1 release + * Tue Jun 9 2009 Stephen Anthony 2.8-1 - Version 2.8 release diff --git a/src/win32/HomeFinder.hxx b/src/win32/HomeFinder.hxx index a0f80c231..6497d17ed 100644 --- a/src/win32/HomeFinder.hxx +++ b/src/win32/HomeFinder.hxx @@ -16,6 +16,9 @@ // $Id$ //============================================================================ +#ifndef __HOME_FINDER_ +#define __HOME_FINDER_ + #include /* @@ -76,3 +79,5 @@ class HomeFinder HMODULE myFolderModule; function_pointer myFolderPathFunc; }; + +#endif diff --git a/src/win32/stella.iss b/src/win32/stella.iss index 3e6c80186..aa8d02651 100755 --- a/src/win32/stella.iss +++ b/src/win32/stella.iss @@ -3,14 +3,14 @@ [Setup] AppName=Stella -AppVerName=Stella 2.8 +AppVerName=Stella 2.8.1 AppPublisher=Bradford W. Mott and the Stella team AppPublisherURL=http://stella.sourceforge.net AppSupportURL=http://stella.sourceforge.net AppUpdatesURL=http://stella.sourceforge.net DefaultDirName={pf}\Stella DefaultGroupName=Stella -OutputBaseFilename=stella-2.8-win32 +OutputBaseFilename=stella-2.8.1-win32 Compression=lzma SolidCompression=yes @@ -21,10 +21,10 @@ Name: "eng"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "..\..\stella-2.8\Stella.exe"; DestDir: "{app}"; Flags: ignoreversion -;Source: "..\..\stella-2.8\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\stella-2.8\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\stella-2.8\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\..\stella-2.8.1\Stella.exe"; DestDir: "{app}"; Flags: ignoreversion +;Source: "..\..\stella-2.8.1\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\stella-2.8.1\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\stella-2.8.1\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/src/win32/stella.rc b/src/win32/stella.rc index 1d39e4835..f16669e56 100755 --- a/src/win32/stella.rc +++ b/src/win32/stella.rc @@ -28,8 +28,8 @@ IDI_ICON ICON "stella.ico" // Version // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,0,0 - PRODUCTVERSION 2,8,0,0 + FILEVERSION 2,8,1,0 + PRODUCTVERSION 2,8,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,12 +47,12 @@ BEGIN VALUE "Comments", "The multi-platform Atari 2600 emulator. Stella is released under the GPL." VALUE "CompanyName", "Bradford W. Mott and the Stella team (http://stella.sourceforge.net)" VALUE "FileDescription", "Stella" - VALUE "FileVersion", "2.8" + VALUE "FileVersion", "2.8.1" VALUE "InternalName", "Stella" VALUE "LegalCopyright", "Copyright (C) 1995-2009 B. Mott & the Stella team" VALUE "OriginalFilename", "Stella.exe" VALUE "ProductName", "Stella" - VALUE "ProductVersion", "2.8" + VALUE "ProductVersion", "2.8.1" END END BLOCK "VarFileInfo"