From 431a148011b668ba4f6037716a4157d612935511 Mon Sep 17 00:00:00 2001 From: stephena Date: Mon, 10 Oct 2016 17:43:31 +0000 Subject: [PATCH 1/3] Detect clang 4.0 in the configure script. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3318 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 618fe789d..c17e5f340 100755 --- a/configure +++ b/configure @@ -392,7 +392,7 @@ if test "$have_clang" = yes; then fi case $cxx_version in - [3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*) + [3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4].[0-9].[0-9]) _cxx_major=`echo $cxx_version | cut -d '.' -f 1` _cxx_minor=`echo $cxx_version | cut -d '.' -f 2` cxx_version="$cxx_version, ok" From 81844dbf7f3f2c7eda84a41ec284124525f047de Mon Sep 17 00:00:00 2001 From: stephena Date: Sun, 20 Nov 2016 21:13:42 +0000 Subject: [PATCH 2/3] Preparing for 4.7.3 release. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3319 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- Announce.txt | 22 +++++++++++----------- Changes.txt | 2 +- debian/changelog | 7 +++++++ docs/debugger.html | 4 +++- docs/index.html | 2 +- src/macosx/Info-Stella.plist | 2 +- src/unix/stella.spec | 5 ++++- src/windows/stella.rc | 8 ++++---- 8 files changed, 32 insertions(+), 20 deletions(-) diff --git a/Announce.txt b/Announce.txt index 0c30805c5..32dd3cd4f 100644 --- a/Announce.txt +++ b/Announce.txt @@ -9,7 +9,7 @@ SSSS ttt eeeee llll llll aaaaa =========================================================================== - Release 4.7.2 for Linux, MacOSX and Windows + Release 4.7.3 for Linux, MacOSX and Windows =========================================================================== The Atari 2600 Video Computer System (VCS), introduced in 1977, was the @@ -21,30 +21,30 @@ 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 4.7.2 release of Stella for Linux, Mac OSX and Windows. The +This is the 4.7.3 release of Stella for Linux, Mac OSX and Windows. The distributions currently available are: * Binaries for Windows XP_SP3(*)/Vista/7/8/10 : - Stella-4.7.2-win32.exe (32-bit EXE installer) - Stella-4.7.2-x64.exe (64-bit EXE installer) - Stella-4.7.2-windows.zip (32/64 bit versions) + Stella-4.7.3-win32.exe (32-bit EXE installer) + Stella-4.7.3-x64.exe (64-bit EXE installer) + Stella-4.7.3-windows.zip (32/64 bit versions) (*) Note: Support for Windows XP is problematic on some systems, and will probably be discontinued in a future release. * Binary distribution for MacOS X 10.7 and above : - Stella-4.7.2-macosx.dmg (64-bit Intel) + Stella-4.7.3-macosx.dmg (64-bit Intel) * Binary distribution in 32-bit & 64-bit Ubuntu DEB format : - stella_4.7.2-1_i386.deb - stella_4.7.2-1_amd64.deb + stella_4.7.3-1_i386.deb + stella_4.7.3-1_amd64.deb * Binary distribution in 32-bit & 64-bit RPM format : - stella-4.7.2-2.i386.rpm - stella-4.7.2-2.x86_64.rpm + stella-4.7.3-2.i386.rpm + stella-4.7.3-2.x86_64.rpm * Source code distribution for all platforms : - stella-4.7.2-src.tar.xz + stella-4.7.3-src.tar.xz Distribution Site diff --git a/Changes.txt b/Changes.txt index 1d68a3e95..27e59b225 100644 --- a/Changes.txt +++ b/Changes.txt @@ -12,7 +12,7 @@ Release History =========================================================================== -4.7.2 to 4.8: (xxx. xx, 2016) +4.7.2 to 4.7.3: (Nov. 21, 2016) * Added preliminary support for the 3E+ bankswitching scheme, developed by Thomas Jentzsch. diff --git a/debian/changelog b/debian/changelog index be5fb9ae2..c162ab7b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +stella (4.7.3-1) stable; urgency=high + + * Version 4.7.3 release + + -- Stephen Anthony Mon, 21 Nov 2016 17:09:59 -0230 + + stella (4.7.2-1) stable; urgency=high * Version 4.7.2 release diff --git a/docs/debugger.html b/docs/debugger.html index 22a62d51e..bc24dcb36 100644 --- a/docs/debugger.html +++ b/docs/debugger.html @@ -623,7 +623,6 @@ can also get rid of all traps at once with the "cleartraps" command.

             a - Set Accumulator to value xx
-         bank - Show # of banks, or switch to bank xx
          base - Set default base (hex, dec, or bin)
         break - Set/clear breakpoint at address xx (default=PC)
       breakif - Set breakpoint on condition xx
@@ -685,6 +684,9 @@ listfunctions - List user-defined functions
          trap - Trap read/write access to address(es) xx [to yy]
      trapread - Trap read access to address(es) xx [to yy]
     trapwrite - Trap write access to address(es) xx [to yy]
+        trapm - Trap read/write access to address xx (+mirrors)
+    trapreadm - Trap read access to address xx (+mirrors)
+   trapwritem - Trap write access to address xx (+mirrors)
          type - Show disassembly type for address xx [to yy]
          uhex - Toggle upper/lowercase HEX display
         undef - Undefine label xx (if defined)
diff --git a/docs/index.html b/docs/index.html
index efa3be691..0bac05645 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -10,7 +10,7 @@
   


   
A multi-platform Atari 2600 VCS emulator

 
-  
Release 4.7.2

+  
Release 4.7.3

   


 
   
User's Guide

diff --git a/src/macosx/Info-Stella.plist b/src/macosx/Info-Stella.plist
index 4e2bc4d74..4cb2ed7fc 100644
--- a/src/macosx/Info-Stella.plist
+++ b/src/macosx/Info-Stella.plist
@@ -53,7 +53,7 @@
 	CFBundleSignature
 	StLa
 	CFBundleVersion
-	4.7.2
+	4.7.3
 	LSApplicationCategoryType
 	public.app-category.games
 	LSMinimumSystemVersionByArchitecture
diff --git a/src/unix/stella.spec b/src/unix/stella.spec
index f1dac3c00..08ce1682e 100644
--- a/src/unix/stella.spec
+++ b/src/unix/stella.spec
@@ -1,5 +1,5 @@
 %define name    stella
-%define version 4.7.2
+%define version 4.7.3
 %define rel     1
 
 %define enable_sound 1
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %_datadir/icons/large/%{name}.png
 
 %changelog
+* Mon Nov 21 2016 Stephen Anthony  4.7.3-1
+- Version 4.7.3 release
+
 * Fri Mar 25 2016 Stephen Anthony  4.7.2-1
 - Version 4.7.2 release
 
diff --git a/src/windows/stella.rc b/src/windows/stella.rc
index c4b3a0dcc..9b4ef1e4d 100755
--- a/src/windows/stella.rc
+++ b/src/windows/stella.rc
@@ -36,8 +36,8 @@ IDI_ICON                ICON                    "stella.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,7,2,0
- PRODUCTVERSION 4,7,2,0
+ FILEVERSION 4,7,3,0
+ PRODUCTVERSION 4,7,3,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", "4.7.2"
+            VALUE "FileVersion", "4.7.3"
             VALUE "InternalName", "Stella"
             VALUE "LegalCopyright", "Copyright (C) 1995-2016 The Stella Team"
             VALUE "OriginalFilename", "Stella.exe"
             VALUE "ProductName", "Stella"
-            VALUE "ProductVersion", "4.7.2"
+            VALUE "ProductVersion", "4.7.3"
         END
     END
     BLOCK "VarFileInfo"

From e43e56f8abdb479d1d8211d69dbdbcc47196c4dd Mon Sep 17 00:00:00 2001
From: stephena 
Date: Mon, 21 Nov 2016 19:21:25 +0000
Subject: [PATCH 3/3] Updated version for 4.7.3 release.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3320 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 src/common/Version.hxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index e6bc81ae8..0d87b71ad 100644
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@@ -22,7 +22,7 @@
 
 #include 
 
-#define STELLA_VERSION "4.8_pre"
+#define STELLA_VERSION "4.7.3"
 #define STELLA_BUILD atoi("$Rev$" + 6)
 
 #endif