Fix version util and files

This commit is contained in:
Tal Regev 2022-06-05 13:35:18 +03:00
parent c5fcabfec3
commit 9d27fae574
No known key found for this signature in database
GPG Key ID: A421558E0F87AC82
7 changed files with 35 additions and 36 deletions

View File

@ -23,7 +23,7 @@ def set_configure_ac(version):
with open('configure.ac', 'w') as f:
for line in lines:
if line.startswith('VBOXWRAPPER_RELEASE='):
line = 'VBOXWRAPPER_RELEASE=%s\n' % (version)
line = f'VBOXWRAPPER_RELEASE={version}\n'
f.write(line)
def set_version_h(version):
@ -32,7 +32,7 @@ def set_version_h(version):
with open('version.h', 'w') as f:
for line in lines:
if line.startswith('#define VBOXWRAPPER_RELEASE'):
line = '#define VBOXWRAPPER_RELEASE %s\n' % (version)
line = f'#define VBOXWRAPPER_RELEASE {version}\n'
f.write(line)
def set_vcxproj(version):
@ -44,17 +44,17 @@ def set_vcxproj(version):
with open(vcxproj, 'w') as f:
for line in lines:
if line.startswith(' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|x64\'">vboxwrapper_'):
line = ' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|x64\'">vboxwrapper_%s_windows_x86_64</TargetName>\n' % (version)
line = f' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|x64\'">vboxwrapper_{version}_windows_x86_64</TargetName>\n'
elif line.startswith(' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|x64\'">vboxwrapper_'):
line = ' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|x64\'">vboxwrapper_%s_windows_x86_64</TargetName>\n' % (version)
line = f' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|x64\'">vboxwrapper_{version}_windows_x86_64</TargetName>\n'
elif line.startswith(' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|Win32\'">vboxwrapper_'):
line = ' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|Win32\'">vboxwrapper_%s_windows_intelx86</TargetName>\n' % (version)
line = f' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|Win32\'">vboxwrapper_{version}_windows_intelx86</TargetName>\n'
elif line.startswith(' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|Win32\'">vboxwrapper_'):
line = ' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|Win32\'">vboxwrapper_%s_windows_intelx86</TargetName>\n' % (version)
line = f' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|Win32\'">vboxwrapper_{version}_windows_intelx86</TargetName>\n'
elif line.startswith(' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|ARM64\'">vboxwrapper_'):
line = ' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|ARM64\'">vboxwrapper_%s_windows_arm64</TargetName>\n' % (version)
line = f' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|ARM64\'">vboxwrapper_{version}_windows_arm64</TargetName>\n'
elif line.startswith(' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|ARM64\'">vboxwrapper_'):
line = ' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|ARM64\'">vboxwrapper_%s_windows_arm64</TargetName>\n' % (version)
line = f' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|ARM64\'">vboxwrapper_{version}_windows_arm64</TargetName>\n'
f.write(line)
if (len(sys.argv) != 2):
@ -63,7 +63,7 @@ if (len(sys.argv) != 2):
version = sys.argv[1]
print('Setting vboxwrapper version to %s...' % (version))
print(f'Setting vboxwrapper version to {version}...')
set_configure_ac(version)
set_version_h(version)

View File

@ -34,7 +34,7 @@ def set_configure_ac(version):
with open('configure.ac', 'w') as f:
for line in lines:
if line.startswith('AC_INIT'):
line = 'AC_INIT(BOINC, %s)\n' % (version)
line = f'AC_INIT(BOINC, {version})\n'
f.write(line)
def set_version_h(version):
@ -44,17 +44,17 @@ def set_version_h(version):
with open('version.h', 'w') as f:
for line in lines:
if line.startswith('#define BOINC_MAJOR_VERSION'):
line = '#define BOINC_MAJOR_VERSION %s\n' % (major)
line = f'#define BOINC_MAJOR_VERSION {major}\n'
elif line.startswith('#define BOINC_MINOR_VERSION'):
line = '#define BOINC_MINOR_VERSION %s\n' % (minor)
line = f'#define BOINC_MINOR_VERSION {minor}\n'
elif line.startswith('#define BOINC_RELEASE'):
line = '#define BOINC_RELEASE %s\n' % (release)
line = f'#define BOINC_RELEASE {release}\n'
elif line.startswith('#define BOINC_VERSION_STRING'):
line = '#define BOINC_VERSION_STRING "%s.%s.%s"\n' % (major, minor, release)
line = f'#define BOINC_VERSION_STRING "{major}.{minor}.{release}"\n'
elif line.startswith('#define PACKAGE_STRING'):
line = '#define PACKAGE_STRING "BOINC %s.%s.%s"\n' % (major, minor, release)
line = f'#define PACKAGE_STRING "BOINC {major}.{minor}.{release}"\n'
elif line.startswith('#define PACKAGE_VERSION'):
line = '#define PACKAGE_VERSION "%s.%s.%s"\n' % (major, minor, release)
line = f'#define PACKAGE_VERSION "{major}.{minor}.{release}"\n'
elif line.find('#define BOINC_PRERELEASE 1') != -1:
if is_release(minor):
line = '//#define BOINC_PRERELEASE 1\n'
@ -64,7 +64,7 @@ def set_version_h(version):
def set_version_log(version):
with open('version.log', 'w') as f:
line = '%s\n' % (version)
line = f'{version}\n'
f.write(line)
def set_build_gradle(version):
@ -76,7 +76,7 @@ def set_build_gradle(version):
with open('android/BOINC/app/build.gradle', 'w') as f:
for line in lines:
if line.startswith(' def version = '):
line = ' def version = \'%s : DEVELOPMENT\'\n' % (version)
line = f' def version = \'{version} : DEVELOPMENT\'\n'
f.write(line)
def set_vcpkg_json(version):
@ -84,7 +84,6 @@ def set_vcpkg_json(version):
'android/vcpkg_config_client/vcpkg.json',
'android/vcpkg_config_libs/vcpkg.json',
'lib/vcpkg.json',
'lib/vcpkg_config_android/vcpkg.json',
'linux/vcpkg_config_apps/vcpkg.json',
'linux/vcpkg_config_client/vcpkg.json',
'linux/vcpkg_config_libs/vcpkg.json',
@ -96,7 +95,7 @@ def set_vcpkg_json(version):
with open(json, 'w') as f:
for line in lines:
if line.startswith(' "version-string":'):
line = ' "version-string": "%s",\n' % (version)
line = f' "version-string": "{version}",\n'
f.write(line)
def set_installshield(version):
@ -106,7 +105,7 @@ def set_installshield(version):
with open(ism, 'w') as f:
for line in lines:
if line.startswith(' <row><td>ProductVersion</td><td>'):
line = ' <row><td>ProductVersion</td><td>%s</td><td/></row>\n' % (version)
line = f' <row><td>ProductVersion</td><td>{version}</td><td/></row>\n'
f.write(line)
if (len(sys.argv) != 2):
@ -118,10 +117,10 @@ version = sys.argv[1]
_, minor, release = split_version(version)
if (not is_release(minor) and release != 0):
print('ERROR: for development version release number should be 0 but it\'s set to %s' % (release))
print(f'ERROR: for development version release number should be 0 but it\'s set to {release}')
exit(1)
print('Setting BOINC version to %s...' % (version))
print(f'Setting BOINC version to {version}...')
set_configure_ac(version)
set_version_h(version)

View File

@ -23,7 +23,7 @@ def set_configure_ac(version):
with open('configure.ac', 'w') as f:
for line in lines:
if line.startswith('WRAPPER_RELEASE='):
line = 'WRAPPER_RELEASE=%s\n' % (version)
line = f'WRAPPER_RELEASE={version}\n'
f.write(line)
def set_version_h(version):
@ -32,7 +32,7 @@ def set_version_h(version):
with open('version.h', 'w') as f:
for line in lines:
if line.startswith('#define WRAPPER_RELEASE'):
line = '#define WRAPPER_RELEASE %s\n' % (version)
line = f'#define WRAPPER_RELEASE {version}\n'
f.write(line)
def set_vcxproj(version):
@ -44,17 +44,17 @@ def set_vcxproj(version):
with open(vcxproj, 'w') as f:
for line in lines:
if line.startswith(' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|x64\'">wrapper_'):
line = ' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|x64\'">wrapper_%s_windows_x86_64</TargetName>\n' % (version)
line = f' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|x64\'">wrapper_{version}_windows_x86_64</TargetName>\n'
elif line.startswith(' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|x64\'">wrapper_'):
line = ' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|x64\'">wrapper_%s_windows_x86_64</TargetName>\n' % (version)
line = f' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|x64\'">wrapper_{version}_windows_x86_64</TargetName>\n'
elif line.startswith(' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|Win32\'">wrapper_'):
line = ' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|Win32\'">wrapper_%s_windows_intelx86</TargetName>\n' % (version)
line = f' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|Win32\'">wrapper_{version}_windows_intelx86</TargetName>\n'
elif line.startswith(' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|Win32\'">wrapper_'):
line = ' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|Win32\'">wrapper_%s_windows_intelx86</TargetName>\n' % (version)
line = f' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|Win32\'">wrapper_{version}_windows_intelx86</TargetName>\n'
elif line.startswith(' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|ARM64\'">wrapper_'):
line = ' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|ARM64\'">wrapper_%s_windows_arm64</TargetName>\n' % (version)
line = f' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Debug|ARM64\'">wrapper_{version}_windows_arm64</TargetName>\n'
elif line.startswith(' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|ARM64\'">wrapper_'):
line = ' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|ARM64\'">wrapper_%s_windows_arm64</TargetName>\n' % (version)
line = f' <TargetName Condition="\'$(Configuration)|$(Platform)\'==\'Release|ARM64\'">wrapper_{version}_windows_arm64</TargetName>\n'
f.write(line)
if (len(sys.argv) != 2):
@ -63,7 +63,7 @@ if (len(sys.argv) != 2):
version = sys.argv[1]
print('Setting wrapper version to %s...' % (version))
print(f'Setting wrapper version to {version}...')
set_configure_ac(version)
set_version_h(version)

View File

@ -4548,7 +4548,7 @@ VwBlAGIAAQBXAEUAQgB4ADYANAA=
<row><td>ProductID</td><td>none</td><td/></row>
<row><td>ProductLanguage</td><td>1033</td><td/></row>
<row><td>ProductName</td><td>BOINC</td><td/></row>
<row><td>ProductVersion</td><td>7.16.11</td><td/></row>
<row><td>ProductVersion</td><td>7.19.0</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>

View File

@ -4549,7 +4549,7 @@ VwBlAGIAAQBXAEUAQgB4ADYANAA=
<row><td>ProductID</td><td>none</td><td/></row>
<row><td>ProductLanguage</td><td>1033</td><td/></row>
<row><td>ProductName</td><td>BOINC</td><td/></row>
<row><td>ProductVersion</td><td>7.16.11</td><td/></row>
<row><td>ProductVersion</td><td>7.19.0</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>

View File

@ -90,7 +90,7 @@
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">wrapper_26017_windows_x86_64</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wrapper_26017_windows_intelx86</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">wrapper_6.1_windows_x86_64</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">wrapper_26017_windows_x86_64</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>

View File

@ -95,7 +95,7 @@
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">wrapper_26017_windows_x86_64</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">wrapper_26017_windows_intelx86</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">wrapper_6.1_windows_x86_64</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">wrapper_26017_windows_x86_64</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>