Generalize UCMD installation for any project

the-carlisle-group · Jul 23, 2019 · 94164b5 · 94164b5
1 parent ea27924
commit 94164b5
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 36 deletions.
diff --git a/APLSource/BuildApplication-21.aplf b/APLSource/BuildApplication-21.aplf
@@ -17,6 +17,7 @@
      _←tf ⎕NCOPY¨sf,¨⊂'acre.config'  ⍝ Copy config file
      _←tf ⎕NCOPY¨sf,¨⊂'ReleaseNotes'    ⍝ Copy release notes Folder
      _←RunInProcess'#.CarlisleGroup.AcreTools.BuildApplicationWorkspace'pc.ProjectFolder
+     _←(af,pc.ProjectName,'_UCMD.dyalog')⎕NCOPY AcreConfig.ProjectFolder,'Assets/Build/UCMD.dyalog'
      rf←pf,'dist/ReleaseArtifacts/'
      _←3 ⎕MKDIR rf
      zs←pf,'dist/Application'

diff --git a/APLSource/InstallUCMD-781.aplf b/APLSource/InstallUCMD-781.aplf
@@ -1,7 +1,5 @@
  InstallUCMD←{
-     d←↑⎕NPARTS ⎕WSID
-     a←↑#.Packages
-     p←d,a,'\Assets\Runtime'
+     p←↑⎕NPARTS ⎕WSID
      o←⎕SE.SALT.Settings'cmddir'
      e←(';'≠o)⊆o
      f←{¯3↑(~⍵∊'\/')⊆⍵}

diff --git a/APLSource/SetAppConfig-49.aplf b/APLSource/SetAppConfig-49.aplf
@@ -0,0 +1,10 @@
+ SetAppConfig←{
+     ⍝ ⍵ ←→ Application Folder
+     ⍝ ← ←→ Primary Project Space
+     d←{0=≢⍵:↑⎕NPARTS ⎕WSID ⋄ ⍵}⍵
+     r←⎕THIS.##.##
+     c←GetConfigSpace¨d∘,¨r.Packages,¨'/'
+     s←r⍎¨2↓¨c.ProjectSpace
+     s.AcreConfig←s.⎕NS c
+     ↑s
+ }
diff --git a/APLSource/StartApplication-21.aplf b/APLSource/StartApplication-21.aplf
@@ -1,9 +1,7 @@
  StartApplication←{
      ⍝ ⍵ ←→ n/a
-     p←↑⎕NPARTS ⎕WSID
-     c←GetConfigSpace¨p∘,¨#.Packages,¨'/'
-     s←⍎¨c.ProjectSpace
-     s.AcreConfig←s.⎕NS c
-     0=(↑c).⎕NC'ApplicationStartup':''
-     (↑s)⍎(↑c).ApplicationStartup
+     s←SetAppConfig 0
+     c←s.AcreConfig
+     0=c.⎕NC'ApplicationStartup':''
+     s⍎c.ApplicationStartup
  }
diff --git a/Assets/Build/UCMD.dyalog b/Assets/Build/UCMD.dyalog
@@ -0,0 +1,23 @@
+ :namespace ucmd                                                 
+    ⍝ AcreTools User Command File
+    ⍝ This file is identical for any Acre-based user command project. 
+    ⎕IO ⎕ML←0 1                                                         
+    GetProjectSpace←{
+        9=⎕NC 'ProjectSpace':ProjectSpace 
+        f←{6::##.t  ⋄ SALT_Data.SourceFile} 0
+        s←⎕NS ''
+        _←s.⎕CY '.dws',⍨(⊃⌽⍸'_'=f)↑f
+        r←s.CarlisleGroup.AcreTools.SetAppConfig ⊃⎕NPARTS f  
+        ⎕THIS.ProjectSpace←r
+        r
+    }
+    ∇ z←List
+      z←(GetProjectSpace 0).UserCommandList 0                                      
+    ∇
+    Help←{                                
+      (GetProjectSpace 0).UserCommandHelp ⍵                             
+   }
+    Run←{
+      (GetProjectSpace 0).UserCommandRun ⍵
+     }                                                                   
+ :endnamespace                                                         
diff --git a/Assets/Runtime/acretools.dyalog b/Assets/Runtime/acretools.dyalog
diff --git a/acre.config b/acre.config
@@ -1,5 +1,4 @@
-:Namespace
-    ApplicationStartup←'#.CarlisleGroup.AcreTools.InstallUCMD 0'
+:Namespace
     CaseCode←'On'
     GitHubAccount←'the-carlisle-group'
     KeepHistory←'Off'