diff --git a/Novetus/Novetus.Launch/LocalFuncs.cs b/Novetus/Novetus.Launch/LocalFuncs.cs index 2a5d0b7..8b1f91e 100644 --- a/Novetus/Novetus.Launch/LocalFuncs.cs +++ b/Novetus/Novetus.Launch/LocalFuncs.cs @@ -29,15 +29,15 @@ namespace Novetus.Launch string version; INIFile ini = new INIFile(infopath); string section = "ProgramInfo"; - bool isSnapshot = Convert.ToBoolean(ini.IniReadValue(section, "IsSnapshot", "False")); - version = (isSnapshot ? ini.IniReadValue(section, "SnapshotTemplate", "%version% Snapshot (%build%.%revision%.%snapshot-revision%)") : ini.IniReadValue(section, "Branch", "0.0")); + bool extendedversionnumber = Convert.ToBoolean(ini.IniReadValue(section, "ExtendedVersionNumber", "False")); + version = (extendedversionnumber ? ini.IniReadValue(section, "ExtendedVersionTemplate", "%version%") : ini.IniReadValue(section, "Branch", "0.0")); var versionInfo = FileVersionInfo.GetVersionInfo(LocalPaths.BinPath + "\\" + LocalPaths.LauncherName); - string snapshotrevision = ini.IniReadValue(section, "SnapshotRevision", "1"); + string extendedversionrevision = ini.IniReadValue(section, "ExtendedVersionRevision", "1"); version = version.Replace("%version%", ini.IniReadValue(section, "Branch", "0.0")) .Replace("%build%", versionInfo.ProductBuildPart.ToString()) .Replace("%revision%", versionInfo.FilePrivatePart.ToString()) - .Replace("%snapshot-revision%", snapshotrevision); + .Replace("%extended-revision%", extendedversionrevision); return version; } } diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs index e054e01..4f5cc98 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs @@ -23,7 +23,7 @@ public class GlobalFuncs { //READ string versionbranch, defaultclient, defaultmap, regclient1, - regclient2, issnapshot, snapshottemplate, snapshotrevision; + regclient2, extendedversionnumber, extendedversiontemplate, extendedversionrevision, disableeditingchangelog; INIFile ini = new INIFile(infopath); @@ -35,39 +35,45 @@ public class GlobalFuncs defaultmap = ini.IniReadValue(section, "DefaultMap", "Dev - Baseplate2048.rbxl"); regclient1 = ini.IniReadValue(section, "UserAgentRegisterClient1", "2007M"); regclient2 = ini.IniReadValue(section, "UserAgentRegisterClient2", "2009L"); - issnapshot = ini.IniReadValue(section, "IsSnapshot", "False"); - snapshottemplate = ini.IniReadValue(section, "SnapshotTemplate", "%version% Snapshot (%build%.%revision%.%snapshot-revision%)"); - snapshotrevision = ini.IniReadValue(section, "SnapshotRevision", "1"); + extendedversionnumber = ini.IniReadValue(section, "ExtendedVersionNumber", "False"); + disableeditingchangelog = ini.IniReadValue(section, "DisableEditingChangelog", "False"); + extendedversiontemplate = ini.IniReadValue(section, "ExtendedVersionTemplate", "%version%"); + extendedversionrevision = ini.IniReadValue(section, "ExtendedVersionRevision", "1"); try { - GlobalVars.IsSnapshot = Convert.ToBoolean(issnapshot); - if (GlobalVars.IsSnapshot) + GlobalVars.ExtendedVersionNumber = Convert.ToBoolean(extendedversionnumber); + if (GlobalVars.ExtendedVersionNumber) { if (cmd) { var versionInfo = FileVersionInfo.GetVersionInfo(GlobalPaths.RootPathLauncher + "\\Novetus.exe"); - GlobalVars.ProgramInformation.Version = snapshottemplate.Replace("%version%", versionbranch) + GlobalVars.ProgramInformation.Version = extendedversiontemplate.Replace("%version%", versionbranch) .Replace("%build%", versionInfo.ProductBuildPart.ToString()) .Replace("%revision%", versionInfo.FilePrivatePart.ToString()) - .Replace("%snapshot-revision%", snapshotrevision); + .Replace("%extended-revision%", extendedversionrevision); } else { - GlobalVars.ProgramInformation.Version = snapshottemplate.Replace("%version%", versionbranch) + GlobalVars.ProgramInformation.Version = extendedversiontemplate.Replace("%version%", versionbranch) .Replace("%build%", Assembly.GetExecutingAssembly().GetName().Version.Build.ToString()) .Replace("%revision%", Assembly.GetExecutingAssembly().GetName().Version.Revision.ToString()) - .Replace("%snapshot-revision%", snapshotrevision); + .Replace("%extended-revision%", extendedversionrevision); } - string changelog = GlobalPaths.BasePath + "\\changelog.txt"; - if (File.Exists(changelog)) + bool disableedit = Convert.ToBoolean(disableeditingchangelog); + + if (!disableedit) { - string[] changelogedit = File.ReadAllLines(changelog); - if (!changelogedit[0].Equals(GlobalVars.ProgramInformation.Version)) + string changelog = GlobalPaths.BasePath + "\\changelog.txt"; + if (File.Exists(changelog)) { - changelogedit[0] = GlobalVars.ProgramInformation.Version; - File.WriteAllLines(changelog, changelogedit); + string[] changelogedit = File.ReadAllLines(changelog); + if (!changelogedit[0].Equals(GlobalVars.ProgramInformation.Version)) + { + changelogedit[0] = GlobalVars.ProgramInformation.Version; + File.WriteAllLines(changelog, changelogedit); + } } } } diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs index b7cd995..054e4cd 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs @@ -49,7 +49,7 @@ public static class GlobalVars #endregion #region Booleans - public static bool IsSnapshot = false; + public static bool ExtendedVersionNumber = false; public static bool LocalPlayMode = false; public static bool AdminMode = false; #endregion