Skip to content

Commit d5f480b

Browse files
aplteamaplteam
committed
Folder structure improved
1 parent 7ef4c9e commit d5f480b

File tree

9 files changed

+22
-13
lines changed

9 files changed

+22
-13
lines changed

‎APLSource/Admin/Make.aplf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{r}←Make batch;M;myUCMDsFolder;targetPath;H;F;C;sourceFolder;cfg;currentVersion;caption;options;choice;version;zipFilename;flag;question;res
22
r←0
33
⎕IO←1 ⋄ ⎕ML←1
4-
M←⎕SE.MakeHelpers ⋄ C←##.CiderConfig ⋄ F←##.FilesAndDirs
4+
M←⎕SE.MakeHelpers ⋄ C←##.CiderConfig ⋄ F←##.Latest.FilesAndDirs
55
targetPath←C.HOME,'/Dist/'
66
sourceFolder←C.HOME,'/',C.CIDER.source
77
myUCMDsFolder←M.GetMyUCMDsFolder''

‎APLSource/Latest/Run.aplf‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
r←Run(path_ recursive stats all noOf);hasOpenAcreProjects;F;A;bool;projects;buff;pathFlag;path;projects1;hasOpenCiderProjects;projects2;ind;ref;name;isAcreProject;isCiderProject
1+
r←Run(path_ recursive stats all noOf);hasOpenAcreProjects;F;A;bool;projects;buff;pathFlag;path;projects1;hasOpenCiderProjects;projects2;ind;ref;name;isAcreProject;isCiderProject;⎕ML;⎕IO
22
⍝ Handles the following cases:
33
⍝ * Investigate the workspace (simple namespace or #)
44
⍝ * Investigate (currently tracked/opened) acre projects
55
⍝ * Investigate (currently tracked/opened) Cider projects
66
⍝ * Investigate a folder
7-
A←##.APLTreeUtils2 ⋄ F←##.FilesAndDirs
7+
⎕IO←0 ⋄ ⎕ML←3
8+
A←APLTreeUtils2 ⋄ F←FilesAndDirs
89
r←''
910
pathFlag←hasOpenAcreProjects←hasOpenCiderProjects←0
1011
path←path_
@@ -22,7 +23,7 @@
2223
projects←(projects1,1)⍪(projects2,2)
2324
:If 0=≢projects
2425
path←'expand'F.NormalizePath F.PWD,F.CurrentSep ⍝ Current dir is the best we can do here
25-
:If ##.CommTools.YesOrNo'Are you sure that you want to scan ',path,' ?'
26+
:If CommTools.YesOrNo'Are you sure that you want to scan ',path,' ?'
2627
pathFlag←1
2728
:Else
2829
:Return

‎APLSource/Latest_uc.dyalog‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
∇ r←Run(Cmd Args);⎕IO;⎕ML;stats;noOf;flag;value;ref;recursive;path;all;version
1515
:Access Shared Public
16-
⎕IO←⎕ML←1
16+
⎕IO←1 ⋄ ⎕ML←3
1717
version←0 Args.Switch'version'
1818
:If version
1919
r←⎕SE.Latest.Version ⋄ →0

‎APLSource/TestCases/Initial.aplf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
⍝ The test cases requires that no Cider project is open, therefore we check
33
success←1
44
:If 0<≢⎕SE.Cider.ListOpenProjects 0
5-
:If 1 ##.CommTools.YesOrNo 'The test suite required that no Cider projects are open. Close all?'
5+
:If 1 ##.Latest.CommTools.YesOrNo 'The test suite required that no Cider projects are open. Close all?'
66
{}⎕SE.Cider.CloseProject''
77
:Else
88
⎕←'Cancelled by user: there are open Cider projects'

‎APLSource/TestCases/Test_140.aplf‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,22 @@
22
⍝ "Stats" for an acre project
33
⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
44

5+
:If 0=⎕SE.⎕NC'acre'
6+
:Trap 0
7+
⎕SE.UCMD'acre.Version'
8+
:Else
9+
R←T._NotApplicable ⋄ →0
10+
:EndTrap
11+
:EndIf
512
:If 0=≢⎕SE.acre.Projects''
6-
→0,R←T._NotApplicable
13+
R←T._NotApplicable ⋄ →0
714
:EndIf
815

916
R←T._Failed
1017

1118
path←##.CiderConfig.HOME,'/TestProject'
1219
result←⎕SE.acre.OpenProject path'#.TEMP2'
13-
Assert '#.TEMP2'≡result
20+
Assert'#.TEMP2'≡result
1421

1522
data←##.Latest.Run path 1 1 0 ⍬
1623
→T.GoToTidyUp(,2)≢⍴⍴data

‎APLSource/TestCases/Test_190.aplf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
R←Test_190(stopFlag batchFlag);⎕TRAP;data;path;parms
1+
R←Test_190(stopFlag batchFlag);⎕TRAP;data;path;parms;log;success
22
⍝ Check whether a non-default "Source" is taken into account
33
⎕TRAP←(999 'C' '∘∘∘ ⍝ Deliberate error')(0 'N')
44

@@ -11,7 +11,8 @@
1111
parms.parent←'#'
1212
parms.projectSpace←'TEMP'
1313
parms.quietFlag←1
14-
Assert ⎕SE.Cider.OpenProject parms
14+
(success log)←⎕SE.Cider.OpenProject parms
15+
Assert success
1516

1617
data←##.Latest.Run'' 1 0 0 9999
1718
→T.GoToTidyUp~0<≢data

‎APLSource/quadVars.apln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
:Namespace quadVars
2-
##.(⎕IO ⎕ML ⎕WX)←0 3 3
2+
##.(⎕IO ⎕ML)←0 3
33
⍝ This script was fixed by acre
44
⍝ it can be kept, cloned, renamed, amended or ]erased.
55
⍝ its purpose is to set the environment for the project.

‎apl-package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ api: "Latest", assets: "", description: "Lists APL objects by change date/time", documentation: "", files: "", group: "aplteam", io: 1, license: "MIT", lx: "", maintainer: "kai@aplteam.com", minimumAplVersion: "18.0", ml: 1, name: "Latest", os_lin: 1, os_mac: 1, os_win: 1, project_url: "https://github.com/aplteam/Latest", source: "APLSource", tags: "list-apl-objects", userCommandScript: "APLSource/Latest_uc.dyalog", version: "6.0.0+147",}
1+
{ api: "", assets: "", description: "Lists APL objects by change date/time", documentation: "", files: "", group: "aplteam", io: 1, license: "MIT", lx: "", maintainer: "kai@aplteam.com", minimumAplVersion: "18.0", ml: 1, name: "Latest", os_lin: 1, os_mac: 1, os_win: 1, project_url: "https://github.com/aplteam/Latest", source: "APLSource/Latest", tags: "list-apl-objects", userCommandScript: "APLSource/Latest_uc.dyalog", version: "6.0.0+150",}

‎cider.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ CIDER: { githubUsername: "aplteam", init: "", make: "Admin.Make 0", parent: "#", projectSpace: "Latest", project_url: "https://github.com/aplteam/Latest", source: "APLSource", tatinFolder: "packages/,packages_dev=TestCases", tests: "TestCases.RunTests", }, LINK: { arrays: 0, beforeRead: "", beforeWrite: "", caseCode: 0, codeExtensions: [ "aplf", "aplo", "apln", "aplc", "apli", "dyalog", "apl", "mipage", ], fastLoad: 0, flatten: 0, forceExtensions: 0, forceFilenames: 1, getFilename: "", typeExtensions: [ [ 2, "apla", ], [ 3, "aplf", ], [ 4, "aplo", ], [ 9.1, "apln", ], [ 9.4, "aplc", ], [ 9.5, "apli", ], ], watch: "ns", }, SYSVARS: { io: 1, ml: 1, }, USER: { },}
1+
{ CIDER: { githubUsername: "aplteam", init: "", make: "Admin.Make 0", parent: "#", projectSpace: "Latest", project_url: "https://github.com/aplteam/Latest", source: "APLSource", tatinFolder: "packages=Latest,packages_dev=TestCases", tests: "TestCases.RunTests", }, LINK: { arrays: 0, beforeRead: "", beforeWrite: "", caseCode: 0, codeExtensions: [ "aplf", "aplo", "apln", "aplc", "apli", "dyalog", "apl", "mipage", ], fastLoad: 0, flatten: 0, forceExtensions: 0, forceFilenames: 1, getFilename: "", typeExtensions: [ [ 2, "apla", ], [ 3, "aplf", ], [ 4, "aplo", ], [ 9.1, "apln", ], [ 9.4, "aplc", ], [ 9.5, "apli", ], ], watch: "ns", }, SYSVARS: { io: 1, ml: 1, }, USER: { },}

0 commit comments

Comments
 (0)