AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2026-09-22 11:21:22 +03:00
Code Releases Activity

Divide version in multiple macros and set default values

Browse Source
This commit is contained in:
Davide Beatrici
2018-08-27 05:35:11 +02:00
parent 7f9177f3d7
commit c21f427fc6
19 changed files with 268 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BuildUtil/UnixBuildSoftwares.cs
+5 -5
View File
@@ -159,9 +159,9 @@ namespace BuildUtil
public readonly string CrossCompilerOption;
public readonly string SrcKitDefaultDir;
public BuildSoftwareUnix(Software software, int buildNumber, int version, string buildName, Cpu cpu, OS os,
public BuildSoftwareUnix(Software software, int versionMajor, int versionMinor, int versionBuild, string buildName, Cpu cpu, OS os,
string crossLibName, bool useGccBitsOption, string crossCompilerName, bool noPthreadOption, string crossCompilerOption)
: base(software, buildNumber, version, buildName, cpu, os)
: base(software, versionMajor, versionMinor, versionBuild, buildName, cpu, os)
{
this.CrossLibName = crossLibName;
this.UseGccBitsOption = useGccBitsOption;
@@ -431,13 +431,13 @@ namespace BuildUtil
{
get
{
int build, version;
int versionMajor, versionMinor, versionBuild;
string name;
DateTime date;
Win32BuildUtil.ReadBuildInfoFromTextFile(out build, out version, out name, out date);
Win32BuildUtil.ReadBuildInfoFromTextFile(out versionMajor, out versionMinor, out versionBuild, out name, out date);
return string.Format("{0}-{3}-{1}.tar.gz", "srckit", this.CrossLibName,
Str.DateTimeToStrShort(BuildSoftwareList.ListCreatedDateTime),
build);
versionBuild);
}
}