From 6d2c1490c3e2be810fe30426c521a7a303d02e8c Mon Sep 17 00:00:00 2001 From: Joe R Date: Sat, 12 Mar 2022 14:03:42 -0500 Subject: [PATCH] 2.15 release --- .appveyor.yml | 4 +- .github/workflows/macos-package.yml | 6 +-- .travis.yml | 6 +-- NEWS.asciidoc | 22 ++++++++++ android/mkp4a.clean | 2 +- android/mkp4a.common | 2 +- html-src/news.html | 64 +++++++++++++++++++++++++++++ 7 files changed, 96 insertions(+), 10 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0bdb606fd9..5ca5bebb99 100644 --- 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 index 6c7b1ed2e9..ad485fd68e 100644 --- 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 index 1e8b0118d8..b9a2263727 100644 --- 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 index 420037e4bc..e15bcbd114 100644 --- 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 index fe352bd771..03e87ea590 100755 --- 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 index 436bb9dcc5..233e725062 100644 --- 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 index f48f3f3790..d7765b89e4 100644 --- a/html-src/news.html +++ b/html-src/news.html @@ -1,6 +1,70 @@

What's New?