"Make" polished

aplteam · May 1, 2018 · 77d5e09 · 77d5e09
1 parent 9716d97
commit 77d5e09
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 31,540 deletions.
diff --git a/APLSource/LogDog-9/Version-1.function b/APLSource/LogDog-9/Version-1.function
@@ -1,3 +1,3 @@
  r←Version
  ⍝ See also History
- r←(#.APLTreeUtils.Last⍕⎕THIS)'2.1.1.6' '2018-05-01'
+ r←(#.APLTreeUtils.Last⍕⎕THIS)'2.1.1.7' '2018-05-01'
diff --git a/APLSource/TestCases-11/StartLogFileWriter-1121.function b/APLSource/TestCases-11/StartLogFileWriter-1121.function
@@ -1,7 +1,7 @@
  handle←StartLogFileWriter filename;⎕WX;cmd;rc
  ⎕WX←3
  cmd←⊂'"',(↑#.GetCommandLineArgs),'"'
- cmd,←⊂'"',filename,'"'
+ cmd,←⊂'-filename="',filename,'"'
  cmd,←⊂'"',#.FilesAndDirs.PWD,'\Tests\WriteLogFile.dws"'
  :If 0
      cmd,←⊂'-lx'

diff --git a/APLSource/TestCases-11/Test_ZZZ_999-e1.function b/APLSource/TestCases-11/Test_ZZZ_999-e1.function
@@ -1,12 +1,13 @@
  R←Test_ZZZ_999(stopFlag batchFlag);v;n;d;xml;rf;f1;f2;⎕TRAP
- ⍝ Check the "Version" function and publish.config and history.txt
+ ⍝ Check the "Version" function and publish.config.
  ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
  R←∆Failed
 
  rf←#._LogDog.LogDog
 
 ⍝ First we check whether "Version" returns a valid result:
  (n v d)←rf.Version
+ v←{⍵/⍨3>+\'.'=⍵}v      ⍝ Remove build ID
  f1←~5≤⍴v
  f1∨←2≠'.'+.=v
  f1∨←~∧/⎕D∊⍨v~'.'
@@ -15,10 +16,18 @@
  f1∨←d[4 7+⎕IO]∨.≠'-'
  f1∨←~∧/⎕D∊⍨d~'-'
 
+⍝ publish.config must be in line with what "Version" returns of course:
+ xml←⎕XML'flat'#.APLTreeUtils.ReadUtf8File'publish.config'
+ f2←v≢(2+⎕IO)⊃xml[xml[;1+⎕IO]⍳⊂'version';]
+ f2∨←d≢(2+⎕IO)⊃xml[xml[;1+⎕IO]⍳⊂'date';]
+
  :If f1
      ⎕←'Result of the "Version" function is invalid.'
  :EndIf
+ :If f2
+     ⎕←'The contents of "publish.config" is not in line with "Version".'
+ :EndIf
 
- →FailsIf f1
+ →FailsIf f1∨f2
 
  R←∆OK
diff --git a/LogDog.dws b/LogDog.dws
diff --git a/LogDog.iss b/LogDog.iss
@@ -1,6 +1,6 @@
 ; This script is best executed by LogDog's "Make" utility.
 
-#define MyAppVersion "2.1.1.6"
+#define MyAppVersion "2.1.1.7"
 #define MyAppName "LogDog"
 #define MyAppExeName "LogDog.exe"
 #define MyAppPublisher "APL Team Ltd"

diff --git a/Tests/MAXWS=256M b/Tests/MAXWS=256M
diff --git a/Tests/ProcessID b/Tests/ProcessID
diff --git a/Tests/WriteLogFile.dws b/Tests/WriteLogFile.dws
diff --git a/publish.config b/publish.config
@@ -1 +1 @@
-<tool name="LogDog">  <version>2.1.0</version>  <date>2018-05-01</date>  <container>#._LogDog</container>  <files></files>  <needs>    <script library="APLTree">APLTreeUtils</script>    <script library="APLTree">DateAndTime</script>    <script library="APLTree">HandleError</script>    <script library="APLTree">FilesAndDirs</script>    <script library="APLTree">MarkAPL</script>    <script library="APLTree">OS</script>    <script library="APLTree">Tester</script>    <script library="APLTree">WinReg</script>    <script library="APLTree">WinSys</script>    <ws copy="Markdown2Help" library="APL-cation">Markdown2Help</ws>  </needs>  <scriptOnly>0</scriptOnly>  <wsid>Development</wsid>  <autoload>1</autoload>  <buildid>6</buildid></tool>
+<tool name="LogDog">  <version>2.1.1</version>  <date>2018-05-01</date>  <container>#._LogDog</container>  <files></files>  <needs>    <script library="APLTree">APLTreeUtils</script>    <script library="APLTree">DateAndTime</script>    <script library="APLTree">HandleError</script>    <script library="APLTree">FilesAndDirs</script>    <script library="APLTree">MarkAPL</script>    <script library="APLTree">OS</script>    <script library="APLTree">Tester</script>    <script library="APLTree">WinReg</script>    <script library="APLTree">WinSys</script>    <ws copy="Markdown2Help" library="APL-cation">Markdown2Help</ws>  </needs>  <scriptOnly>0</scriptOnly>  <wsid>Development</wsid>  <autoload>1</autoload>  <buildid>7</buildid></tool>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<tool name="LogDog"> <version>2.1.0</version> <date>2018-05-01</date> <container>#._LogDog</container> <files></files> <needs> <script library="APLTree">APLTreeUtils</script> <script library="APLTree">DateAndTime</script> <script library="APLTree">HandleError</script> <script library="APLTree">FilesAndDirs</script> <script library="APLTree">MarkAPL</script> <script library="APLTree">OS</script> <script library="APLTree">Tester</script> <script library="APLTree">WinReg</script> <script library="APLTree">WinSys</script> <ws copy="Markdown2Help" library="APL-cation">Markdown2Help</ws> </needs> <scriptOnly>0</scriptOnly> <wsid>Development</wsid> <autoload>1</autoload> <buildid>6</buildid></tool>
		<tool name="LogDog"> <version>2.1.1</version> <date>2018-05-01</date> <container>#._LogDog</container> <files></files> <needs> <script library="APLTree">APLTreeUtils</script> <script library="APLTree">DateAndTime</script> <script library="APLTree">HandleError</script> <script library="APLTree">FilesAndDirs</script> <script library="APLTree">MarkAPL</script> <script library="APLTree">OS</script> <script library="APLTree">Tester</script> <script library="APLTree">WinReg</script> <script library="APLTree">WinSys</script> <ws copy="Markdown2Help" library="APL-cation">Markdown2Help</ws> </needs> <scriptOnly>0</scriptOnly> <wsid>Development</wsid> <autoload>1</autoload> <buildid>7</buildid></tool>
Expand Down