Synax change: <Version> now returns a simple string with the version number

Author: aplteam

APLSource/Admin/Make.aplf

@@ -1,10 +1,14 @@
  Make flag;M;C;path;zipFilename;res;cfg;parms
  :If flag
+     :If 0=⎕SE.⎕NC'MakeHelpers'
+         {}⎕SE.Tatin.LoadPackages'[tatin]MakeHelpers'⎕SE
+     :EndIf
      M←⎕SE.MakeHelpers
      C←##.CiderConfig
      path←C.HOME,'/',C.CIDER.distributionFolder
-     cfg←⎕JSON⍠('Dialect' 'JSON5')⊢⊃⎕NGET C.HOME,'/apl-package.json'
-     cfg←M.EditVersion cfg
+     :If ⎕NULL≡cfg←M.EditPackageConfigFile C.HOME
+         ⎕←'Cancelled by user' ⋄ →0
+     :EndIf
      M.RecreateFolder path
      parms←⎕SE.Tatin.CreateBuildParms C.HOME
      parms.targetPath←C.CIDER.distributionFolder

APLSource/OS.aplc

@@ -9,35 +9,39 @@
 
     ⎕IO←1 ⋄ ⎕ML←1
 
-    ∇ r←Version;buff;history;date
-      :Access Public shared
-    ⍝ Returns the version number from TatinVars
+    ∇ r←Version
+      :Access Public Shared
+    ⍝ Returns the version number from `TatinVars` if possible.
     ⍝ See also `History`
       :If 0<⎕NC'TatinVars.CONFIG'
-          buff←(⎕JSON⍠('Dialect' 'JSON5')⊢TatinVars.CONFIG).version
+          r←(⎕JSON⍠('Dialect' 'JSON5')⊢TatinVars.CONFIG).version
       :ElseIf 0<##.⎕NC'TatinVars.CONFIG'
-          buff←(⎕JSON⍠('Dialect' 'JSON5')⊢##.TatinVars.CONFIG).version
+          r←(⎕JSON⍠('Dialect' 'JSON5')⊢##.TatinVars.CONFIG).version
+      :Else
+    ⍝ When a script was not loaded with Tatin, there will be no namespace `TatinVars`.
+    ⍝ In such cases we cannot provide a version number, so we return just ''.
+          r←''
       :EndIf
-      history←History
-      date←{⍵↑⍨¯1+⍵⍳' '}'from'{⍵↓⍨(≢⍺)+1⍳⍨⍺⍷⍵}history[1;]
-      r←'OS'buff date
-    ⍝Done
     ∇
 
     ∇ r←History
       :Access Public shared
-      ⍝ * 3.2.0 from 2024-12-25
+      ⍝ * 4.0.0 ⋄ 2025-03-28
+      ⍝   * `Version` has changed its syntax: it returns just a simple string with the version number now 
+      ⍝     which comes from the package config file.
+      ⍝   * `Make` improved.
+      ⍝ * 3.2.0 ⋄ 2024-12-25
       ⍝   * The `Version` functions reports now what's defined in the package config file
       ⍝   * Packages updated
-      ⍝ * 3.1.1 from 2023-05-08
+      ⍝ * 3.1.1 ⋄ 2023-05-08
       ⍝   * APLTreeUtils2 updated which was buggy (wrong version number)
-      ⍝ * 3.1.0 from 2023-05-02
+      ⍝ * 3.1.0 ⋄ 2023-05-02
       ⍝   * New method `GetTaskList` added
       ⍝   * `History now returns a useful result
-      ⍝ * 3.0.1 from 2021-03-01
+      ⍝ * 3.0.1 ⋄ 2021-03-01
       ⍝   * Package config file corrected (new format)
       ⍝   * APLTreeUtils2.Uppercase replaced by a call to 1 ⎕C
-      ⍝ * 3.0.0 from 2020-09-07
+      ⍝ * 3.0.0 ⋄ 2020-09-07
       ⍝   * Does not :Include APLTreeUtils anymore (but requires the class APLTreeUtils2)
       ⍝   * Uses ⎕ML←1 and  ⎕IO←1 internally
       ⍝   * Needs at least Dyalog 18.0

APLSource/TestCases/Test_Misc_001.aplf

@@ -1,8 +1,10 @@
- R←Test_Misc_001(stopFlag batchFlag);⎕TRAP
+ R←Test_Misc_001(stopFlag batchFlag);⎕TRAP;version
 ⍝ Exercise the `Version` method
  ⎕TRAP←(999 'C' '. ⍝ Deliberate error')(0 'N')
  R←T._Failed
 
- →T.PassesIf 3=≢##.OS.Version
+ version←##.OS.Version
+ →T.PassesIf 1=≢⊆version
+ →T.PassesIf∧/('+.'~⍨{⍵↑⍨¯1+⍵⍳'-'}version)∊⎕D
 
  R←T._OK

APLSource/TestCases/Test_Misc_004.aplf

@@ -19,5 +19,5 @@
   source: "APLSource/OS.aplc",
   tags: "os-tools,windows,linux,mac-os,dyalog-apl",
   userCommandScript: "",
-  version: "3.2.0+62",
+  version: "4.0.0+67",
 }