mirror of
https://github.com/Chia-Network/chia-blockchain.git
synced 2024-09-11 18:58:59 +03:00
spec file changes (#1266)
* spec file changes * Clean up installer build process * revert as PR 1267 is right
This commit is contained in:
parent
abadc104a4
commit
67f5cd5b92
4
.github/workflows/build-macos-installer.yml
vendored
4
.github/workflows/build-macos-installer.yml
vendored
@ -104,10 +104,6 @@ jobs:
|
||||
run: |
|
||||
. ./activate
|
||||
cd ./chia-blockchain-gui
|
||||
npm install
|
||||
npm audit fix
|
||||
npm run locale:extract
|
||||
npm run locale:compile
|
||||
git status
|
||||
cd ../build_scripts
|
||||
sh build_macos.sh
|
||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -31,7 +31,7 @@ chia-blockchain.tar.gz.tar.gz
|
||||
# Usually these files are written by a python script from a template
|
||||
# before PyInstaller builds the exe, so as to inject date/other infos into it.
|
||||
*.manifest
|
||||
*.spec
|
||||
#*.spec
|
||||
build_scripts/*.dmg
|
||||
build_scripts/build
|
||||
|
||||
|
@ -58,16 +58,6 @@ steps:
|
||||
versionSpec: '12.x'
|
||||
displayName: "Setup Node 12.x"
|
||||
|
||||
- script: |
|
||||
. ./activate
|
||||
git submodule update --init --recursive
|
||||
cd ./chia-blockchain-gui
|
||||
npm install
|
||||
npm audit fix
|
||||
npm run locale:extract
|
||||
npm run locale:compile
|
||||
displayName: "Build Electron/React UI"
|
||||
|
||||
- bash: |
|
||||
. ./activate
|
||||
APPLE_NOTARIZE_USERNAME="$(APPLE_NOTARIZE_USERNAME)"
|
||||
@ -75,6 +65,7 @@ steps:
|
||||
APPLE_NOTARIZE_PASSWORD="$(APPLE_NOTARIZE_PASSWORD)"
|
||||
export APPLE_NOTARIZE_PASSWORD
|
||||
if [ "$(APPLE_NOTARIZE_PASSWORD)" ]; then NOTARIZE="true"; export NOTARIZE; fi
|
||||
git submodule update --init --recursive
|
||||
cd build_scripts || exit
|
||||
sh build_macos.sh
|
||||
displayName: "Build DMG with build_scripts/build_macos.sh"
|
||||
|
@ -30,6 +30,7 @@ cd chia-blockchain-gui || exit
|
||||
|
||||
echo "npm build"
|
||||
npm install
|
||||
npm audit fix
|
||||
npm run locale:extract
|
||||
npm run locale:compile
|
||||
npm run build
|
||||
|
@ -82,6 +82,7 @@ Write-Output " ---"
|
||||
npm install --save-dev electron-winstaller
|
||||
npm install -g electron-packager
|
||||
npm install
|
||||
npm audit fix
|
||||
npm run locale:extract
|
||||
npm run locale:compile
|
||||
|
||||
|
@ -25,17 +25,18 @@ root = build.parent
|
||||
version_data = copy_metadata(get_distribution("chia-blockchain"))[0]
|
||||
|
||||
SUBCOMMANDS = [
|
||||
"configure",
|
||||
"farm",
|
||||
"init",
|
||||
"plots",
|
||||
"keys",
|
||||
"netspace",
|
||||
"plots",
|
||||
"run_daemon",
|
||||
"show",
|
||||
"start",
|
||||
"stop",
|
||||
"version",
|
||||
"netspace",
|
||||
"run_daemon",
|
||||
"wallet",
|
||||
"configure",
|
||||
]
|
||||
block_cipher = None
|
||||
subcommand_modules = [f"{root}/src.cmds.%s" % _ for _ in SUBCOMMANDS]
|
||||
@ -60,7 +61,7 @@ subcommand_modules.extend(entry_points)
|
||||
|
||||
|
||||
daemon = Analysis([f"{root}/src/daemon/server.py"],
|
||||
pathex=[f"{root}/venv/lib/python3.7/site-packages/aiter/", f"{root}"],
|
||||
pathex=[f"{root}/venv/lib/python3.8/site-packages/aiter/", f"{root}"],
|
||||
binaries = [],
|
||||
datas=[version_data, (f"../src/util/initial-config.yaml", f"./src/util/"), ] +
|
||||
hex_puzzles,
|
||||
@ -74,7 +75,7 @@ daemon = Analysis([f"{root}/src/daemon/server.py"],
|
||||
noarchive=False)
|
||||
|
||||
full_node = Analysis([f"{root}/src/server/start_full_node.py"],
|
||||
pathex=[f"{root}/venv/lib/python3.7/site-packages/aiter/", f"{root}"],
|
||||
pathex=[f"{root}/venv/lib/python3.8/site-packages/aiter/", f"{root}"],
|
||||
binaries = [],
|
||||
datas=[version_data],
|
||||
hiddenimports=subcommand_modules,
|
||||
@ -87,7 +88,7 @@ full_node = Analysis([f"{root}/src/server/start_full_node.py"],
|
||||
noarchive=False)
|
||||
|
||||
wallet = Analysis([f"{root}/src/server/start_wallet.py"],
|
||||
pathex=[f"{root}/venv/lib/python3.7/site-packages/aiter/", f"{root}"],
|
||||
pathex=[f"{root}/venv/lib/python3.8/site-packages/aiter/", f"{root}"],
|
||||
binaries = [],
|
||||
datas=[(f"../mozilla-ca/cacert.pem", f"./mozilla-ca/"), (f"../src/ssl/dst_root_ca.pem", f"./src/ssl/"), (f"../src/ssl/chia_ca.key", f"./src/ssl/"), (f"../src/ssl/chia_ca.crt", f"./src/ssl/"), (f"../src/util/english.txt", f"./src/util/"), version_data ] + hex_puzzles,
|
||||
hiddenimports=subcommand_modules,
|
||||
@ -100,7 +101,7 @@ wallet = Analysis([f"{root}/src/server/start_wallet.py"],
|
||||
noarchive=False)
|
||||
|
||||
chia = Analysis([f"{root}/src/cmds/chia.py"],
|
||||
pathex=[f"{root}/venv/lib/python3.7/site-packages/aiter/", f"{root}"],
|
||||
pathex=[f"{root}/venv/lib/python3.8/site-packages/aiter/", f"{root}"],
|
||||
binaries = [],
|
||||
datas=[version_data],
|
||||
hiddenimports=subcommand_modules,
|
||||
@ -113,7 +114,7 @@ chia = Analysis([f"{root}/src/cmds/chia.py"],
|
||||
noarchive=False)
|
||||
|
||||
farmer = Analysis([f"{root}/src/server/start_farmer.py"],
|
||||
pathex=[f"{root}/venv/lib/python3.7/site-packages/aiter/", f"{root}"],
|
||||
pathex=[f"{root}/venv/lib/python3.8/site-packages/aiter/", f"{root}"],
|
||||
binaries = [],
|
||||
datas=[version_data],
|
||||
hiddenimports=subcommand_modules,
|
||||
@ -126,7 +127,7 @@ farmer = Analysis([f"{root}/src/server/start_farmer.py"],
|
||||
noarchive=False)
|
||||
|
||||
harvester = Analysis([f"{root}/src/server/start_harvester.py"],
|
||||
pathex=[f"{root}/venv/lib/python3.7/site-packages/aiter/", f"{root}"],
|
||||
pathex=[f"{root}/venv/lib/python3.8/site-packages/aiter/", f"{root}"],
|
||||
binaries = [],
|
||||
datas=[version_data],
|
||||
hiddenimports=subcommand_modules,
|
||||
|
Loading…
Reference in New Issue
Block a user