Revise build files to use _build dir & new zip name

Various files that are invloved in the Makefile build process were
updated to write output to _build/bin, _build/exe and _build/release
directories instead of Bin, Exe & Release in repo root.

CodeSnip.dproj was also update to ensure that builds using the IDE used
the same _build/bin & _build/exe directories.

Makefile was also updated to
(a) increase use of macros for path names
(b) name .zip files codesnip-exe and codesnip-portable-exe
(c) append any version number in VERSION define to zip file base names

Also fixed malformed quotes in a #define in CodeSnip.iss

Author: delphidabbler

Src/CodeSnip.cfg.tplt

@@ -30,12 +30,12 @@
 -M
 -$M16384,1048576
 -K$00400000
--E"..\Exe"
--N0"..\Bin"
--U"..\Bin;3rdParty"
--O"..\Bin;3rdParty"
--I"..\Bin;3rdParty"
--R"..\Bin;3rdParty"
+-E"..\_build\exe"
+-N0"..\_build\bin"
+-U"..\_build\bin;3rdParty"
+-O"..\_build\bin;3rdParty"
+-I"..\_build\bin;3rdParty"
+-R"..\_build\bin;3rdParty"
 -w-SYMBOL_PLATFORM
 -w+EXPLICIT_STRING_CAST_LOSS
 -w+CVT_WIDENING_STRING_LOST

Src/CodeSnip.dproj

@@ -16,9 +16,9 @@
 		<PropertyGroup Condition="'$(Base)'!=''">
 			<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
 			<DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
-			<DCC_ExeOutput>..\Exe</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\Bin;3rdParty;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-			<DCC_DependencyCheckOutputName>..\Exe\CodeSnip.exe</DCC_DependencyCheckOutputName>
+			<DCC_ExeOutput>..\_build\exe</DCC_ExeOutput>
+			<DCC_UnitSearchPath>..\_build\bin;3rdParty;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_DependencyCheckOutputName>..\_build\exe\CodeSnip.exe</DCC_DependencyCheckOutputName>
 			<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
 			<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
 			<DCC_Platform>x86</DCC_Platform>
@@ -29,7 +29,7 @@
 			<DCC_S>false</DCC_S>
 			<DCC_F>false</DCC_F>
 			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
-			<DCC_DcuOutput>..\Bin</DCC_DcuOutput>
+			<DCC_DcuOutput>..\_build\bin</DCC_DcuOutput>
 			<DCC_E>false</DCC_E>
 		</PropertyGroup>
 		<ItemGroup>

Src/Help/CodeSnip.hhp

@@ -8,7 +8,7 @@
 
 [OPTIONS]
 Compatibility=1.1
-Compiled file=..\..\Exe\CodeSnip.chm
+Compiled file=..\..\_build\exe\CodeSnip.chm
 Contents file=TOC.hhc
 Default topic=HTML\welcome.htm
 Display compile progress=No

Src/Install/CodeSnip.iss

@@ -2,7 +2,7 @@
 ; v. 2.0. If a copy of the MPL was not distributed with this file, You can
 ; obtain one at https://mozilla.org/MPL/2.0/
 ;
-; Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+; Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
 ;
 ; Install file generation script for use with Inno Setup.
 
@@ -25,10 +25,10 @@
 #define ReadMeFile "ReadMe.txt"
 #define LicenseFile "License.rtf"
 #define LicenseTextFile "License.html"
-#define OutDir SourcePath + "..\..\Exe"
+#define OutDir SourcePath + "..\..\_build\exe"
 #define SrcDocsPath SourcePath + "..\..\Docs\"
-#define SrcAssetsPath SourcePath + '\Assets\"
-#define SrcExePath SourcePath + "..\..\Exe\"
+#define SrcAssetsPath SourcePath + "\Assets\"
+#define SrcExePath SourcePath + "..\..\_build\exe\"
 #define ProgDataSubDir AppName + ".4"
 #define ExeProg SrcExePath + ExeFile
 #define AppVersion DeleteToVerStart(GetFileProductVersion(ExeProg))

Src/Makefile

@@ -2,15 +2,22 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/
 #
-# Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+# Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
 #
 # Makefile for the CodeSnip project.
 
 
-# Define macros giving relative paths to other directories from location of
-# makefile
-BIN = ..\Bin
-EXE = ..\Exe
+# Define macros relative paths to various directories relative to the repo root
+BUILD_ROOT = _build
+BIN_ROOT = $(BUILD_ROOT)\bin
+EXE_ROOT = $(BUILD_ROOT)\exe
+RELEASE_ROOT = $(BUILD_ROOT)\release
+DOCS_ROOT = Docs
+SRC_ROOT = Src
+
+# Defines macros giving directories relative to location of the Makefile
+BIN_REL = ..\$(BIN_ROOT)
+EXE_REL = ..\$(EXE_ROOT)
 
 # Check for required environment variables
 
@@ -75,11 +82,10 @@ DELPHIDEFINES =
 
 # Implicit rules
 
-# Resource files are compiled to the directory specified by BIN macro, which
-# must have been set by the caller.
+# Resource files are compiled to the directory specified by BIN_REL macro.
 .rc.res:
   @echo +++ Compiling Resource file $< +++
-  @$(BRCC32) $< -fo$(BIN)\$(@F)
+  @$(BRCC32) $< -fo$(BIN_REL)\$(@F)
 
 # Version info files are compiled by VIEd. A temporary .rc file is left behind
 .vi.rc:
@@ -104,11 +110,12 @@ config:
   @copy /Y CodeSnip.cfg.tplt CodeSnip.cfg
   # Create build folders
   @cd ..
-  @if exist Bin rmdir /S /Q Bin
-  @mkdir Bin
-  @if not exist Exe mkdir Exe
-  @if not exist Release mkdir Release
-  @cd Src
+  @if not exist $(BUILD_ROOT) mkdir $(BUILD_ROOT)
+  @if exist $(BIN_ROOT) rmdir /S /Q $(BIN_ROOT)
+  @mkdir $(BIN_ROOT)
+  @if not exist $(EXE_ROOT) mkdir $(EXE_ROOT)
+  @if not exist $(RELEASE_ROOT) mkdir $(RELEASE_ROOT)
+  @cd $(SRC_ROOT)
 
 # Builds CodeSnip pascal files and links program
 pascal: CodeSnip.exe
@@ -118,14 +125,14 @@ pascal: CodeSnip.exe
 CodeSnip.exe:
   @echo +++ Compiling Pascal +++
 !ifdef PORTABLE
-  @if exist $(EXE)\$(@F) copy $(EXE)\$(@F) $(EXE)\$(@F).bak
+  @if exist $(EXE_REL)\$(@F) copy $(EXE_REL)\$(@F) $(EXE_REL)\$(@F).bak
 !endif
   @$(DCC32) $(@B).dpr -B  $(DELPHIDEFINES)
 !ifdef PORTABLE
-  @copy $(EXE)\$(@F) $(EXE)\$(@B)-p.exe /Y
-  @del $(EXE)\$(@F)
-  @if exist $(EXE)\$(@F).bak copy $(EXE)\$(@F).bak $(EXE)\$(@F)
-  @if exist $(EXE)\$(@F).bak del $(EXE)\$(@F).bak
+  @copy $(EXE_REL)\$(@F) $(EXE_REL)\$(@B)-p.exe /Y
+  @del $(EXE_REL)\$(@F)
+  @if exist $(EXE_REL)\$(@F).bak copy $(EXE_REL)\$(@F).bak $(EXE_REL)\$(@F)
+  @if exist $(EXE_REL)\$(@F).bak del $(EXE_REL)\$(@F).bak
 !endif
 
 # Builds help file
@@ -144,49 +151,58 @@ resources: $(VERINFOFILEBASE).res Resources.res HTML.res
 # Compiles HTMLres from .hrc file
 HTML.res: HTML.hrc
   @echo +++ Compiling HTML Resource manifest file +++
-  @$(HTMLRES) -mHTML.hrc -o$(BIN)\HTML.res -r -q
+  @$(HTMLRES) -mHTML.hrc -o$(BIN_REL)\HTML.res -r -q
 
 # Compiles type library from IDL
 typelib:
-  @$(GENTLB) .\ExternalObj.ridl -D$(BIN) -TExternalObj.tlb
+  @$(GENTLB) .\ExternalObj.ridl -D$(BIN_REL) -TExternalObj.tlb
 
 # Builds setup program
 setup:
 !ifndef PORTABLE
-  @del ..\Exe\CodeSnip-Setup-*
+  @del $(EXE_REL)\CodeSnip-Setup-*
   @$(ISCC) Install\CodeSnip.iss
 !else
   @echo **** Portable build - no setup file created ****
 !endif
 
 # Creates auto generated files
 autogen:
-  @$(TLIBIMP) -P+ -Ps+ -D.\AutoGen -FtIntfExternalObj $(BIN)\ExternalObj.tlb
+  @$(TLIBIMP) -P+ -Ps+ -D.\AutoGen -FtIntfExternalObj $(BIN_REL)\ExternalObj.tlb
   @if exist .\AutoGen\IntfExternalObj.dcr del .\AutoGen\IntfExternalObj.dcr
 
 # Build release files (.zip)
+# If RELEASEFILENAME is defined by caller then it is used as name of zip file
+# otherwise default zip file name is used, which depends on whether PORTABLE
+# is defined.
+# If VERSION is defined by caller then it is appended to RELEASEFILENAME,
+# separated by a dash.
 !ifndef RELEASEFILENAME
-RELEASEFILENAME = dd-codesnip
-!ifdef PORTABLE
-RELEASEFILENAME = $(RELEASEFILENAME)-portable
+!ifndef PORTABLE
+RELEASEFILENAME = codesnip-exe
+!else
+RELEASEFILENAME = codesnip-portable-exe
+!endif
 !endif
+!ifdef VERSION
+RELEASEFILENAME = $(RELEASEFILENAME)-$(VERSION)
 !endif
-OUTFILE = Release\$(RELEASEFILENAME).zip
+OUTFILE = $(RELEASE_ROOT)\$(RELEASEFILENAME).zip
 release:
   @echo ---------------------
   @echo Creating Release File
   @echo ---------------------
   @cd ..
   -@if exist $(OUTFILE) del $(OUTFILE)
 !ifndef PORTABLE
-  @$(ZIP) -j -9 $(OUTFILE) Exe\CodeSnip-Setup-*.exe Docs\ReadMe.txt
+  @$(ZIP) -j -9 $(OUTFILE) $(EXE_ROOT)\CodeSnip-Setup-*.exe $(DOCS_ROOT)\ReadMe.txt
 !else
-  @$(ZIP) -j -9 $(OUTFILE) Exe\CodeSnip-p.exe
-  @$(ZIP) -j -9 $(OUTFILE) Exe\CodeSnip.chm
-  @$(ZIP) -j -9 $(OUTFILE) Docs\ReadMe.txt
-  @$(ZIP) -j -9 $(OUTFILE) Docs\License.html
+  @$(ZIP) -j -9 $(OUTFILE) $(EXE_ROOT)\CodeSnip-p.exe
+  @$(ZIP) -j -9 $(OUTFILE) $(EXE_ROOT)\CodeSnip.chm
+  @$(ZIP) -j -9 $(OUTFILE) $(DOCS_ROOT)\ReadMe.txt
+  @$(ZIP) -j -9 $(OUTFILE) $(DOCS_ROOT)\License.html
 !endif
-  @cd Src
+  @cd $(SRC_ROOT)
 
 # Clean up unwanted files
 clean:
@@ -200,4 +216,4 @@ clean:
   -@del /S *.tvsconfig 2>nul
   # remove __history folders
   -@for /F "usebackq" %i in (`dir /S /B /A:D ..\__history`) do @rmdir /S /Q %i
-  @cd Src
+  @cd $(SRC_ROOT)