Imported from svn tag fireworkz__2016_07_07__2_10_02

docs/LICENSE

@@ -1,13 +1,8 @@
-Fireworkz is free and open source software.
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-Fireworkz is made available to you under the terms of the
-Mozilla Public License 2.0 (MPL). This means you may use,
-copy and distribute Fireworkz to others. You are also
-welcome to modify the source code of Fireworkz as you want
-to meet your needs. The Mozilla Public License also gives
-you the right to distribute your modified versions.
-
-Copyright (C) 1992-1998 Colton Software Limited
+Copyright (C) 1989-1998 Colton Software Limited
 Copyright (C) 1998-2015 R W Colton
 
 This licence also applies to the following files in this directory

docs/RiscPkg/Copyright

@@ -1,6 +1,6 @@
 Copyright (C) 1992-2016 Colton Software 
 
-Fireworkz is free and open source software.
+Fireworkz is free to use and open source software.
 
 Fireworkz is made available to you under the terms of the
 Mozilla Public License 2.0 (MPL). This means you may use,

examples/_make_w32.cmd

@@ -9,7 +9,7 @@
 @rem     SUBST N: %USERPROFILE%\cs-dev
 @rem or some appropriate equivalent for your dev environment.
 @rem If not, you just have to navigate to this directory before executing the batch file
-set SRC_DIR=N:\fireworkz\trunk\examples\Apps\Document\FzExamples
+set SRC_DIR=N:\fireworkz\%FIREWORKZ_TBT%\examples\Apps\Document\FzExamples
 @rem
 set OUT_DIR=%TEMP%\OUT_DIR
 @rem

t5/Build/!!!Boot,feb

@@ -9,7 +9,7 @@
 |
 If "<Hdr$Path>"="" Then Error AcornC/C++ Tools not yet opened
 |
-If "<t5_root>"<>""  Then Error 0 Please reboot and reselect
+If "<fireworkz_root>"<>""  Then Error 0 Please reboot and reselect
 |
 | SKS iMX6
 If "<disc_root>"="" Then IfThere SCSI::hd4.$.!Boot Then Set disc_root SCSI::hd4.$
@@ -23,15 +23,16 @@ If "<disc_root>"="" Then IfThere SDFS::RISCOSpi.$.!Boot Then Set disc_root SDFS:
 | RPCEmu
 If "<disc_root>"="" Then IfThere HostFS:$.!Boot Then Set disc_root HostFS:$
 |
-Set t5_root <disc_root>.fireworkz.trunk
+Set fireworkz_tbt fireworkz__2_10__branch
+Set fireworkz_root <disc_root>.fireworkz.<fireworkz_tbt>
 |
-URD <t5_root>
+URD <fireworkz_root>
 |Lib &.arm.Library
 |Dir &.t5
 |
 | Fireworkz Pro can only be built if R-Comp components are present
-IfThere <disc_root>.coltsoft.trunk.cs-nonfree.DataPower.DPlib.<C$Mode>.DPlib    Then Set DPlib$Path    <disc_root>.coltsoft.trunk.cs-nonfree.DataPower.DPlib.<C$Mode>.
-IfThere <disc_root>.coltsoft.trunk.cs-nonfree.DataPower.DPlib.<C$Mode>.WindLibC Then Set WindLibC$Path <disc_root>.coltsoft.trunk.cs-nonfree.DataPower.WindLibC.<C$Mode>.
+IfThere <disc_root>.coltsoft.<fireworkz_tbt>.cs-nonfree.DataPower.DPlib.<C$Mode>.DPlib    Then Set DPlib$Path    <disc_root>.coltsoft.<fireworkz_tbt>.cs-nonfree.DataPower.DPlib.<C$Mode>.
+IfThere <disc_root>.coltsoft.<fireworkz_tbt>.cs-nonfree.DataPower.DPlib.<C$Mode>.WindLibC Then Set WindLibC$Path <disc_root>.coltsoft.<fireworkz_tbt>.cs-nonfree.DataPower.WindLibC.<C$Mode>.
 |
 Set Fireworkz$ReportEnable 1
 Set Fireworkz$TraceEnable 1

t5/Build/ReadMeR.txt

@@ -10,14 +10,16 @@ Copyright (C) 2013-2016 Stuart Swales
 Prerequisites
 -------------
 
-Acorn C/C++ Release 20 or later (!Amu, C compiler, headers, libraries, linker).
+Acorn C/C++ Release 25 or later (!Amu, C compiler, headers, libraries, linker).
 
-GNU Sed (Colton Software build - the one provided by PackMan doesn't work
-for this) to generate the Makefiles.
+GNU Sed to generate the Makefiles (you will need the Colton Software build as
+the one provided by PackMan doesn't work for this).
+
+InfoZip (install with PackMan) for creating a zip of the final build.
 
 Unzip (installed as InfoZip dependency) to populate the build directories.
 
-Zip (install InfoZip with PackMan) for creating a zip of the final build.
+Zip (install as InfoZip dependency) for creating a zip of the final build.
 
 
 First-time configuration and build
@@ -35,7 +37,7 @@ See ^.external.RISC_OSLib.ReadMe for instructions on how to do this.
 
 Edit 'configure' - set the URD macro to the directory containing t5.
 
-Edit !Amu.Desc for a larger WimpSlot. I use 5024k - it's ample.
+Edit DDE's !Amu.Desc for a larger WimpSlot. I use 5024k - it's ample.
 
 Run !Amu.
 
@@ -46,9 +48,9 @@ Please note that ObjMunge doesn't work on 32-bit only systems.  You will
 therefore need to build the fully-bound Fireworkz, r32b, on such systems.
 
 Then drag 'r32b.firewrkz.Makefile' to !Amu... and wait...  A Fireworkz build
-takes about fifty minutes on a SA RISC PC.  Building on a i.MX6 takes under
+takes about eighty minutes on a SA RISC PC.  Building on an ARMX6 takes about
 five minutes. A Fireworkz Pro build takes about ten minutes longer on a SA
-RISC PC, and about thirty seconds(!) on a i.MX6.
+RISC PC, and about thirty seconds(!) on an ARMX6.
 
 
 Subsequent builds

t5/Build/ReadMeW.txt

@@ -10,15 +10,15 @@ Copyright (C) 2013-2016 Stuart Swales
 Prerequisites
 -------------
 
-A Windows SVN client (such as TortoiseSVN - minimal install with command line tools, no en_US dictionary, no additional iconsets will suffice).
+A Windows SVN client such as TortoiseSVN (minimal install, with command line tools, no en_US dictionary, no additional iconsets will suffice).
 
 Microsoft Visual Studio 2013 or later (C compiler, headers, libraries, linker). The free Community Edition is suitable (you don't need Blend, MFC, SQL or Web development options).
 
 I recommend setting:
 
     Options - Text editor - C++ - Tabs - Insert Spaces
 
-GNU Win32 Patch (install with PackMan) to generate the patched BTTNCUR(P) source files.
+GNU Win32 Patch to generate the patched BTTNCUR(P) source files.
 
 InnoSetup to create the distributable setup executable.
 
@@ -32,23 +32,17 @@ You first need to acquire some files that are needed to compile Fireworkz but ca
 
 See
 
-external/Microsoft/Excel97SDK/README.TXT
-
-for the Excel 97 SDK (trivial)
-
-and
-
 external/Microsoft/InsideOLE2/README.TXT
 
-for the 'Inside OLE 2' BTTNCUR sample (less so)
+for the 'Inside OLE 2' BTTNCUR sample.
 
 Then run
 
-Build\w32\Setup.cmd
+Build\windows\Setup.cmd
 
 to copy and patch those files as needed.
 
-Double-click on Build\w32\firewrkz-vs2013.sln to load the solution and project files into Visual Studio.
+Double-click on Build\windows\firewrkz-vs2013.sln to load the solution and project files into Visual Studio.
 
 Choose the variant to build (e.g. Debug or Release).
 
@@ -60,7 +54,6 @@ Subsequent builds
 
 To clean up a build, select Build -> Build Solution.
 
-
 In order to build again, select Build -> Build Solution or Build -> Rebuild Solution.
 
 
@@ -81,7 +74,7 @@ At a command prompt:
 
 cd /p N:\fireworkz\trunk\t5
 
-pushd firewrkz\w32\OUT
+pushd firewrkz\windows\OUTx86
 
 BLD32CD.BAT
 

t5/Build/Tools/BootRunGen

@@ -291,7 +291,7 @@ IF NOT boot% THEN
   PROCo(f%,"If ""z<Choices$Write>""=""z"" Then Error 0 "+true_product$+" needs Choices$Write to be set")
   :
   PROCo(f%,"|")
-  PROCo(f%,"IfThere <Choices$Write>.Fireworkz Then Else Obey <"+product$+"$Dir>.uChoices.DoCopy")
+  PROCo(f%,"IfThere <Choices$Write>.Fireworkz.Choices.ChoicesDoc Then Else Obey <"+product$+"$Dir>.uChoices.DoCopy"): REM Ensure ChoicesDoc even if Choice00 etc there
   :
   REM Use appl_product$ to keep name length down for old filing systems and FireworkzPro
   PROCo(f%,"|")

t5/Build/Tools/ConfigGen

@@ -455,6 +455,7 @@ REM PROCco(f%,"DefineKey:^!C"+asp$+"Button:JUSTIFY_CENTRE")
 REM PROCco(f%,"DefineKey:^!F"+asp$+"Button:JUSTIFY_FULL")
 REM PROCco(f%,"DefineKey:^!L"+asp$+"Button:JUSTIFY_LEFT")
 REM PROCco(f%,"DefineKey:^!R"+asp$+"Button:JUSTIFY_RIGHT")
+PROCco(f%,"DefineKey:^!D"+asp$+"InsertFieldIntroDate")
 PROCco(f%,"DefineKey:^!V"+asp$+"Button:VIEW")
 PROCco(f%,"DefineKey:^!X"+asp$+"Button:BOX"): REM ^!X as alias for ^!B
 PROCco(f%,"DefineKey:^!Z"+asp$+"Button:CHART")

t5/Build/bld_mkdir/_do_mkdir,feb

@@ -62,13 +62,13 @@ X Copy <MkDir$Archive>._std <t5$Build$Dir>.ob_skel.riscos
 Copy <MkDir$Archive>._app1 <t5$Build$Dir>.firewrkz
 Copy <MkDir$Archive>._app2 <t5$Build$Dir>.firewrkz.!Fireworkz
 
-| Fireworkz Pro can only be built if R-Comp components are present
-IfThere $.coltsoft.trunk.cs-nonfree.DataPower.DPlib.<C$Mode>.DPlib Then Copy <MkDir$Archive>._std <t5$Build$Dir>.ob_rec
-IfThere $.coltsoft.trunk.cs-nonfree.DataPower.DPlib.<C$Mode>.DPlib Then Copy <MkDir$Archive>._std <t5$Build$Dir>.ob_recb
-IfThere $.coltsoft.trunk.cs-nonfree.DataPower.DPlib.<C$Mode>.DPlib Then Copy <MkDir$Archive>._std <t5$Build$Dir>.fs_xls
+| Fireworkz Pro can only be built if corresponding R-Comp components are present
+IfThere $.coltsoft.<fireworkz_tbt>.cs-nonfree.DataPower.DPlib.<C$Mode>.DPlib Then Copy <MkDir$Archive>._std <t5$Build$Dir>.ob_rec
+IfThere $.coltsoft.<fireworkz_tbt>.cs-nonfree.DataPower.DPlib.<C$Mode>.DPlib Then Copy <MkDir$Archive>._std <t5$Build$Dir>.ob_recb
+IfThere $.coltsoft.<fireworkz_tbt>.cs-nonfree.DataPower.DPlib.<C$Mode>.DPlib Then Copy <MkDir$Archive>._std <t5$Build$Dir>.fs_xls
 
-IfThere $.coltsoft.trunk.cs-nonfree.DataPower.DPlib.<C$Mode>.DPlib Then Copy <MkDir$Archive>._app1 <t5$Build$Dir>.fprowrkz
-IfThere $.coltsoft.trunk.cs-nonfree.DataPower.DPlib.<C$Mode>.DPlib Then Copy <MkDir$Archive>._app2 <t5$Build$Dir>.fprowrkz.!Fireworkz
+IfThere $.coltsoft.<fireworkz_tbt>.cs-nonfree.DataPower.DPlib.<C$Mode>.DPlib Then Copy <MkDir$Archive>._app1 <t5$Build$Dir>.fprowrkz
+IfThere $.coltsoft.<fireworkz_tbt>.cs-nonfree.DataPower.DPlib.<C$Mode>.DPlib Then Copy <MkDir$Archive>._app2 <t5$Build$Dir>.fprowrkz.!Fireworkz
 
 |IfThere <t5$Build$Dir>.firewrkz Then Filer_OpenDir <t5$Build$Dir>.firewrkz
 |IfThere <t5$Build$Dir>.fprowrkz Then Filer_OpenDir <t5$Build$Dir>.fprowrkz

t5/Build/configure

@@ -11,11 +11,14 @@
 
 # By the way, you may need set the wimpslot in !Amu.Desc to at 2760k or so ...
 
+# Specify trunk, branch (e.g. branches/fireworkz__2_10__branch) or tag (e.g. tags/fireworkz__2016_06_26__2_10_00)
+$(FIREWORKZ_TBT)=fireworkz__2_10__branch
+
 # NB Substitute URD location as necessary
-URD=$.fireworkz.trunk
+URD=$.fireworkz.$(FIREWORKZ_TBT)
 
 # Only Fireworkz Pro builders need to worry about this one
-CSNF=$.coltsoft.trunk.cs-nonfree
+CSNF=$.coltsoft.$(FIREWORKZ_TBT).cs-nonfree
 
 INC_RAM=
 # vvv Uncomment this line to allow use of RAM: to speed full builds

t5/Build/gccsdk/gcc-cross-check.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 # Expect errors from
 # ob_rec that needs low-level DPLib
-gcc -c ../../*/*.c  -I../.. -I ../../../../../coltsoft/trunk/cs-nonfree/Acorn/Library/32/CLib/msvchack  -I../../../../../coltsoft/trunk/cs-nonfree/Acorn/Library/32/tboxlibs  -funsigned-char -DCROSS_COMPILE -DHOST_GCCSDK -DTARGET_RISCOS -DRELEASED
+gcc -c ../../*/*.c  -I../.. -I ../../external/cs-nonfree/Acorn/Library/32/CLib/msvchack  -I../../external/cs-nonfree/Acorn/Library/32/tboxlibs  -funsigned-char -DCROSS_COMPILE -DHOST_GCCSDK -DTARGET_RISCOS -DRELEASED

t5/Build/gccsdk/setup.sh

@@ -8,9 +8,9 @@
 
 #rem Copyright (C) 2013-2016 Stuart Swales
 
-#rem Execute from top-level t5 directory
+#rem Execute from top-level t5 directory (move as t5/external/setup-gccsdk.sh soon)
 
-COLTSOFT_CS_NONFREE=../../../coltsoft/trunk/cs-nonfree
+COLTSOFT_CS_NONFREE=../../../coltsoft/$FIREWORKZ_TBT/cs-nonfree
 
 [ ! -d ./external/Microsoft/Excel97SDK/INCLUDE ] && mkdir       ./external/Microsoft/Excel97SDK/INCLUDE
 cp $COLTSOFT_CS_NONFREE/Microsoft/Excel_97_SDK/INCLUDE/XLCALL.H ./external/Microsoft/Excel97SDK/INCLUDE/xlcall.h

t5/Build/setup-csnf,fd7

@@ -4,11 +4,8 @@
 |
 | Copyright (C) 2013-2016 Stuart Swales
 |
-set COLTSOFT_CS_NONFREE <Obey$Dir>.^.^.^.^.coltsoft.trunk.cs-nonfree
+set COLTSOFT_CS_NONFREE <Obey$Dir>.^.^.^.^.coltsoft.<fireworkz_tbt>.cs-nonfree
 |
 IfThere <COLTSOFT_CS_NONFREE>.Microsoft Then Else Error 0 <COLTSOFT_CS_NONFREE> not present
 |
-cdir                                                               <Obey$Dir>.^.external.Microsoft.Excel97SDK.INCLUDE
-cdir                                                               <Obey$Dir>.^.external.Microsoft.Excel97SDK.INCLUDE.h
-copy <COLTSOFT_CS_NONFREE>.Microsoft.Excel_97_SDK.INCLUDE.XLCALL/H <Obey$Dir>.^.external.Microsoft.Excel97SDK.INCLUDE.h.xlcall ~CF~N~RV
-
+echo Nothing to do these days

t5/Build/windows/OUTx64/BLDCD2.BAT

@@ -7,19 +7,19 @@
 pushd %~dp0
 IF NOT EXIST BLDCD2.BAT EXIT
 
-rmdir /s /q                                fwin-210yy
-mkdir                                      fwin-210yy\
+rmdir /s /q                                fwin-21002
+mkdir                                      fwin-21002\
 @if errorlevel 1 goto failed
 @
 @rem copy newly built stuff ie. the Setup EXE
-xcopy .\InnoSetup\*.exe                    fwin-210yy\
+xcopy .\InnoSetup\*.exe                    fwin-21002\
 @if errorlevel 1 goto failed
 @
-@echo F | xcopy ..\..\..\firewrkz\RelNotesW.htm         fwin-210yy\RelNotes.htm
+@echo F | xcopy ..\..\..\firewrkz\RelNotesW.htm         fwin-21002\RelNotes.htm
 @if errorlevel 1 goto failed
 @
-mkdir                                      fwin-210yy\GSGuide\
-@echo D | xcopy /s ..\..\..\..\docs\GSGuide\windows     fwin-210yy\GSGuide\Windows
+mkdir                                      fwin-21002\GSGuide\
+@echo D | xcopy /s ..\..\..\..\docs\GSGuide\windows     fwin-21002\GSGuide\Windows
 @if errorlevel 1 goto failed
 @
 @explorer .

t5/Build/windows/OUTx64/firewrkz-x64.iss

@@ -26,8 +26,8 @@ MinVersion=6.1
 ; Require Windows 7 for 64-bit version
 ; AppVersion=2.xx.yy
 ; AppVerName=Colton Software Fireworkz 2.xx.yy
-AppVersion=2.10.00
-AppVerName=Colton Software Fireworkz 2.10
+AppVersion=2.10.02
+AppVerName=Colton Software Fireworkz 2.10.02
 AppCopyright=Copyright (C) 1992-2016 Colton Software
 AppId=Colton Fireworkz for Windows (64-bit)
 AppName=Colton Software Fireworkz for Windows (64-bit)

t5/Build/windows/OUTx86/BLDCD2.BAT

@@ -7,19 +7,19 @@
 pushd %~dp0
 IF NOT EXIST BLDCD2.BAT EXIT
 
-rmdir /s /q                                fwin-210yy
-mkdir                                      fwin-210yy\
+rmdir /s /q                                fwin-21002
+mkdir                                      fwin-21002\
 @if errorlevel 1 goto failed
 @
 @rem copy newly built stuff ie. the Setup EXE
-xcopy .\InnoSetup\*.exe                    fwin-210yy\
+xcopy .\InnoSetup\*.exe                    fwin-21002\
 @if errorlevel 1 goto failed
 @
-@echo F | xcopy ..\..\..\firewrkz\RelNotesW.htm         fwin-210yy\RelNotes.htm
+@echo F | xcopy ..\..\..\firewrkz\RelNotesW.htm         fwin-21002\RelNotes.htm
 @if errorlevel 1 goto failed
 @
-mkdir                                      fwin-210yy\GSGuide\
-@echo D | xcopy /s ..\..\..\..\docs\GSGuide\windows     fwin-210yy\GSGuide\Windows
+mkdir                                      fwin-21002\GSGuide\
+@echo D | xcopy /s ..\..\..\..\docs\GSGuide\windows     fwin-21002\GSGuide\Windows
 @if errorlevel 1 goto failed
 @
 @explorer .

t5/Build/windows/OUTx86/firewrkz-x86.iss

@@ -24,8 +24,8 @@ MinVersion=5.1sp3
 ; Require XP SP3
 ; AppVersion=2.xx.yy
 ; AppVerName=Colton Software Fireworkz 2.xx.yy
-AppVersion=2.10.00
-AppVerName=Colton Software Fireworkz 2.10
+AppVersion=2.10.02
+AppVerName=Colton Software Fireworkz 2.10.02
 AppCopyright=Copyright (C) 1992-2016 Colton Software
 AppId=Colton Fireworkz for Windows (32-bit)
 AppName=Colton Software Fireworkz for Windows (32-bit)