Skip to content

Commit c7f2f9b

Browse files
committed
Version 1.0.5
1 parent b449a7c commit c7f2f9b

File tree

15 files changed

+399
-39
lines changed

15 files changed

+399
-39
lines changed

AppCommon/GlobalAppVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static class GlobalAppVersion {
2727
/// Overall application version.
2828
/// </summary>
2929
public static readonly CommonUtil.Version AppVersion =
30-
new CommonUtil.Version(1, 0, 5, CommonUtil.Version.PreRelType.Dev, 2);
30+
new CommonUtil.Version(1, 0, 5, CommonUtil.Version.PreRelType.Final, 0);
3131
// NOTE: there's an independent version in DiskArc/Defs.cs
3232
}
3333
}

DiskArc/Defs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static class Defs {
2727
/// DiskArc library version number.
2828
/// </summary>
2929
public static CommonUtil.Version LibVersion { get; } =
30-
new CommonUtil.Version(1, 0, 4, CommonUtil.Version.PreRelType.Final, 0);
30+
new CommonUtil.Version(1, 0, 5, CommonUtil.Version.PreRelType.Final, 0);
3131

3232
public const string BUILD_TYPE =
3333
#if DEBUG

Install.md

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ or use one of the links below to download the most recent stable release.
1717

1818
System | Link
1919
------------- | ----
20-
Windows x86 | https://github.com/fadden/CiderPress2/releases/download/v1.0.4/cp2_1.0.4_win-x86_sc.zip
21-
Windows x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.4/cp2_1.0.4_win-x64_sc.zip
22-
Mac OS x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.4/cp2_1.0.4_osx-x64_sc.zip
23-
Linux x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.4/cp2_1.0.4_linux-x64_sc.zip
20+
Windows x86 | https://github.com/fadden/CiderPress2/releases/download/v1.0.5/cp2_1.0.5_win-x86_sc.zip
21+
Windows x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.5/cp2_1.0.5_win-x64_sc.zip
22+
Mac OS x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.5/cp2_1.0.5_osx-x64_sc.zip
23+
Linux x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.5/cp2_1.0.5_linux-x64_sc.zip
2424

2525
**Framework-Dependent** (~1 MB)
2626

2727
System | Link
2828
------------- | ----
29-
Windows x86 | https://github.com/fadden/CiderPress2/releases/download/v1.0.4/cp2_1.0.4_win-x86_fd.zip
30-
Windows x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.4/cp2_1.0.4_win-x64_fd.zip
31-
Mac OS x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.4/cp2_1.0.4_osx-x64_fd.zip
32-
Linux x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.4/cp2_1.0.4_linux-x64_fd.zip
29+
Windows x86 | https://github.com/fadden/CiderPress2/releases/download/v1.0.5/cp2_1.0.5_win-x86_fd.zip
30+
Windows x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.5/cp2_1.0.5_win-x64_fd.zip
31+
Mac OS x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.5/cp2_1.0.5_osx-x64_fd.zip
32+
Linux x64 | https://github.com/fadden/CiderPress2/releases/download/v1.0.5/cp2_1.0.5_linux-x64_fd.zip
3333

3434
Once downloaded, unzip the file somewhere convenient (Safari on the Mac will do the unzip
3535
for you). There is no installer; the commands are executed directly from where they are unzipped.
@@ -109,13 +109,11 @@ on whether your target is 32-bit or 64-bit, respectively). You can then run the
109109
#!/bin/sh
110110
exec PATH/TO/dotnet PATH/TO/cp2.dll $@
111111

112-
### Linux and Wine ###
112+
### Using the GUI on Linux and macOS ###
113113

114-
It's possible to run the GUI application under Linux using the Wine compatibility layer.
115-
With Wine v9 the application works somewhat, but crashes in some common operations.
114+
It's possible to run the GUI application under macOS and Linux using the Wine compatibility layer.
115+
See [this discussion](https://github.com/fadden/CiderPress2/discussions/34) for an example with
116+
macOS. The key seems to be using the self-contained 32-bit (x86) release of CiderPress II
117+
(`win-x86_sc` package).
116118

117-
If you want to try it, download the 32-bit (x86) self-contained package for Windows. On my
118-
system, the 64-bit version hangs during startup (for both GUI and CLI), and the framework-dependent
119-
package requires downloading additional Wine components, so `win-x86_sc` is your best bet.
120-
121-
(I am not a Wine expert. It's possible I'm missing something obvious.)
119+
This is not officially supported and may be unstable.

LegalStuff.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CiderPress II is copyright 2023 faddenSoft. Source and binaries may be
1+
CiderPress II is copyright faddenSoft. Source and binaries may be
22
distributed under terms of the Apache 2.0 license (attached below, and
33
in the LICENSE file included with the source code).
44

SourceNotes.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,20 +159,22 @@ always match the current "final" release.
159159

160160
6. Update the `app_version` number in `ndocs/publish.py`. This is used
161161
for text substitution in the descriptive text and installer links.
162-
7. From the command line, in the `ndocs` directory, run `publish.py`
162+
7. If file format docs have changed, use the `ndocs/formatdoc/convert.py`
163+
script (see below).
164+
8. From the command line, in the `ndocs` directory, run `publish.py`
163165
(you may need to explicitly run python if the shell isn't set up to
164166
execute scripts directly). This will update the contents of the `docs`
165167
directory and the top-level documentation (including this file) with the
166168
contents of `ndocs`. Check the diffs.
167169

168170
Finally, build the applications and submit the changes.
169171

170-
8. Run `makedist build` from the top level of the source tree (it'll be in
172+
9. Run `makedist build` from the top level of the source tree (it'll be in
171173
`MakeDist/bin/debug/NET6.0`). This builds the distribution packages.
172174
The output will be in the `DIST` directory.
173-
9. Submit all changes to git, push them to the server.
174-
10. Create a new release on github. Drag `DIST/*.zip` into the release.
175-
11. Update/close any issues that have been addressed by the new release.
175+
10. Submit all changes to git, push them to the server.
176+
11. Create a new release on github. Drag `DIST/*.zip` into the release.
177+
12. Update/close any issues that have been addressed by the new release.
176178

177179
Version numbers should follow the semantic versioning scheme: v1.2.3,
178180
v1.2.3-dev1, etc.

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ handful of top-level documents (like the project README and installation
2828
instructions) are copied out of the `top` directory.
2929

3030
Some text variable substitutions can be performed on HTML and Markdown files
31-
as they are copied, e.g. all occurrences of `1.0.4` will be replaced with
31+
as they are copied, e.g. all occurrences of `1.0.5` will be replaced with
3232
the current app version. This is used to update the links in the download
3333
instructions (`Install.md`) to point at the current release.
3434

docs/doc-index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ <h3>File Archives</h3>
102102
AppleLink-PE Package Format (.acu)</a></li>
103103
<li><a href="formatdoc/AppleSingle-notes.html">
104104
AppleSingle (.as) and AppleDouble (._*)</a></li>
105+
<li><a href="formatdoc/AudioRecording-notes.html">
106+
Apple II cassette recording (*.wav)</a></li>
105107
<li><a href="formatdoc/Binary2-notes.html">
106108
Binary ][ (.bny .bqy)</a></li>
107109
<li><a href="formatdoc/GZip-notes.html">

docs/features.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ <h4>File Archives</h4>
8888
<tr> <td>AppleLink PE</td> <td>.acu</td> <td>read</td> </tr>
8989
<tr> <td>AppleDouble</td> <td>("<code>._</code>" prefix pair)</td> <td>read/add/extract</td> </tr>
9090
<tr> <td>AppleSingle</td> <td>.as</td> <td>read/add/extract</td> </tr>
91+
<tr> <td>Apple II cassette</td> <td>.wav</td> <td>read</td> </tr>
9192
<tr> <td>Binary II</td> <td>.bny .bqy</td> <td>full</td> </tr>
9293
<tr> <td>gzip</td> <td>.gz</td> <td>read/add/extract</td> </tr>
9394
<tr> <td>MacBinary</td> <td>.bin .macbin</td> <td>read</td> </tr>

0 commit comments

Comments
 (0)