Skip to content

Commit

Permalink
On windows (appveyor), removed Qt platform copy, it was not good. On …
Browse files Browse the repository at this point in the history
…travis, fixed an error inside the PyQt package binary archive
  • Loading branch information
smarie committed Oct 17, 2017
1 parent d3f9642 commit ae8fcd8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ after_success:
# this was a bad idea we should let the users handle the qt installation + addition to path themselves.
# echo "copy qt files inside pyqt5"; cd ${TRAVIS_BUILD_DIR}/${QT_DIR}/lib ; find . \( -name "*Core.so*" -o -name "*Gui.so*" -o -name "*Widgets.so*" \) -exec cp {} ${PYQT_DIST_DIR} \; ;
- echo "finally create the archive"; cd ${TRAVIS_BUILD_DIR};
sudo tar czvf ${TRAVIS_BUILD_DIR}/dist/PyQt${PYQT_VER}_gpl_py${TRAVIS_PYTHON_VERSION}_${SUF}.tar.gz PyQt${PYQT_VER} >/dev/null
sudo tar czvf ${TRAVIS_BUILD_DIR}/dist/PyQt${PYQT_VER}_gpl_py${TRAVIS_PYTHON_VERSION}_${SUF}.tar.gz PyQt5 >/dev/null

- ls dist
#
Expand Down
4 changes: 3 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ after_test:
# besides there are also the msys2 dependencies to install.
# If one day we want to be able to ship like 'conda install' then we will need to recompilet against MSVC and to ship also a Qt wheel (see conda)
#- echo "copy qt files inside pyqt5" & cd %APPVEYOR_BUILD_FOLDER%/%QT_DIR_REL%/bin & for /r %%i in (*Core.dll *Gui.dll *Widgets.dll) do xcopy /Y "%%i" "%APPVEYOR_BUILD_FOLDER%/%PYQT_DIST_REL%"
- echo "copy qt platform file inside pyqt5" & mkdir "%APPVEYOR_BUILD_FOLDER%/%PYQT_DIST_REL%/platforms" & xcopy %APPVEYOR_BUILD_FOLDER%/%QT_DIR_REL%/plugins/platforms/qwindows.dll "%APPVEYOR_BUILD_FOLDER%/%PYQT_DIST_REL%/platforms"
# - echo "copy qt platform file inside pyqt5"
# - mkdir "%APPVEYOR_BUILD_FOLDER%/%PYQT_DIST_REL%/platforms"
# - xcopy "%APPVEYOR_BUILD_FOLDER%/%QT_DIR_REL%/plugins/platforms/qwindows.dll" "%APPVEYOR_BUILD_FOLDER%/%PYQT_DIST_REL%/platforms"
- echo "finally create the archive" & cd %APPVEYOR_BUILD_FOLDER% &
7z a -ttar -so PyQt%PYQT_VER%_gpl_py%PYTHON_VERSION%_%SUF%.tar %PYQT_DIST_REL% | 7z a -si dist/PyQt%PYQT_VER%_gpl_py%PYTHON_VERSION%_%SUF%.tar.gz

Expand Down

0 comments on commit ae8fcd8

Please sign in to comment.