From 1863d673e9597436c341001a901f187deb0dfb3e Mon Sep 17 00:00:00 2001 From: Kai Jaeger Date: Fri, 22 Nov 2024 11:01:25 +0100 Subject: [PATCH 1/4] API added --- APLSource/.linkconfig | 2 +- APLSource/Sort/API/Classic.aplo | 1 + APLSource/Sort/API/Danish.aplo | 1 + APLSource/Sort/API/Finnish.aplo | 1 + APLSource/Sort/API/German.aplo | 1 + APLSource/{ => Sort}/AtUE.aplo | 0 APLSource/{ => Sort}/Classic.aplo | 0 APLSource/{ => Sort}/Danish.aplo | 0 APLSource/{ => Sort}/ExpLigs.aplo | 0 APLSource/{ => Sort}/Finnish.aplo | 0 APLSource/{ => Sort}/Full.aplf | 0 APLSource/{ => Sort}/German.aplo | 0 APLSource/{ => Sort}/IsSp.aplf | 0 APLSource/{ => Sort}/LoUp.aplf | 0 APLSource/{ => Sort}/Mix.aplf | 0 APLSource/{ => Sort}/Natural.aplo | 0 APLSource/Sort/Public.aplf | 2 ++ APLSource/{ => Sort}/Sort.aplo | 0 APLSource/{ => Sort}/Under.aplo | 0 APLSource/{ => Sort}/VariantsOf.aplo | 0 APLSource/{ => Sort}/last.apla | 0 APLSource/{ => Sort}/spaces.apla | 0 APLSource/{ => Sort}/zero.apla | 0 23 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 APLSource/Sort/API/Classic.aplo create mode 100644 APLSource/Sort/API/Danish.aplo create mode 100644 APLSource/Sort/API/Finnish.aplo create mode 100644 APLSource/Sort/API/German.aplo rename APLSource/{ => Sort}/AtUE.aplo (100%) rename APLSource/{ => Sort}/Classic.aplo (100%) rename APLSource/{ => Sort}/Danish.aplo (100%) rename APLSource/{ => Sort}/ExpLigs.aplo (100%) rename APLSource/{ => Sort}/Finnish.aplo (100%) rename APLSource/{ => Sort}/Full.aplf (100%) rename APLSource/{ => Sort}/German.aplo (100%) rename APLSource/{ => Sort}/IsSp.aplf (100%) rename APLSource/{ => Sort}/LoUp.aplf (100%) rename APLSource/{ => Sort}/Mix.aplf (100%) rename APLSource/{ => Sort}/Natural.aplo (100%) create mode 100644 APLSource/Sort/Public.aplf rename APLSource/{ => Sort}/Sort.aplo (100%) rename APLSource/{ => Sort}/Under.aplo (100%) rename APLSource/{ => Sort}/VariantsOf.aplo (100%) rename APLSource/{ => Sort}/last.apla (100%) rename APLSource/{ => Sort}/spaces.apla (100%) rename APLSource/{ => Sort}/zero.apla (100%) diff --git a/APLSource/.linkconfig b/APLSource/.linkconfig index f45dd30..c3e68bb 100644 --- a/APLSource/.linkconfig +++ b/APLSource/.linkconfig @@ -1 +1 @@ -{ LinkVersion: { ID: "4.0.20"}, Settings: { arrays: 1, }, } +{ LinkVersion: { ID: "4.0.17"}, Settings: { arrays: 1, }, } diff --git a/APLSource/Sort/API/Classic.aplo b/APLSource/Sort/API/Classic.aplo new file mode 100644 index 0000000..47e696c --- /dev/null +++ b/APLSource/Sort/API/Classic.aplo @@ -0,0 +1 @@ +Classic←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.Classic) ⍵} diff --git a/APLSource/Sort/API/Danish.aplo b/APLSource/Sort/API/Danish.aplo new file mode 100644 index 0000000..e026851 --- /dev/null +++ b/APLSource/Sort/API/Danish.aplo @@ -0,0 +1 @@ +Danish←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.Danish) ⍵} diff --git a/APLSource/Sort/API/Finnish.aplo b/APLSource/Sort/API/Finnish.aplo new file mode 100644 index 0000000..9a0699f --- /dev/null +++ b/APLSource/Sort/API/Finnish.aplo @@ -0,0 +1 @@ +Finnish←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.Finnish) ⍵} diff --git a/APLSource/Sort/API/German.aplo b/APLSource/Sort/API/German.aplo new file mode 100644 index 0000000..be66a3f --- /dev/null +++ b/APLSource/Sort/API/German.aplo @@ -0,0 +1 @@ +German←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.German) ⍵} diff --git a/APLSource/AtUE.aplo b/APLSource/Sort/AtUE.aplo similarity index 100% rename from APLSource/AtUE.aplo rename to APLSource/Sort/AtUE.aplo diff --git a/APLSource/Classic.aplo b/APLSource/Sort/Classic.aplo similarity index 100% rename from APLSource/Classic.aplo rename to APLSource/Sort/Classic.aplo diff --git a/APLSource/Danish.aplo b/APLSource/Sort/Danish.aplo similarity index 100% rename from APLSource/Danish.aplo rename to APLSource/Sort/Danish.aplo diff --git a/APLSource/ExpLigs.aplo b/APLSource/Sort/ExpLigs.aplo similarity index 100% rename from APLSource/ExpLigs.aplo rename to APLSource/Sort/ExpLigs.aplo diff --git a/APLSource/Finnish.aplo b/APLSource/Sort/Finnish.aplo similarity index 100% rename from APLSource/Finnish.aplo rename to APLSource/Sort/Finnish.aplo diff --git a/APLSource/Full.aplf b/APLSource/Sort/Full.aplf similarity index 100% rename from APLSource/Full.aplf rename to APLSource/Sort/Full.aplf diff --git a/APLSource/German.aplo b/APLSource/Sort/German.aplo similarity index 100% rename from APLSource/German.aplo rename to APLSource/Sort/German.aplo diff --git a/APLSource/IsSp.aplf b/APLSource/Sort/IsSp.aplf similarity index 100% rename from APLSource/IsSp.aplf rename to APLSource/Sort/IsSp.aplf diff --git a/APLSource/LoUp.aplf b/APLSource/Sort/LoUp.aplf similarity index 100% rename from APLSource/LoUp.aplf rename to APLSource/Sort/LoUp.aplf diff --git a/APLSource/Mix.aplf b/APLSource/Sort/Mix.aplf similarity index 100% rename from APLSource/Mix.aplf rename to APLSource/Sort/Mix.aplf diff --git a/APLSource/Natural.aplo b/APLSource/Sort/Natural.aplo similarity index 100% rename from APLSource/Natural.aplo rename to APLSource/Sort/Natural.aplo diff --git a/APLSource/Sort/Public.aplf b/APLSource/Sort/Public.aplf new file mode 100644 index 0000000..f6a0578 --- /dev/null +++ b/APLSource/Sort/Public.aplf @@ -0,0 +1,2 @@ + r←Public + r←'Classic' 'Natural' 'Danish' 'Finnish' 'German' diff --git a/APLSource/Sort.aplo b/APLSource/Sort/Sort.aplo similarity index 100% rename from APLSource/Sort.aplo rename to APLSource/Sort/Sort.aplo diff --git a/APLSource/Under.aplo b/APLSource/Sort/Under.aplo similarity index 100% rename from APLSource/Under.aplo rename to APLSource/Sort/Under.aplo diff --git a/APLSource/VariantsOf.aplo b/APLSource/Sort/VariantsOf.aplo similarity index 100% rename from APLSource/VariantsOf.aplo rename to APLSource/Sort/VariantsOf.aplo diff --git a/APLSource/last.apla b/APLSource/Sort/last.apla similarity index 100% rename from APLSource/last.apla rename to APLSource/Sort/last.apla diff --git a/APLSource/spaces.apla b/APLSource/Sort/spaces.apla similarity index 100% rename from APLSource/spaces.apla rename to APLSource/Sort/spaces.apla diff --git a/APLSource/zero.apla b/APLSource/Sort/zero.apla similarity index 100% rename from APLSource/zero.apla rename to APLSource/Sort/zero.apla From e306d2f94621c61c202b7a4232e6fd5f32007677 Mon Sep 17 00:00:00 2001 From: Kai Jaeger Date: Fri, 22 Nov 2024 11:01:57 +0100 Subject: [PATCH 2/4] function added --- APLSource/Admin/Make.aplf | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 APLSource/Admin/Make.aplf diff --git a/APLSource/Admin/Make.aplf b/APLSource/Admin/Make.aplf new file mode 100644 index 0000000..8be1e68 --- /dev/null +++ b/APLSource/Admin/Make.aplf @@ -0,0 +1,22 @@ + Make flag;M;C;path;zipFilename;res;version;cfg;parms +⍝ "Make" a new version of this project + :If flag + :If 0=⎕SE.⎕NC'MakeHelpers' + ⎕←'Loading package "MakeHelpers" into ⎕SE...' + {}⎕SE.Tatin.LoadPackages'[tatin]aplteam-MakeHelpers'⎕SE + ⎕←' Done!' + :EndIf + M←⎕SE.MakeHelpers + C←##.CiderConfig + path←C.HOME,'/',C.CIDER.distributionFolder + cfg←⎕JSON⍠('Dialect' 'JSON5')⊢⊃⎕NGET C.HOME,'/apl-package.json' + version←M.CompileVersionNumberPattern cfg + M.RecreateFolder path + {}⎕SE.Tatin.CreateAPIfromCFG ##.Sort cfg + parms←⎕SE.Tatin.CreateBuildParms C.HOME + parms.targetPath←path + parms.version←version + zipFilename←⎕SE.Tatin.BuildPackage parms + ⎕←'*** New version build successfully:',M.CR,' ',zipFilename + :EndIf +⍝Done From f6e3cb72819614123a680df89e4febf1c236a749 Mon Sep 17 00:00:00 2001 From: Kai Jaeger Date: Fri, 22 Nov 2024 11:02:54 +0100 Subject: [PATCH 3/4] file .gitignore added --- .gitignore | 10 ++++++++++ apl-package.json | 8 ++++---- cider.config | 9 ++++----- 3 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f1f5598 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +aplcore +CONTINUE.dws +conga.crash +/packages/* +!/packages/apl-dependencies.txt +!/packages/apl-buildlist.json +/packages_dev/* +!/packages_dev/apl-dependencies.txt +!/packages_dev/apl-buildlist.json +/Dist/ diff --git a/apl-package.json b/apl-package.json index e69116b..569fe2d 100644 --- a/apl-package.json +++ b/apl-package.json @@ -1,5 +1,5 @@ { - api: "", + api: "API", assets: "", description: "Allow sorting according to various rules", documentation: "", @@ -11,13 +11,13 @@ maintainer: "a.brudz@gmail.com", minimumAplVersion: "18.0", ml: 1, - name: "sort", + name: "Sort", os_lin: 1, os_mac: 1, os_win: 1, project_url: "https://github.com/abrudz/sort", - source: "APLSource", + source: "APLSource/Sort", tags: "sorting,natural-sort,language", userCommandScript: "", - version: "0.1.0+3", + version: "0.1.1+8", } diff --git a/cider.config b/cider.config index 33607f3..812517c 100644 --- a/cider.config +++ b/cider.config @@ -1,22 +1,21 @@ { CIDER: { - cider_version: "0.42.2", + cider_version: "0.44.0", dependencies: { - nuget: "nuget-dependencies", - tatin: "tatin-dependencies", + nuget: "", + tatin: "", }, dependencies_dev: { tatin: "tatin-dependencies_dev", }, distributionFolder: "Dist", init: "", - make: "", + make: "Admin.Make 1", parent: "#", projectSpace: "Sort", project_url: "", source: "APLSource", tests: "", - version: "", }, LINK: { }, From 52879216ce498fa6388be8b89ad4f9d153fa9674 Mon Sep 17 00:00:00 2001 From: Kai Jaeger Date: Fri, 22 Nov 2024 11:08:31 +0100 Subject: [PATCH 4/4] added --- APLSource/Sort/API/Natural.aplo | 1 + apl-package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 APLSource/Sort/API/Natural.aplo diff --git a/APLSource/Sort/API/Natural.aplo b/APLSource/Sort/API/Natural.aplo new file mode 100644 index 0000000..c6f5bb6 --- /dev/null +++ b/APLSource/Sort/API/Natural.aplo @@ -0,0 +1 @@ +Natural←{⍺←⊢ ⋄ 1:shy←⍺ (⍺⍺ ##.Natural) ⍵} diff --git a/apl-package.json b/apl-package.json index 569fe2d..0eecfb2 100644 --- a/apl-package.json +++ b/apl-package.json @@ -19,5 +19,5 @@ source: "APLSource/Sort", tags: "sorting,natural-sort,language", userCommandScript: "", - version: "0.1.1+8", + version: "0.1.1+9", }