Browse Source

Finalize Windows build/release code (closes #95)

tags/v0.4.1
Ben Kurtovic 8 years ago
parent
commit
8ae14ab3ad
3 changed files with 8 additions and 13 deletions
  1. +7
    -1
      appveyor.yml
  2. +1
    -8
      scripts/release.sh
  3. +0
    -4
      scripts/win_wrapper.cmd

+ 7
- 1
appveyor.yml View File

@@ -14,6 +14,9 @@ environment:
WRAPPER: "cmd /E:ON /V:ON /C .\\scripts\\win_wrapper.cmd" WRAPPER: "cmd /E:ON /V:ON /C .\\scripts\\win_wrapper.cmd"
PIP: "%WRAPPER% %PYTHON%\\Scripts\\pip.exe" PIP: "%WRAPPER% %PYTHON%\\Scripts\\pip.exe"
SETUPPY: "%WRAPPER% %PYTHON%\\python setup.py --with-extension" SETUPPY: "%WRAPPER% %PYTHON%\\python setup.py --with-extension"
PYPI_USERNAME: "earwigbot"
PYPI_PASSWORD:
secure: gOIcvPxSC2ujuhwOzwj3v8xjq3CCYd8keFWVnguLM+gcL0e02qshDHy7gwZZwj0+


matrix: matrix:
- PYTHON: "C:\\Python27" - PYTHON: "C:\\Python27"
@@ -41,7 +44,7 @@ environment:
PYTHON_ARCH: "64" PYTHON_ARCH: "64"


install: install:
- "%PIP% install wheel"
- "%PIP% install wheel twine"


build_script: build_script:
- "%SETUPPY% build" - "%SETUPPY% build"
@@ -52,6 +55,9 @@ test_script:
after_test: after_test:
- "%SETUPPY% bdist_wheel" - "%SETUPPY% bdist_wheel"


on_success:
- "twine upload dist\\* -u %PYPI_USERNAME% -p %PYPI_PASSWORD%"

artifacts: artifacts:
- path: dist\* - path: dist\*




+ 1
- 8
scripts/release.sh View File

@@ -80,18 +80,12 @@ upload_to_pypi() {
echo " done." echo " done."
} }


windows_build() {
echo "PyPI: building/uploading Windows binaries..."
echo "*** Run in Windows: ./scripts/win_build.py"
echo "*** Press enter when done."
read
}

post_release() { post_release() {
echo echo
echo "*** Release completed." echo "*** Release completed."
echo "*** Update: https://github.com/earwig/mwparserfromhell/releases/tag/v$VERSION" echo "*** Update: https://github.com/earwig/mwparserfromhell/releases/tag/v$VERSION"
echo "*** Verify: https://pypi.python.org/pypi/mwparserfromhell" echo "*** Verify: https://pypi.python.org/pypi/mwparserfromhell"
echo "*** Verify: https://ci.appveyor.com/project/earwig/mwparserfromhell"
echo "*** Verify: https://mwparserfromhell.readthedocs.org" echo "*** Verify: https://mwparserfromhell.readthedocs.org"
echo "*** Press enter to sanity-check the release." echo "*** Press enter to sanity-check the release."
read read
@@ -164,7 +158,6 @@ update_changelog
update_docs_changelog update_docs_changelog
do_git_stuff do_git_stuff
upload_to_pypi upload_to_pypi
windows_build
post_release post_release
test_release test_release




+ 0
- 4
scripts/win_wrapper.cmd View File

@@ -33,15 +33,11 @@ IF %MAJOR_PYTHON_VERSION% == "2" (
) )


IF "%PYTHON_ARCH%"=="64" ( IF "%PYTHON_ARCH%"=="64" (
ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
SET DISTUTILS_USE_SDK=1 SET DISTUTILS_USE_SDK=1
SET MSSdk=1 SET MSSdk=1
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION% "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
"%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
ECHO Executing: %COMMAND_TO_RUN%
call %COMMAND_TO_RUN% || EXIT 1 call %COMMAND_TO_RUN% || EXIT 1
) ELSE ( ) ELSE (
ECHO Using default MSVC build environment for 32 bit architecture
ECHO Executing: %COMMAND_TO_RUN%
call %COMMAND_TO_RUN% || EXIT 1 call %COMMAND_TO_RUN% || EXIT 1
) )

Loading…
Cancel
Save