diff options
author | jellespijker <j.spijker@ultimaker.com> | 2022-07-05 15:13:42 +0300 |
---|---|---|
committer | jellespijker <j.spijker@ultimaker.com> | 2022-07-05 15:13:42 +0300 |
commit | 67d840f505f9434f8140667993182bbbee76a014 (patch) | |
tree | a99587b249c78618babdbf54d1b8ec6cedb2062d /packaging | |
parent | fd7c5abdc00e8c6991aa28b89d8dbaf12cf9701f (diff) |
Revert "Deal with missing build version number"
This reverts commit d91b93b3d7916f1472f3a33a65d0d85781c65f80.
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/NSIS/Ultimaker-Cura.nsi.jinja | 2 | ||||
-rw-r--r-- | packaging/NSIS/nsis-configurator.py | 25 |
2 files changed, 10 insertions, 17 deletions
diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja index 56403b70c3..fc7db794d9 100644 --- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja +++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja @@ -4,7 +4,7 @@ !define APP_NAME "{{ app_name }} {{ version_major }}.{{ version_minor }}.{{ version_patch }}" !define COMP_NAME "{{ company }}" !define WEB_SITE "{{ web_site }}" -!define VERSION "{{ version_major }}.{{ version_minor }}.{{ version_patch }}{{ version_build }}" +!define VERSION "{{ version_major }}.{{ version_minor }}.{{ version_patch }}.{{ version_build }}" !define COPYRIGHT "Copyright (c) {{ year }} {{ company }}" !define DESCRIPTION "Application" !define LICENSE_TXT "{{ cura_license_file }}" diff --git a/packaging/NSIS/nsis-configurator.py b/packaging/NSIS/nsis-configurator.py index 445be02321..c8986fb118 100644 --- a/packaging/NSIS/nsis-configurator.py +++ b/packaging/NSIS/nsis-configurator.py @@ -15,7 +15,7 @@ if __name__ == "__main__": - version_major: Major version number of Semver (e.g. 5). - version_minor: Minor version number of Semver (e.g. 0). - version_patch: Patch version number of Semver (e.g. 0). - - version_build: (optional) A version number that gets manually incremented at each build. + - version_build: A version number that gets manually incremented at each build. - company: Publisher of the application. Should be "Ultimaker B.V." - web_site: Website to find more information. Should be "https://ultimaker.com". - cura_license_file: Path to a license file in Cura. Should point to packaging/cura_license.txt in this repository. @@ -50,30 +50,23 @@ if __name__ == "__main__": with open(jinja_template_path, "r") as f: template = Template(f.read()) - if len(sys.argv) == 15: # No version-build - version_build = "" - use_version_build = 0 - else: - version_build = "." + sys.argv[8] - use_version_build = 1 - nsis_content = template.render( app_name = sys.argv[3], main_app = sys.argv[4], version_major = sys.argv[5], version_minor = sys.argv[6], version_patch = sys.argv[7], - version_build = version_build, - company = sys.argv[8 + use_version_build], - web_site = sys.argv[9 + use_version_build], + version_build = sys.argv[8], + company = sys.argv[9], + web_site = sys.argv[10], year = datetime.now().year, - cura_license_file = Path(sys.argv[10 + use_version_build]), - compression_method = sys.argv[11 + use_version_build], # ZLIB, BZIP2 or LZMA - cura_banner_img = Path(sys.argv[12 + use_version_build]), - cura_icon = Path(sys.argv[13 + use_version_build]), + cura_license_file = Path(sys.argv[11]), + compression_method = sys.argv[12], # ZLIB, BZIP2 or LZMA + cura_banner_img = Path(sys.argv[13]), + cura_icon = Path(sys.argv[14]), mapped_out_paths = mapped_out_paths, rmdir_paths = rmdir_paths, - destination = Path(sys.argv[14 + use_version_build]) + destination = Path(sys.argv[15]) ) with open(dist_loc.parent.joinpath(jinja_template_path.stem), "w") as f: |