From 9b28a9393aec28d94ec89771238c404d1bc89c20 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sun, 3 Apr 2022 17:20:31 -0700 Subject: [PATCH] Move windows and mac build scripts into scripts folder --- .circleci/config.yml | 4 ++-- RELEASE.md | 12 ++++++------ desktop/{package/macos.py => scripts/build-macos.py} | 0 .../{package/windows.py => scripts/build-windows.py} | 0 4 files changed, 8 insertions(+), 8 deletions(-) rename desktop/{package/macos.py => scripts/build-macos.py} (100%) rename desktop/{package/windows.py => scripts/build-windows.py} (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 93690482..17e50a66 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -104,7 +104,7 @@ jobs: command: | cd ~\project\desktop poetry run python .\setup-freeze.py build - poetry run python .\package\windows.py cleanup-build + poetry run python .\script\build-windows.py cleanup-build - run: name: Compress command: | @@ -201,7 +201,7 @@ jobs: command: | cd ~/project/desktop poetry run python ./setup-freeze.py bdist_mac - poetry run python ./package/macos.py cleanup-build + poetry run python ./install/build-macos.py cleanup-build - run: name: Compress command: zip -r ~/onionshare-macos.zip ~/project/desktop/build/OnionShare.app diff --git a/RELEASE.md b/RELEASE.md index cab2909b..14b6599c 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -110,9 +110,9 @@ Build the Windows binaries, delete extra files, codesign, and create an MSI pack ``` poetry run python .\setup-freeze.py build -poetry run python .\package\windows.py cleanup-build -poetry run python .\package\windows.py codesign [build_dir] -poetry run python .\package\windows.py package [build_dir] +poetry run python .\scripts\build-windows.py cleanup-build +poetry run python .\scripts\build-windows.py codesign [build_dir] +poetry run python .\scripts\build-windows.py package [build_dir] ``` This will create `desktop/dist/OnionShare-$VERSION.msi`, signed. @@ -125,9 +125,9 @@ Then build an executable, make it a macOS app bundle, and package it in a dmg: ```sh poetry run python ./setup-freeze.py bdist_mac -poetry run python ./package/macos.py cleanup-build -poetry run python ./package/macos.py codesign [app_path] -poetry run python ./package/macos.py package [app_path] +poetry run python ./scripts/build-macos.py cleanup-build +poetry run python ./scripts/build-macos.py codesign [app_path] +poetry run python ./scripts/build-macos.py package [app_path] ``` The will create `dist/OnionShare-$VERSION.dmg`. diff --git a/desktop/package/macos.py b/desktop/scripts/build-macos.py similarity index 100% rename from desktop/package/macos.py rename to desktop/scripts/build-macos.py diff --git a/desktop/package/windows.py b/desktop/scripts/build-windows.py similarity index 100% rename from desktop/package/windows.py rename to desktop/scripts/build-windows.py