From 4e91712c64adfaadfaa02255ea6715363e91e095 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Mon, 8 Jan 2018 16:16:25 +0200 Subject: [PATCH] build: move pyinstall hooks to scripts/ Signed-off-by: Ruslan Kuprieiev --- scripts/build_linux.sh | 2 +- scripts/build_macos.sh | 2 +- scripts/build_windows.cmd | 2 +- {hooks => scripts/hooks}/hook-google.cloud.py | 0 {hooks => scripts/hooks}/hook-google.cloud.storage.py | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename {hooks => scripts/hooks}/hook-google.cloud.py (100%) rename {hooks => scripts/hooks}/hook-google.cloud.storage.py (100%) diff --git a/scripts/build_linux.sh b/scripts/build_linux.sh index f9f339d9c..cac40d430 100755 --- a/scripts/build_linux.sh +++ b/scripts/build_linux.sh @@ -67,7 +67,7 @@ install_dependencies() build_dvc() { print_info "Building dvc binary..." - pyinstaller --onefile --additional-hooks-dir $(pwd)/hooks dvc/__main__.py --name dvc --distpath $BIN_DIR --specpath $BUILD_DIR + pyinstaller --onefile --additional-hooks-dir $(pwd)/scripts/hooks dvc/__main__.py --name dvc --distpath $BIN_DIR --specpath $BUILD_DIR } cleanup diff --git a/scripts/build_macos.sh b/scripts/build_macos.sh index 556e8968f..b07ad76df 100755 --- a/scripts/build_macos.sh +++ b/scripts/build_macos.sh @@ -56,7 +56,7 @@ install_dependencies() build_dvc() { print_info "Building dvc binary..." - pyinstaller --onefile --additional-hooks-dir $(pwd)/hooks dvc/__main__.py --name dvc --distpath $BIN_DIR --specpath $BUILD_DIR + pyinstaller --onefile --additional-hooks-dir $(pwd)/scripts/hooks dvc/__main__.py --name dvc --distpath $BIN_DIR --specpath $BUILD_DIR } cleanup diff --git a/scripts/build_windows.cmd b/scripts/build_windows.cmd index dc17a0bee..9678c2fbd 100644 --- a/scripts/build_windows.cmd +++ b/scripts/build_windows.cmd @@ -19,7 +19,7 @@ call pip install -r requirements.txt || goto :error call pip install pyinstaller || goto :error echo ====== Building dvc binary... ====== -call pyinstaller --onefile --additional-hooks-dir hooks dvc/__main__.py --name dvc --specpath build +call pyinstaller --onefile --additional-hooks-dir scripts\hooks dvc/__main__.py --name dvc --specpath build echo ====== Copying additional files... ====== copy innosetup\addSymLinkPermissions.ps1 dist\ || goto :error diff --git a/hooks/hook-google.cloud.py b/scripts/hooks/hook-google.cloud.py similarity index 100% rename from hooks/hook-google.cloud.py rename to scripts/hooks/hook-google.cloud.py diff --git a/hooks/hook-google.cloud.storage.py b/scripts/hooks/hook-google.cloud.storage.py similarity index 100% rename from hooks/hook-google.cloud.storage.py rename to scripts/hooks/hook-google.cloud.storage.py