From 7efb878f637fe8d0a4b4017cddbfd30d2fda5639 Mon Sep 17 00:00:00 2001 From: Li Date: Sun, 8 May 2022 13:09:56 +1200 Subject: [PATCH] Update made automatically due to pressing build --- .../HISPd/Properties/AssemblyInfo.cs | 4 +-- .../HISPd/Resources/DEBIAN/control | 2 +- .../LibHISP/Properties/AssemblyInfo.cs | 4 +-- .../LibHISP/Resources/server.properties | 5 --- .../N00BS/Properties/AssemblyInfo.cs | 2 +- HorseIsleServer/prebuild.py | 36 ++++++++++++------- 6 files changed, 30 insertions(+), 23 deletions(-) diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs index 94a1006..4bf5de1 100644 --- a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("HISPd")] [assembly: AssemblyDescription("Server Emulator for \"Horse Isle\"")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("SilicaAndPina")] -[assembly: AssemblyProduct("HISPd")] +[assembly: AssemblyCompany("Li")] +[assembly: AssemblyProduct("HISP")] [assembly: AssemblyCopyright("Public Domain © 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index 36b28d3..c023915 100644 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: $VERSION +Version: 1.6.3 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Maintainer: Li Homepage: https://islehorse.com diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index c37a98d..7a1b30f 100644 --- a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.6.2.13")] -[assembly: AssemblyFileVersion("1.6.2.13")] +[assembly: AssemblyVersion("1.6.2.14")] +[assembly: AssemblyFileVersion("1.6.2.14")] diff --git a/HorseIsleServer/LibHISP/Resources/server.properties b/HorseIsleServer/LibHISP/Resources/server.properties index 978e08f..b7a6ff6 100644 --- a/HorseIsleServer/LibHISP/Resources/server.properties +++ b/HorseIsleServer/LibHISP/Resources/server.properties @@ -2,7 +2,6 @@ # Horse Isle Server Configuration # ======================= # -# Configuration Version 1.3.1 # HISP was Created and Developed by SilicaAndPina # However it is NOT COPYRIGHTED! This software is in the Public Domain! # @@ -36,10 +35,6 @@ map=HI1.MAP # NOTE: This can be a folder or a file. gamedata=gamedata -# Folder containing mod .dll's -# Mods can extend the server -# and add custom features. -mods_folder=mods # ======================= # Security diff --git a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs index 5045cd1..7236e69 100644 --- a/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/N00BS/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("HISP Noobs")] [assembly: AssemblyDescription("Noob-Friendly One-Click Run HISP.")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("SilicaAndPina")] +[assembly: AssemblyCompany("Li")] [assembly: AssemblyProduct("HISP")] [assembly: AssemblyCopyright("Public Domain © 2022")] [assembly: AssemblyTrademark("")] diff --git a/HorseIsleServer/prebuild.py b/HorseIsleServer/prebuild.py index ebc08b3..dfeac0e 100644 --- a/HorseIsleServer/prebuild.py +++ b/HorseIsleServer/prebuild.py @@ -5,12 +5,22 @@ import time import datetime import binascii + +def update_asm_info(assemblyinfofile): + global commit_hash + global commit_tag + global commit_branch + global assembly_version + lines = open(assemblyinfofile, "r").readlines() + for i in range(0,len(lines)): + if lines[i].startswith("[assembly: AssemblyVersion(\""): + lines[i] = "[assembly: AssemblyVersion(\""+assembly_version+"\")]\n" + if lines[i].startswith("[assembly: AssemblyFileVersion(\""): + lines[i] = "[assembly: AssemblyFileVersion(\""+assembly_version+"\")]\n" + open(assemblyinfofile, "w").writelines(lines) + + # Determine git stuff. - -global commit_hash -global commit_tag -global commit_branch - versioning_folder = os.path.join("LibHISP", "Resources", "Versioning") if not os.path.exists(versioning_folder): @@ -45,11 +55,13 @@ while len(points) < 4: points.append("0") assembly_version = ".".join(points) -assembly_info = os.path.join("LibHISP", "Properties", "AssemblyInfo.cs") -lines = open(assembly_info, "r").readlines() +update_asm_info(os.path.join("LibHISP", "Properties", "AssemblyInfo.cs")) +update_asm_info(os.path.join("N00BS", "Properties", "AssemblyInfo.cs")) +update_asm_info(os.path.join("HISPd", "Properties", "AssemblyInfo.cs")) + +control_file = os.path.join("HISPd", "Resources", "DEBIAN", "control") +lines = open(control_file, "rb").readlines() for i in range(0,len(lines)): - if lines[i].startswith("[assembly: AssemblyVersion(\""): - lines[i] = "[assembly: AssemblyVersion(\""+assembly_version+"\")]\n" - if lines[i].startswith("[assembly: AssemblyFileVersion(\""): - lines[i] = "[assembly: AssemblyFileVersion(\""+assembly_version+"\")]\n" -open(assembly_info, "w").writelines(lines) \ No newline at end of file + if lines[i].startswith(b"Version: "): + lines[i] = b"Version: "+bytes(commit_tag.replace("v", ""), "UTF-8") +open(control_file, "wb").writelines(control_file) \ No newline at end of file