:Include APL fixed

aplteam · Feb 18, 2019 · 5e33f9d · 5e33f9d
1 parent 2b739af
commit 5e33f9d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/APLSource/TestCases-11/Test_ZZZ_999-e1.aplf b/APLSource/TestCases-11/Test_ZZZ_999-e1.aplf
@@ -1,38 +1,33 @@
- R←Test_ZZZ_999(stopFlag batchFlag);v;n;d;xml;rf;f1;f2;f3;⎕TRAP
- ⍝ Check the "Version" function and publish.config and history.txt
+ R←Test_ZZZ_999(stopFlag batchFlag);v;n;d;xml;rf;f1;f2;⎕TRAP
+⍝ Check the "Version" function and publish.config.
  ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
  R←∆Failed
 
  rf←#._WinReg.WinReg
 
 ⍝ 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~'.'
 
  f1∨←10≠⍴d
  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';]
 
-⍝ history.txt might be useful during development but must not exist
-⍝ when the project is checked in:
- f3←⎕NEXISTS'history.txt'
-
  :If f1
      ⎕←'Result of the "Version" function is invalid.'
  :EndIf
  :If f2
      ⎕←'The contents of "publish.config" is not in line with "Version".'
  :EndIf
- :If f3
-     ⎕←'There is a file "history.txt" but there shouldn''t.'
- :EndIf
 
- →FailsIf f1∨f2∨f3
+ →FailsIf f1∨f2
 
  R←∆OK
diff --git a/APLSource/WinReg-9.aplc b/APLSource/WinReg-9.aplc
@@ -36,17 +36,17 @@
     ⎕ML←3
     ⎕IO←1
 
-    :Include ##.APLTreeUtils
+    :Include APLTreeUtils
 
     ∇ R←Version
       :Access Public Shared
-      R←(Last⍕⎕THIS)'3.0.0.3' '2018-02-16'
+      R←(Last⍕⎕THIS)'3.0.1.4' '2019-02-18'
     ∇
 
     ∇ History
       :Access Public Shared
-      ⍝ * 3.0.0
-      ⍝   * First version after the conversion from the APL wiki to GitHub.
+      ⍝ * 3.0.1
+      ⍝   * :Include APLTreeUtils fixed.
       ⍝\\
       ⍝ For information regarding older versions see <https://github.com/aplteam/WinReg/releases>
     ∇

diff --git a/acre.config b/acre.config
@@ -1 +1 @@
-[   CaseCode←'On'   KeepHistory←'On'   Open←''   ProjectSpace←'#._WinReg'   StartUp←'']
+[   CaseCode←'On'   Open←''   ProjectSpace←'#._WinReg'   StartUp←'']

diff --git a/publish.config b/publish.config
@@ -1 +1 @@
-<tool name="WinReg">  <version>3.0.0</version>  <date>2018-02-16</date>  <container>#._WinReg</container>  <files></files>  <needs>    <script>APLTreeUtils</script>    <script>FilesAndDirs</script>    <script>OS</script>    <script>Tester</script>  </needs>  <scriptOnly>1</scriptOnly>  <wsid>Development</wsid>  <autoload>1</autoload>  <buildid>3</buildid></tool>
+<tool name="WinReg">  <version>3.0.1</version>  <date>2019-02-18</date>  <container>#._WinReg</container>  <files></files>  <needs>    <script>APLTreeUtils</script>    <script>FilesAndDirs</script>    <script>OS</script>    <script>Tester</script>  </needs>  <scriptOnly>1</scriptOnly>  <wsid>Development</wsid>  <autoload>1</autoload>  <buildid>4</buildid></tool>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[ CaseCode←'On' KeepHistory←'On' Open←'' ProjectSpace←'#._WinReg' StartUp←'']
		[ CaseCode←'On' Open←'' ProjectSpace←'#._WinReg' StartUp←'']
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<tool name="WinReg"> <version>3.0.0</version> <date>2018-02-16</date> <container>#._WinReg</container> <files></files> <needs> <script>APLTreeUtils</script> <script>FilesAndDirs</script> <script>OS</script> <script>Tester</script> </needs> <scriptOnly>1</scriptOnly> <wsid>Development</wsid> <autoload>1</autoload> <buildid>3</buildid></tool>
		<tool name="WinReg"> <version>3.0.1</version> <date>2019-02-18</date> <container>#._WinReg</container> <files></files> <needs> <script>APLTreeUtils</script> <script>FilesAndDirs</script> <script>OS</script> <script>Tester</script> </needs> <scriptOnly>1</scriptOnly> <wsid>Development</wsid> <autoload>1</autoload> <buildid>4</buildid></tool>
Expand Down