Fixed bug in handling '~' character, do immediate 3.7.2 release.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2537 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

Announce.txt

@@ -9,7 +9,7 @@
      SSSS     ttt  eeeee llll llll  aaaaa
 
 ===========================================================================
-                Release 3.7.1 for Linux, MacOSX and Windows
+                Release 3.7.2 for Linux, MacOSX and Windows
 ===========================================================================
 
 The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
@@ -21,28 +21,28 @@ all of your favourite 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 and is currently maintained by Stephen Anthony.
 
-This is the 3.7.1 release of Stella for Linux, Mac OSX and Windows.  The
+This is the 3.7.2 release of Stella for Linux, Mac OSX and Windows.  The
 distributions currently available are:
 
   * Binaries for Windows XP/Vista/7 :
-      Stella-3.7.1-win32.exe   (32-bit EXE installer)
+      Stella-3.7.2-win32.exe   (32-bit EXE installer)
-      Stella-3.7.1-x64.exe     (64-bit EXE installer)
+      Stella-3.7.2-x64.exe     (64-bit EXE installer)
-      Stella-3.7.1-windows.zip (32/64 bit versions)
+      Stella-3.7.2-windows.zip (32/64 bit versions)
 
   * Binary distribution for MacOS X 32-bit & 64-bit :
-      Stella-3.7.1-macosx.dmg (32-bit Universal Binary)
+      Stella-3.7.2-macosx.dmg (32-bit Universal Binary)
-      Stella-3.7.1_intel-macosx.dmg (32/64-bit Intel/OSX 10.6+)
+      Stella-3.7.2_intel-macosx.dmg (32/64-bit Intel/OSX 10.6+)
 
   * Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
-      stella_3.7.1-1_i386.deb
+      stella_3.7.2-1_i386.deb
-      stella_3.7.1-1_amd64.deb
+      stella_3.7.2-1_amd64.deb
 
   * Binary distribution in 32-bit & 64-bit RPM format :
-      stella-3.7.1-2.i386.rpm
+      stella-3.7.2-2.i386.rpm
-      stella-3.7.1-2.x86_64.rpm
+      stella-3.7.2-2.x86_64.rpm
 
   * Source code distribution for all platforms :
-      stella-3.7.1-src.tar.gz
+      stella-3.7.2-src.tar.gz
 
 
 Distribution Site

Changes.txt

@@ -12,6 +12,14 @@
                                Release History
 ===========================================================================
 
+3.7.1 to 3.7.2: (June 10, 2012)
+
+  * Fixed bug in handling filenames with the '~' character, as is used
+    extensively by RomHunter rom-sets.
+
+-Have fun!
+
+
 3.7 to 3.7.1: (June 8, 2012)
 
   * Note: because of TIA changes, the state file format has changed again,
@@ -39,8 +47,6 @@
     introduced in the last release.  The new functionality should be much
     more robust.
 
--Have fun!
-
 
 3.6.1 to 3.7: (June 1, 2012)
 

Readme.txt

@@ -1,4 +1,4 @@
-This is release 3.7.1 of Stella.  Stella is a multi-platform Atari 2600 VCS
+This is release 3.7.2 of Stella.  Stella is a multi-platform Atari 2600 VCS
 emulator which allows you to play all of your favourite 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 8, 2012
+June 10, 2012

debian/changelog

@@ -1,3 +1,10 @@
+stella (3.7.2-1) stable; urgency=high
+
+  * Version 3.7.2 release
+
+ -- Stephen Anthony <stephena@users.sf.net>  Sun, 10 Jun 2012 18:38:25 +0200
+
+
 stella (3.7.1-1) stable; urgency=high
 
   * Version 3.7.1 release

docs/index.html

@@ -10,7 +10,7 @@
   <br><br>
   <center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center>
 
-  <center><h4><b>Release 3.7.1</b></h4></center>
+  <center><h4><b>Release 3.7.2</b></h4></center>
   <br><br>
 
   <center><h2><b>User's Guide</b></h2></center>

src/common/Version.hxx

@@ -22,7 +22,7 @@
 
 #include <cstdlib>
 
-#define STELLA_VERSION "3.7.1"
+#define STELLA_VERSION "3.7.2"
 #define STELLA_BUILD atoi("$Rev$" + 6)
 
 #endif

src/macosx/Info-Stella.plist

@@ -53,7 +53,7 @@
 	<key>CFBundleSignature</key>
 	<string>StLa</string>
 	<key>CFBundleVersion</key>
-	<string>3.7.1</string>
+	<string>3.7.2</string>
 	<key>NSMainNibFile</key>
 	<string>SDLMain.nib</string>
 	<key>NSPrincipalClass</key>

src/unix/FSNodePOSIX.cxx

@@ -142,10 +142,11 @@ POSIXFilesystemNode::POSIXFilesystemNode()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 POSIXFilesystemNode::POSIXFilesystemNode(const string& p, bool verify)
 {
+  // Default to home directory
+  _path = p.length() > 0 ? p : "~";
+
   // Expand '~' to the HOME environment variable
-  _path = p;
+  if(_path[0] == '~')
-  size_t home_pos = _path.find_first_of("~");
-  if(home_pos != string::npos)
   {
     const char* home = getenv("HOME");
 #ifdef MAXPATHLEN
@@ -154,7 +155,7 @@ POSIXFilesystemNode::POSIXFilesystemNode(const string& p, bool verify)
     if (home != NULL)
 #endif
     {
-      _path.replace(home_pos, 1, home);
+      _path.replace(0, 1, home);
     }
   }
 

src/unix/stella.SlackBuild

@@ -13,7 +13,7 @@ die() {
 	exit 1
 }
 
-VERSION=3.7.1
+VERSION=3.7.2
 ARCH=${ARCH-i486}
 BUILD=1
 

src/unix/stella.spec

@@ -1,5 +1,5 @@
 %define name    stella
-%define version 3.7.1
+%define version 3.7.2
 %define rel     1
 
 %define enable_gl 1
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %_datadir/icons/large/%{name}.png
 
 %changelog
+* Sun Jun 10 2012 Stephen Anthony <stephena@users.sf.net> 3.7.2-1
+- Version 3.7.2 release
+
 * Fri Jun 8 2012 Stephen Anthony <stephena@users.sf.net> 3.7.1-1
 - Version 3.7.1 release
 

src/win32/FSNodeWin32.cxx

@@ -239,11 +239,12 @@ WindowsFilesystemNode::WindowsFilesystemNode()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 WindowsFilesystemNode::WindowsFilesystemNode(const string& p)
 {
+  // Default to home directory
+  _path = p.length() > 0 ? p : "~";
+
   // Expand '~' to the users 'home' directory
-  _path = p;
+  if(_path[0] == '~')
-  size_t home_pos = _path.find_first_of("~");
+    _path.replace(0, 1, myHomeFinder.getHomePath());
-  if(home_pos != string::npos)
-    _path.replace(home_pos, 1, myHomeFinder.getHomePath());
 
   // Get absolute path  
   TCHAR buf[4096];

src/win32/stella.rc

@@ -36,8 +36,8 @@ IDI_ICON                ICON                    "stella.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,7,1,0
+ FILEVERSION 3,7,2,0
- PRODUCTVERSION 3,7,1,0
+ PRODUCTVERSION 3,7,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -55,12 +55,12 @@ BEGIN
             VALUE "Comments", "The multi-platform Atari 2600 emulator.  Stella is released under the GPLv2."
             VALUE "CompanyName", "The Stella Team (http://stella.sourceforge.net)"
             VALUE "FileDescription", "Stella"
-            VALUE "FileVersion", "3.7.1"
+            VALUE "FileVersion", "3.7.2"
             VALUE "InternalName", "Stella"
             VALUE "LegalCopyright", "Copyright (C) 1995-2012 The Stella Team"
             VALUE "OriginalFilename", "Stella.exe"
             VALUE "ProductName", "Stella"
-            VALUE "ProductVersion", "3.7.1"
+            VALUE "ProductVersion", "3.7.2"
         END
     END
     BLOCK "VarFileInfo"