From d8a6e09d4387a67782d642a21d737c1c13e4b27a Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Thu, 27 Oct 2022 22:53:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=83=D1=82=D1=8C=20=D0=BA=20=D1=84?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=B0=D0=BC=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=20=D0=BF=D0=BE=D0=B4=20Linux=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BD=D0=B0=20/us?= =?UTF-8?q?r/lib/pascalabcnet/Samples?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- VisualPascalABCNETLinux/DS/Constants.cs | 11 +++++++---- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 21da9fd93..66c8c90ad 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "8"; public const string Build = "3"; - public const string Revision = "3194"; + public const string Revision = "3197"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index a016b5465..a38098c58 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=3 -%REVISION%=3194 %MINOR%=8 +%REVISION%=3197 +%COREVERSION%=3 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 0b76cdd24..c28694524 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.8.3.3194 +3.8.3.3197 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index e8e2419f7..442a83de9 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.8.3.3194' +!define VERSION '3.8.3.3197' diff --git a/VisualPascalABCNETLinux/DS/Constants.cs b/VisualPascalABCNETLinux/DS/Constants.cs index 17d6eecc9..54e7fe0a1 100644 --- a/VisualPascalABCNETLinux/DS/Constants.cs +++ b/VisualPascalABCNETLinux/DS/Constants.cs @@ -12,9 +12,10 @@ namespace VisualPascalABC //public static string DefaultWorkingDirectory = SystemDirectoryIdent + @"\WorkDirectory"; public static string DefaultWorkingDirectory = - !Tools.IsUnix() ? + !Tools.IsUnix() ? (System.IO.Path.GetPathRoot(System.Environment.GetFolderPath(System.Environment.SpecialFolder.Windows)) + "PABCWork.NET") : - System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal) + "/" + "PABCWork.NET"; + //System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal) + "/" + "PABCWork.NET"; + "~/" + "PABCWork.NET"; public static string DefaultOutputDirectory = DefaultWorkingDirectory + @"\Output"; public static string DefaultLibSourceDirectory = SystemDirectoryIdent + @"\LibSource"; @@ -23,7 +24,8 @@ namespace VisualPascalABC public static string DotNetHelpFileName = "%PABCSYSTEM%\\Documentation_NET40.chm"; public static string HelpExamplesFileName = "%PABCSYSTEM%\\PascalABCNETExamples.chm"; public static string HelpExamplesMapFileName = "%PABCSYSTEM%\\HelpExamples.ini"; - public static string HelpExamplesDirectory = DefaultWorkingDirectory+"\\Samples"; + //public static string HelpExamplesDirectory = DefaultWorkingDirectory+"\\Samples"; + public static string HelpExamplesDirectory = @"/usr/lib/pascalabcnet/Samples"; public static string HelpTutorialExamplesDirectory = DefaultWorkingDirectory + "\\Samples\\!Tutorial"; @@ -44,7 +46,8 @@ namespace VisualPascalABC DotNetHelpFileName = "%PABCSYSTEM%/Documentation_NET40.chm"; HelpExamplesFileName = "%PABCSYSTEM%/PascalABCNETExamples.chm"; HelpExamplesMapFileName = "%PABCSYSTEM%/HelpExamples.ini"; - HelpExamplesDirectory = DefaultWorkingDirectory + "/Samples"; + //HelpExamplesDirectory = DefaultWorkingDirectory + "/Samples"; + HelpExamplesDirectory = @"/usr/lib/pascalabcnet/Samples"; HelpTutorialExamplesDirectory = DefaultWorkingDirectory + "/Samples/!Tutorial"; DefaultOutputDirectory = DefaultWorkingDirectory + @"/Output"; DefaultLibSourceDirectory = SystemDirectoryIdent + @"/LibSource";