diff --git a/APLSource/Admin/Make.aplf b/APLSource/Admin/Make.aplf index 5eb21a8..57e8ba4 100644 --- a/APLSource/Admin/Make.aplf +++ b/APLSource/Admin/Make.aplf @@ -8,23 +8,27 @@ M←##.TestCases.MakeHelpers C←##.CiderConfig path←C.HOME,'/',C.CIDER.distributionFolder - cfg←⎕JSON⍠('Dialect' 'JSON5')⊢⊃⎕NGET C.HOME,'/apl-package.json' + cfg←⎕SE.Tatin.ReadPackageConfigFile C.HOME targetFolder←##.Cider.GetCurrentAPLsFolderInDocuments,'SessionExtensions\CiderTatin\Cider' :If 0=⎕NEXISTS targetFolder,'\Cider_UC.dyalog' targetFolder←##.Cider.GetUserDocumentsFolder,'Dyalog APL Files\SessionExtensions\CiderTatin\Cider' :AndIf 0=⎕NEXISTS targetFolder,'\Cider_UC.dyalog' - :AndIf ~1 M.##.CommTools.YesOrNo'Could not find the user command script in the user''s home folder anywhere - continue?' + :AndIf ~1 M.YesOrNo'Could not find the user command script in the user''s home folder anywhere - continue?' :Return :EndIf + :If ~batch + M.##.CommTools.Pause'In the next step, update the version number',('+'∊##.Cider.Version)/' but leave the build number alone' + ⎕ED'##.Cider.Version' + :EndIf + M.IncreaseBuildIDInFunction(⍕##.Cider),'.Version' M.FetchLaterUserCommand cfg C targetFolder - version←M.CompileVersionNumberPattern cfg M.RecreateFolder path parms←⎕SE.Tatin.CreateBuildParms C.HOME parms.targetPath←path - parms.version←version noOf←M.ConvertMarkdownToHtml5(⊂C.HOME,'/'),¨'docs/' 'html/' - Assert 4=noOf - {}⎕SE.Tatin.CreateAPIfromCFG ##.Cider cfg + 'Tally of converted documentation files?!'Assert 4=noOf + noOf←⎕SE.Tatin.CreateAPIfromCFG ##.Cider cfg + 'Tally of the API is unexpected'Assert 30=noOf zipFilename←⎕SE.Tatin.BuildPackage parms MakeZipForDyalog 1 ⎕←'*** New version build successfully:',M.CR,' ',zipFilename diff --git a/APLSource/Cider/Version.aplf b/APLSource/Cider/Version.aplf index 37a5549..630265a 100644 --- a/APLSource/Cider/Version.aplf +++ b/APLSource/Cider/Version.aplf @@ -1,3 +1,3 @@ r←Version ⍝ See also `History` - r←'0.44.0-beta-2+671' + r←'0.44.0-beta-2+832' diff --git a/apl-package.json b/apl-package.json index b24d88c..9dc5791 100644 --- a/apl-package.json +++ b/apl-package.json @@ -21,5 +21,5 @@ tags: "project-management", tatin_version: "0.103.0", userCommandScript: "APLSource/Cider_UC.dyalog", - version: "0.44.0+827", + version: "0.44.0+831", } diff --git a/cider.config b/cider.config index 9c5eb02..821b5fa 100644 --- a/cider.config +++ b/cider.config @@ -1,6 +1,6 @@ { CIDER: { - cider_version: "0.42.1", + cider_version: "0.44.0-beta-2", dependencies: { nuget: "", tatin: "tatin-packages=Cider", diff --git a/cider.config.template b/cider.config.template index 8bb7e6e..949eed8 100644 --- a/cider.config.template +++ b/cider.config.template @@ -1 +1 @@ -// Configuration file for the Dyalog project manager Cider. // Relative paths refer to the folder a project's config file stems from. // Use ]Cider.OpenProject to open a project that carries a file "cider.config". // For a detailed documentation see Cider's User Guide // +------------------------------------------------------------------------+ // | Do not change this file - it might well be replaced with a new version | // +------------------------------------------------------------------------+ // Version 0.4.0 { CIDER: { // These are Cider's own configuration parameters cider_version: "", // The version of Cider the file was created/modified with parent: "#", projectSpace: "??", // Where the project is going to live; overwrite with ]Cider.OpenProject -target=#.foo source: "APLSource", // Where does the code live? (relative to the project folder; might be empty) dependencies: { // Folder(s) with installed Tatin packages the project eventually depends on tatin: "tatin-dependencies", // Accepts or "=" nuget: "nuget-dependencies", // Like "tatin" }, dependencies_dev: { // Folder(s) with installed Tatin packages the project depends on for development and testing tatin: "tatin-dependencies_dev", // Accepts or "=" but for development stuff //nuget NOT allowed in dependencies_dev (yet) }, distributionFolder: "Dist", // Folder used to put stuff for publishing, like a package ZIP or an installer EXE etc. init: "", // Project fn; executed when everything else is done. Must be relative to the projectSpace project_url: "", // For example a URL pointing to a GitHub project; information only tests : "", // Expression that executes the test cases of the project (if any) make : "", // Expression that produces a new version of the project }, LINK: { // These are LINK parameters which are passed on to LINK when Cider brings the APL code into the WS with LINK // With Link 4.0 there is no need any more to use this because Link has now its own config file // Until Link 4.0.0 is the only version supported, we allow non-default settings to be defined here }, SYSVARS: { // You may add other ⎕-variables here like, say, ⎕CT as "ct" etc. io: 1, ml: 1, }, USER: { // User-defined stuff (ignored by Cider); what follows is an example // convertFromAcre : 1, }, } +// Configuration file for the Dyalog project manager Cider. // Relative paths refer to the folder a project's config file stems from. // Use ]Cider.OpenProject to open a project that carries a file "cider.config". // For a detailed documentation see Cider's User Guide // +------------------------------------------------------------------------+ // | Do not change this file - it might well be replaced with a new version | // +------------------------------------------------------------------------+ // Version 0.5.0 { CIDER: { // These are Cider's own configuration parameters cider_version: "", // The version of Cider the file was created/modified with; set by Cider parent: "#", projectSpace: "??", // Where the project is going to live; overwrite with ]Cider.OpenProject -target=#.foo source: "APLSource", // Where does the code live? (relative to the project folder; might be empty) dependencies: { // Folder(s) with installed Tatin packages the project eventually depends on tatin: "", // Accepts or "="; typically something like "tatin-dependencies" nuget: "", // Like "tatin" (typically something like "nuget-dependencies") }, dependencies_dev: { // Folder(s) with installed Tatin packages the project depends on for development and testing tatin: "", // Same as "dependencies" but for development stuff (typically "tatin-dependencies_dev") //nuget NOT allowed in dependencies_dev (yet?!) }, distributionFolder: "Dist", // Folder used to put stuff for publishing, like a package ZIP or an installer EXE etc. init: "", // Project fn; executed when everything else is done. Relative to root of the project. project_url: "", // For example a URL pointing to a GitHub project; information only tests : "", // Expression that executes the test cases of the project (if any). Relative to root of the project. make : "", // Expression that produces a new version of the project. Relative to root of the project. }, LINK: { // These are LINK parameters which are passed on to LINK when Cider brings the APL code into the WS with LINK // With Link 4.0 there is no need any more to use this because Link has now its own config file // Until Link 4.0.0 is the only Link version supported, we allow non-default settings to be defined here }, SYSVARS: { // You may add other ⎕-variables here like, say, ⎕CT as "ct" etc. io: 1, ml: 1, }, USER: { // User-defined stuff (ignored by Cider); what follows is an example // convertFromAcre : 1, }, }