From a243be27a8c1ba576b65121a4af83cfac6aa7434 Mon Sep 17 00:00:00 2001 From: Egor Bespalov Date: Tue, 22 Mar 2022 12:02:37 +0300 Subject: [PATCH 1/4] Add build portable version --- scripts/package_desktop.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py index ed793c56..075411bd 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -27,7 +27,7 @@ def make(): def make_windows(): global package_version, sign, machine, arch, xp, iscc_args, source_dir, \ - innosetup_file, innosetup_update_file, advinst_file, portable_zip_file + innosetup_file, innosetup_update_file, advinst_file, portable_bat_file set_cwd(get_abspath(git_dir, build_dir)) @@ -78,7 +78,7 @@ def make_windows(): make_advinst() if target.startswith('portable'): - portable_zip_file = "%s_%s_%s.zip" % (package_name, package_version, suffix) + portable_bat_file = "portable_%s.bat" % (source_prefix) make_win_portable() return @@ -221,11 +221,8 @@ def make_advinst(): def make_win_portable(): log("\n=== Build portable\n") - log("--- " + portable_zip_file) - if is_file(portable_zip_file): - log("! file exist, skip") - return - cmd("7z", ["a", "-y", portable_zip_file, get_path(source_dir, "*")]) + log("--- " + portable_bat_file) + cmd('start', ["%s\%s" % (get_abspath(git_dir, build_dir), portable_bat_file)]) return # From 3ebc3a4ec7a6f99209ec046ef463b88c8fc0b156 Mon Sep 17 00:00:00 2001 From: Egor Bespalov Date: Tue, 22 Mar 2022 17:36:49 +0300 Subject: [PATCH 2/4] Return build portable zip --- scripts/package_desktop.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py index 075411bd..cfb73b39 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -27,7 +27,7 @@ def make(): def make_windows(): global package_version, sign, machine, arch, xp, iscc_args, source_dir, \ - innosetup_file, innosetup_update_file, advinst_file, portable_bat_file + innosetup_file, innosetup_update_file, advinst_file, portable_zip_file, portable_bat_file set_cwd(get_abspath(git_dir, build_dir)) @@ -78,6 +78,7 @@ def make_windows(): make_advinst() if target.startswith('portable'): + portable_zip_file = "%s_%s_%s.zip" % (package_name, package_version, suffix) portable_bat_file = "portable_%s.bat" % (source_prefix) make_win_portable() @@ -221,6 +222,11 @@ def make_advinst(): def make_win_portable(): log("\n=== Build portable\n") + log("--- " + portable_zip_file) + if is_file(portable_zip_file): + log("! file exist, skip") + return + cmd("7z", ["a", "-y", portable_zip_file, get_path(source_dir, "*")]) log("--- " + portable_bat_file) cmd('start', ["%s\%s" % (get_abspath(git_dir, build_dir), portable_bat_file)]) return From 10893c5a6f416bfdeb2379a1747011a5cabcb7eb Mon Sep 17 00:00:00 2001 From: Egor Bespalov Date: Tue, 22 Mar 2022 17:37:59 +0300 Subject: [PATCH 3/4] Edit code style --- scripts/package_desktop.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py index cfb73b39..4f0e7e48 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -27,7 +27,8 @@ def make(): def make_windows(): global package_version, sign, machine, arch, xp, iscc_args, source_dir, \ - innosetup_file, innosetup_update_file, advinst_file, portable_zip_file, portable_bat_file + innosetup_file, innosetup_update_file, advinst_file, portable_zip_file, \ + portable_bat_file set_cwd(get_abspath(git_dir, build_dir)) From 653eef3206e85b15dbdf3cfd302eeffb85db8335 Mon Sep 17 00:00:00 2001 From: Semyon Bezrukov Date: Mon, 28 Mar 2022 12:07:49 +0300 Subject: [PATCH 4/4] Small fix --- scripts/package_desktop.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py index 4f0e7e48..e8507f8b 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -28,7 +28,7 @@ def make(): def make_windows(): global package_version, sign, machine, arch, xp, iscc_args, source_dir, \ innosetup_file, innosetup_update_file, advinst_file, portable_zip_file, \ - portable_bat_file + portable_evb_file set_cwd(get_abspath(git_dir, build_dir)) @@ -41,6 +41,7 @@ def make_windows(): delete_files("*.aic") delete_files("*.tmp") delete_files("*.zip") + delete_files(get_path("portable/*.exe")) delete_files(get_path("update/*.exe")) delete_files(get_path("update/*.xml")) delete_files(get_path("update/*.html")) @@ -78,10 +79,13 @@ def make_windows(): advinst_file = "%s_%s_%s.msi" % (package_name, package_version, suffix) make_advinst() - if target.startswith('portable'): + if target.startswith('portable-zip'): portable_zip_file = "%s_%s_%s.zip" % (package_name, package_version, suffix) - portable_bat_file = "portable_%s.bat" % (source_prefix) - make_win_portable() + make_portable_zip() + + if target.startswith('portable-evb'): + portable_evb_file = get_path("portable/DesktopEditorsPortable.exe") + make_portable_evb() return @@ -221,15 +225,22 @@ def make_advinst(): ["/execute", "DesktopEditors.aip", "DesktopEditors.aic", "-nofail"]) return -def make_win_portable(): - log("\n=== Build portable\n") +def make_portable_zip(): + log("\n=== Build portable zip\n") log("--- " + portable_zip_file) if is_file(portable_zip_file): log("! file exist, skip") return cmd("7z", ["a", "-y", portable_zip_file, get_path(source_dir, "*")]) - log("--- " + portable_bat_file) - cmd('start', ["%s\%s" % (get_abspath(git_dir, build_dir), portable_bat_file)]) + return + +def make_portable_evb(): + log("\n=== Build portable evb\n") + log("--- " + portable_evb_file) + if is_file(portable_evb_file): + log("! file exist, skip") + return + cmd('start', ["%s\%s" % (get_abspath(git_dir, build_dir), "portable_" + source_prefix + ".bat")]) return #