Prep for release

- Update Inform6 to v6.36
- Update PunyInform to v3.4
- Include PunyInform in the repo and copy the relevant files during build

.gitignore

@@ -11,6 +11,10 @@ __*
 # the release binary does not need to be in the repo;
 # we'll produce these locally and zip for release
 release/inform6.exe
+# the PunyInform libraries will be copied in by the
+# build script so don't need to be in the repo
+release/howto/*
+release/lib/*
 
 # unrelated junk files
 **/Thumbs.db

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "inform6-src"]
 	path = inform6-src
 	url = https://github.com/Kroc/Inform6.git
+[submodule "PunyInform"]
+	path = PunyInform
+	url = https://github.com/johanberntsson/PunyInform.git

README.md

@@ -1,10 +1,10 @@
-# Inform6 for EPOC32 #
+# Inform6 for EPOC32 #
 
 Write (and play!) Interactive Fiction (a.k.a "text adventures") directly on your [Psion 5][Series5] Series / 5mx and other [EPOC32]-based devices!
 
 ![Screenshot of an Inform6/PunyInform text file being edited on an EPOC32 emulator](readme_informer.png)
 
-This is an updated build (v6.35) of [Inform6] for EPOC32 devices; I.e. Psion 5 Series, 5 mx, 5 mx Pro, Revo, Series 7, netBook & netPad and other licenced devices including Geofox One, Osaris, Diamond Mako and Ericsson MC218.
+This is an updated build (v6.36) of [Inform6] for EPOC32 devices; I.e. Psion 5 Series, 5 mx, 5 mx Pro, Revo, Series 7, netBook & netPad and other licenced devices including Geofox One, Osaris, Diamond Mako and Ericsson MC218.
 
 The [IF Archive] has a [build of v6.21](http://www.ifarchive.org/indexes/if-archiveXinfocomXcompilersXinform6Xexecutables.html
 ) from 1999 produced by Simon Quinn, but this was not up to date enough to work with [PunyInform], a library for producing text-adventures compact and lightweight enough to run on old hardware.

build_rel.bat

@@ -20,18 +20,29 @@ ECHO ---------------------------------------------------------------------------
 CALL "group\build_marm.bat" rel
 IF ERRORLEVEL 1 PAUSE & EXIT /B 1
 
+ECHO * Copy PunyInform Library...
+
+COPY /Y "PunyInform\lib\*.h"            "release\lib"
+COPY /Y "PunyInform\releasenotes.txt"   "release\lib\releasenotes.txt"
+COPY /Y "PunyInform\LICENSE"            "release\licences\puny-licence.txt"
+COPY /Y "PunyInform\*.inf"              "release\howto"
+REM # (the test-bench will never run in the RAM limits of a Psion)
+DEL /F /Q "release\howto\testbench.inf"  >NUL 2>NUL
+COPY /Y "PunyInform\howto\*.inf"        "release\howto"
+
+ECHO:
 ECHO * Make release bundle...
 
 SET "BIN_ZIP=bin\7zip\7za.exe" 
 PUSHD "release"
 
 REM # copy over the compiled executable into the release folder
-COPY /Y \EPOC32\Release\MARM\Rel\INFORM6.EXE /B inform6.exe /B  >NUL
+COPY /Y "\EPOC32\Release\MARM\Rel\INFORM6.EXE" /B "inform6.exe" /B  >NUL
 
 REM # remove the old release ZIP file
 DEL /F /Q "inform6*.zip"  >NUL 2>NUL
 
-..\%BIN_ZIP% a "inform635-epoc32-puny25.zip" ^
+..\%BIN_ZIP% a "inform636-epoc32-puny34.zip" ^
     -bso0 -bsp1 -bse0 -tzip -r -mx9 -mfb258 -mpass15 ^
     -x!Desktop.ini -x!Thumbs.db -x!.* -- *
 IF ERRORLEVEL 1 PAUSE

group/build_marm.bat

@@ -4,7 +4,7 @@ PUSHD %~dp0
 SET "VARIANT=%~1"
 IF [%VARIANT%] == [] SET "VARIANT=rel"
 
-SET "USERDEFS="
+SET "USERDEFS= -DUSE_OLD_TIME_API "
 CMD /C makmake inform6 marm
 nmake /NOLOGO /S /F INFORM6.MARM %VARIANT%
 

group/build_wins.bat

@@ -7,7 +7,7 @@ IF [%VARIANT%] == [] SET "VARIANT=deb"
 ECHO Warnings disabled for batch build:
 ECHO -- use VC++ to build with warnings
 ECHO:
-SET "USERDEFS= /noover /w "
+SET "USERDEFS= /noover /w -DUSE_OLD_TIME_API "
 CMD /C makmake inform6 wins
 nmake /NOLOGO /S /F INFORM6.WINS %VARIANT%
 

group/makmake-vc5.bat

@@ -5,6 +5,7 @@ ECHO Make work directories:
 CMD /C makmake -makework inform6 wins
 ECHO OK
 ECHO Make Visual C++ Project:
+SET "USERDEFS= -DUSE_OLD_TIME_API "
 CMD /C makmake inform6 vc5
 ECHO OK