@@ -39,9 +39,9 @@ install:
3939 - python --version
4040 - python -m pip install --upgrade pip build wheel virtualenv setuptools
4141 - python -m pip install -r docs/requirements.txt
42- - python -m pip install --upgrade -r dist/requirements_windows .txt --no-binary imageio-ffmpeg
42+ - python -m pip install --upgrade -r packaging/windows/requirements .txt --no-binary imageio-ffmpeg
4343 # Checkout build resources and third party software used for testing.
44- - git checkout refs/remotes/origin/resources -- dist /
44+ - git checkout refs/remotes/origin/resources -- packaging /
4545 - appveyor DownloadFile https://github.com/GyanD/codexffmpeg/releases/download/%ffmpeg_version%/ffmpeg-%ffmpeg_version%-full_build.7z
4646 - 7z e ffmpeg-%ffmpeg_version%-full_build.7z -odist/ffmpeg ffmpeg.exe LICENSE -r
4747 - ' SET IMAGEIO_FFMPEG_EXE=%APPVEYOR_BUILD_FOLDER%\\dist\\ffmpeg\\ffmpeg.exe'
@@ -50,14 +50,13 @@ install:
5050 - echo * * BUILDING WINDOWS EXE * *
5151 - echo * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
5252 # Build Windows .EXE and create portable .ZIP
53- - python dist /pre_release.py --release
54- - pyinstaller dist /scenedetect.spec
53+ - python scripts /pre_release.py --release
54+ - pyinstaller packaging/windows /scenedetect.spec
5555 - sphinx-build -b singlehtml docs dist/scenedetect/docs
5656 - mkdir dist\scenedetect\thirdparty
5757 - move LICENSE dist\scenedetect\
58- - move dist\windows\README* dist\scenedetect\
59- - move dist\windows\LICENSE* dist\scenedetect\thirdparty\
60- - move scenedetect\_thirdparty\LICENSE* dist\scenedetect\thirdparty\
58+ - copy packaging\windows\LICENSE-PYTHON dist\scenedetect\thirdparty\
59+ - copy scenedetect\_thirdparty\LICENSE* dist\scenedetect\thirdparty\
6160 - copy dist\ffmpeg\ffmpeg.exe dist\scenedetect\
6261 - move dist\ffmpeg\LICENSE dist\scenedetect\thirdparty\LICENSE-FFMPEG
6362 - cd dist/scenedetect
@@ -68,7 +67,7 @@ install:
6867 - echo * * BUILDING MSI INSTALLER * *
6968 - echo * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
7069 # Download, install, and register AdvancedInstaller
71- - cd dist /installer
70+ - cd packaging/windows /installer
7271 - ps : iex ((New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/appveyor/secure-file/master/install.ps1'))
7372 - appveyor-tools\secure-file -decrypt license65.dat.enc -secret %ai_license_secret% -salt %ai_license_salt%
7473 - appveyor DownloadFile https://www.advancedinstaller.com/downloads/advinst.msi
@@ -84,8 +83,8 @@ install:
8483 - echo * * PACKAGING BUILD ARTIFACTS * *
8584 - echo * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
8685 # Zip all resources together for code signing
86+ - move packaging\windows\installer\PySceneDetect-*.msi dist\
8787 - cd dist
88- - move installer\PySceneDetect-*.msi .
8988 - cp scenedetect\scenedetect.exe .
9089 - 7z a scenedetect-signed.zip scenedetect.exe PySceneDetect-*.msi
9190 - cd ..
0 commit comments