Skip to content

Commit 13ba252

Browse files
committed
Final fixes and changes for 2.2 release.
Clarification of the concepts and code around App Folders. Restructure to avoid removed libraries being linked into the std builds.
1 parent 72493df commit 13ba252

22 files changed

+492
-1418
lines changed

Distro/ReadMe.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ Winsh 2.2 Binary Distribution
22
-----------------------------
33
Sources at https://github.com/JohnHind/Winsh.lua.
44

5-
Documentation in Winsh2-1.html.
5+
Documentation in Winsh2-2.html.
66

77
Winshxxxab.exe files are various runtime versions.
88
'xxx' is a tag describing the inventory set.
99
'a' is either 'C' console or 'W' windows sub-system.
1010
'b' is either 'S' standalone or 'D' DLL Lua.
1111
The 'D' versions require WinshLua.dll either in the
12-
same folder as the exe or in a side-by-side folder.
12+
same folder as the exe or in an App Folder.
1313
To obtain detailed inventory, execute a 'W' exe and
1414
take the Inventory option on the Help menu.

Distro/Winsh2-2.zip

2.3 MB
Binary file not shown.

Doc/Publishing.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ Generating the Published (read only) version of the documentation TiddlyWiki.
33

44
The internal SaveAs function no longer works, so must process the file manually:
55

6-
1. Copy the source file to a new file.
7-
2. Find and edit the "Imprint" tiddler. Add the tag "$$!published!" to its tags.
8-
3. Find and delete all tiddlers tagged "excludePublished".
9-
4. Save and close the file.
10-
5. Open the file in a text editor.
6+
1. Search the "imprint" tag and edit or create a new imprint tiddler for the release.
7+
2. Save and close the file. Copy the source file to a new file and open this.
8+
3. Add the tag "$$!published!" to the tags of the latest imprint tiddler.
9+
4. Find and delete all tiddlers tagged "excludePublished".
10+
5. Save and close the file. Open the file in a text editor.
1111
6. In the "versionArea" script section near the top of the file, edit the title "TiddlyWiki" to "TW".
1212
7. Save and close the file - it should now reopen in a browser as a read-only published version.
1313

Doc/Winsh.html

+150-70
Large diffs are not rendered by default.

Lua/src/Makefile

-187
This file was deleted.

Lua/src/lbaselib.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,11 @@ static int luaB_next (lua_State *L) {
221221
}
222222
}
223223

224-
224+
#if defined(JH_LUA_ITER)
225+
int luaB_pairs (lua_State *L) {
226+
#else
225227
static int luaB_pairs (lua_State *L) {
228+
#endif
226229
return pairsmeta(L, "__pairs", 0, luaB_next);
227230
}
228231

0 commit comments

Comments
 (0)