2.15 release

shlomif · Mar 12, 2022 · 6d2c149 · 6d2c149
1 parent e5792e4
commit 6d2c149
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 10 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -36,9 +36,9 @@ test_script:
     - gmake mo
     - pyinstaller pysol.py --windowed --icon=data\pysol.ico
     - python3 setup.py install_data -d dist\pysol
-    - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.1.0RC.tar.xz/download -FileName cardsets.tar.xz
+    - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.1.0.tar.xz/download -FileName cardsets.tar.xz
     - 7z x cardsets.tar.xz -so | 7z x -si -ttar
-    - mv PySolFC-Cardsets--Minimal-2.0.2/cardset-* dist/pysol/data
+    - mv PySolFC-Cardsets--Minimal-2.1.0/cardset-* dist/pysol/data
     - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySol-Music/PySol-Music-4.50/pysol-music-4.50.tar.xz/download -FileName music.tar.xz
     - 7z x music.tar.xz -so | 7z x -si -ttar
     - move pysol-music-4.50\data\music dist\pysol\data\music

diff --git a/.github/workflows/macos-package.yml b/.github/workflows/macos-package.yml
@@ -28,9 +28,9 @@ jobs:
         brew install create-dmg
     - name: Get cardsets
       run: |
-        wget --content-disposition https://downloads.sourceforge.net/project/pysolfc/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.1.0RC.tar.xz
-        tar xJf PySolFC-Cardsets--Minimal-2.1.0RC.tar.xz
-        mv PySolFC-Cardsets--Minimal-2.1.0RC/cardset-* data
+        wget --content-disposition https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.1.0.tar.xz/download
+        tar xJf PySolFC-Cardsets--Minimal-2.1.0.tar.xz?viasf=1
+        mv PySolFC-Cardsets--Minimal-2.1.0/cardset-* data
     - name: Prepare game rules (process the HTML) and translations
       run: |
         make rules mo

diff --git a/.travis.yml b/.travis.yml
@@ -29,9 +29,9 @@ deploy:
     skip_cleanup: true
 before_install:
     - if test "$TRAVIS_OS_NAME" = "osx" ; then
-        wget --content-disposition https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.tar.xz/download &&
-        tar xJf PySolFC-Cardsets--Minimal-2.0.tar.xz &&
-        mv PySolFC-Cardsets--Minimal-2.0/cardset-* data ;
+        wget --content-disposition https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.1.0.tar.xz/download &&
+        tar xJf PySolFC-Cardsets--Minimal-2.1.0.tar.xz &&
+        mv PySolFC-Cardsets--Minimal-2.1.0/cardset-* data ;
         fi
     - if test "$TRAVIS_OS_NAME" = "osx" ; then
         PYVER=3.9.1 &&

diff --git a/NEWS.asciidoc b/NEWS.asciidoc
@@ -1,5 +1,27 @@
 [[news]]
 === News
+* _12 March, 2022_ There is a new beta release
+https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-2.15.0/[PySolFC
+v2.15.0].  Additionally, there is a new Cardsets release https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/PySolFC-Cardsets-2.1/[PySolFC-Cardsets v.2.1]
+(required to run 2.15).  This is a pretty sizable release, so this beta version
+is being offered before a stable 2.16 in the next couple months.  Any https://github.com/shlomif/PySolFC/issues[feedback
+and bug reports] are greatly appreciated.  The full list of changes for this release
+is quite long, but here are the highlights:
+** 35 new games, plus enhancements and fixes to many existing games.
+** Many new game rules added to the documentation.
+** New high resolution default display.  This new display uses high resolution
+cardsets and scaling to make the games look impressive on larger monitors.
+*** Note that the new high-resolution options will not override your currently selected
+options for existing users.  If you want to use the new settings, you can delete or
+rename your options.cfg file.
+*** Also note that because of these changes, upgrading your version of PySolFC Cardsets
+is required even if you're using the minimal package.  If you are using the Windows or
+Mac installer, this will be handled automatically, but you'll need to upgrade if you're
+setting it up manually.
+** New feature to search for games, cardsets, and table tiles by name.
+** Many new display options.
+** Bugfixes and cleanup.
+** And more.
 * _10 December, 2021:_ There is a new stable release
 https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-2.14.1/[PySolFC
 v2.14.1].  This release fixes a number of bugs, including one that causes

diff --git a/android/mkp4a.clean b/android/mkp4a.clean
@@ -5,4 +5,4 @@ rm -rf tmp
 python3 -m pythonforandroid.toolchain clean_dists
 python3 -m pythonforandroid.toolchain clean_builds
 rm -f *.apk
-rm -rf PySolFC-Cardsets--Minimal-2.0.2
+rm -rf PySolFC-Cardsets--Minimal-2.1.0
diff --git a/android/mkp4a.common b/android/mkp4a.common
@@ -5,7 +5,7 @@ version=$(PYTHONPATH=.. python3 -c \
 
 tmpdir=${HOME}/.cache/tmp-for-p4a/pysolfc/src
 
-cardsets_dir='PySolFC-Cardsets--Minimal-2.0.2'
+cardsets_dir='PySolFC-Cardsets--Minimal-2.1.0'
 cardsets_file="${cardsets_dir}.tar.xz"
 
 p4aver="2019.10.6"

diff --git a/html-src/news.html b/html-src/news.html
@@ -1,6 +1,70 @@
 <h1>What's New?</h1>
 <ul>
 <li>
+<p><em>12 March, 2022:</em> There is a new beta release
+<a href="https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-2.15.0/">PySolFC
+v2.15.0</a>. Additionally, there is a new Cardsets release
+<a href="https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/PySolFC-Cardsets-2.1/">PySolFC-Cardsets v.2.1</a>
+(required to run 2.15).  This is a pretty sizable release, so this beta version
+is being offered before a stable 2.16 in the next month or two.  Any <a href="https://github.com/shlomif/PySolFC/issues">feedback
+and bug reports</a> are greatly appreciated.  The full list of changes for this release
+is quite long, but here are the highlights:</p>
+<ul>
+<li>
+<p>
+35 new games, plus enhancements and fixes to many existing games.
+</p>
+</li>
+<li>
+<p>
+New high resolution default display.  This new display uses high resolution
+cardsets and scaling to make the games look impressive on larger monitors, but will
+still scale for smaller displays too.
+<ul>
+<li>
+<p>
+Note that the new high-resolution options will not override your currently selected
+options for existing users.  If you want to use the new settings, you can delete or
+rename your options.cfg file.
+</li>
+<li>
+<p>
+Also note that because of these changes, upgrading your version of PySolFC Cardsets
+is required even if you're using the minimal package.  If you are using the Windows or
+Mac installer, this will be handled automatically, but you'll need to upgrade if you're
+setting it up manually.
+</li>
+</ul>
+</p>
+</li>
+<li>
+<p>
+New feature to search for games, cardsets, and table tiles by name.
+</p>
+</li>
+<li>
+<p>
+Many new display options.
+</p>
+</li>
+<li>
+<p>
+Many missing game rules added to the documentation.
+</p>
+</li>
+<li>
+<p>
+Bugfixes and cleanup.
+</p>
+</li>
+<li>
+<p>
+And more.
+</p>
+</li>
+</ul>
+</li>
+<li>
 <p>
 <em>10 December, 2021:</em> There is a new stable release
 <a href="https://sourceforge.net/projects/pysolfc/files/PySolFC/PySolFC-2.14.1/">PySolFC