From 889259a3ef0186d22a1e681155e76acaa35a695d Mon Sep 17 00:00:00 2001 From: Eduardo MG Date: Sun, 26 Mar 2023 22:30:20 -0600 Subject: [PATCH] Updated Wagic Version and Python scripts Updated Wagic to version 0.24.0 and the Python scripts to use the print syntax for Python 3 so the files could be build. --- projects/mtg/bin/Res/createResourceZip.py | 4 ++-- projects/mtg/bin/createWindowsZip.py | 10 +++++----- projects/mtg/build.number.properties | 4 ++-- projects/mtg/include/Wagic_Version.h | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/projects/mtg/bin/Res/createResourceZip.py b/projects/mtg/bin/Res/createResourceZip.py index baf5eab1f..600c3dc01 100644 --- a/projects/mtg/bin/Res/createResourceZip.py +++ b/projects/mtg/bin/Res/createResourceZip.py @@ -49,7 +49,7 @@ def createStandardResFile(filename): if not filename: filename = getFilename() + '.zip' createResZipFile( filename ) - print >> sys.stderr, 'Created Resource Package for Standard Distribution: {0}'.format( filename) + print('Created Resource Package for Standard Distribution: {0}'.format(filename), file=sys.stderr) def createIosResFile(filename): print('Preparing Resource Package for iOS') @@ -61,7 +61,7 @@ def createIosResFile(filename): zip_file.write("../../iOS/Res/rules/modrules.xml", "rules/modrules.xml", zipfile.ZIP_STORED) zip_file.close() - print >> sys.stderr, 'Created Resource Package for iOS Distribution: {0}'.format( filename) + print('Created Resource Package for Standard Distribution: {0}'.format(filename), file=sys.stderr) class ZipUtilities: diff --git a/projects/mtg/bin/createWindowsZip.py b/projects/mtg/bin/createWindowsZip.py index 8b2e7e4d9..0a8b851f1 100644 --- a/projects/mtg/bin/createWindowsZip.py +++ b/projects/mtg/bin/createWindowsZip.py @@ -26,15 +26,15 @@ def getFilename(filename): return filename def createStandardResFile(): - print "Creating Resource File" + print("Creating Resource File") cmd = 'python createResourceZip.py -n ' + getFilename('core') + '.zip' os.chdir("Res") os.system(cmd) os.chdir("..") - print "Creating Windows Package File" + print("Creating Windows Package File") filename = 'Wagic-windows.zip' createWindowsZipFile( filename ) - print >> sys.stderr, 'Created Windows Package: {0}'.format( filename) + #print(sys.stderr, 'Created Windows Package: {0}'.format( filename)) class ZipUtilities: @@ -52,10 +52,10 @@ class ZipUtilities: if file != '.svn': full_path = os.path.join(folder, file) if os.path.isfile(full_path): - print 'File added: ' + str(full_path) + #print('File added: ' + str(full_path)) zip_file.write(full_path) elif os.path.isdir(full_path): - print 'Entering folder: ' + str(full_path) + #print('Entering folder: ' + str(full_path)) self.addFolderToZip(zip_file, full_path) diff --git a/projects/mtg/build.number.properties b/projects/mtg/build.number.properties index 8f2618df6..d77e97497 100644 --- a/projects/mtg/build.number.properties +++ b/projects/mtg/build.number.properties @@ -1,6 +1,6 @@ #build.number.properties (normally this file is maintained by build.xml) #Sun, 20 May 2020 11:56:35 +0200 build.major=0 -build.minor=23 -build.point=1 +build.minor=24 +build.point=0 diff --git a/projects/mtg/include/Wagic_Version.h b/projects/mtg/include/Wagic_Version.h index fdcf09ac5..8c6fbb680 100644 --- a/projects/mtg/include/Wagic_Version.h +++ b/projects/mtg/include/Wagic_Version.h @@ -13,8 +13,8 @@ Mod by: Vitty85 /* Wagic versions */ #define WAGIC_VERSION_MAJOR 0 -#define WAGIC_VERSION_MEDIUM 23 -#define WAGIC_VERSION_MINOR 1 +#define WAGIC_VERSION_MEDIUM 24 +#define WAGIC_VERSION_MINOR 0 #define VERSION_DOT(a, b, c) a ##.## b ##.## c #define VERSION_WITHOUT_DOT(a, b, c) a ## b ## c