diff --git a/.appveyor.yml b/.appveyor.yml index 87b8e72..77b2d78 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,30 +2,44 @@ image: Visual Studio 2017 configuration: Release platform: - x64 -clone_folder: C:\projects\calyp - -#init: - #- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +environment: + access_token: + secure: WAV5LfCSAtwE1JuZh4HrDlxOOClimLoslYAJlf5KRgc3f7WIkX591PrSSua/Zo2C + +clone_folder: C:\Projects\calyp +init: + - ps: Add-Content "$HOME\.git-credentials" "https://$($env:access_token):x-oauth-basic@github.com`n" + - git config --global credential.helper store + - git config --global user.email "jfmcarreira@gmail.com" + - git config --global user.name "AppVeyor" + - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + install: - '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64' #- '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64' - choco install nsis - choco install opencv - 'C:\Tools\opencv\build\setup_vars_opencv4.cmd' - - cd C:\projects + - cd C:\Projects - ps: Start-FileDownload 'https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-4.1.1-win64-dev.zip' - 7z x ffmpeg-4.1.1-win64-dev.zip -y + - git clone https://github.com/pixlra/calyp-deployment.git + - build_script: - - cd C:\projects\calyp - - mkdir build - - cd build - - cmake -DCMAKE_BUILD_TYPE=Release -DUSE_DYNLOAD=OFF -DOpenCV_DIR="C:/Tools/opencv/build" -DOpenCV_DLL_DIR="C:/Tools/opencv/build/x64/vc15/bin" -DOpenCV_INSTALL_MODULES="world" -DQT_DIR="C:\Qt\latest\msvc2017_64" -DQt5_DIR="C:\Qt\latest\msvc2017_64\lib\cmake\Qt5" -DUSE_QTDBUS=OFF -DAVFORMAT_LIBRARIES=C:/projects/ffmpeg-4.1.1-win64-dev/lib/avformat.lib -DAVFORMAT_INCLUDE_DIRS=C:/projects/ffmpeg-4.1.1-win64-dev/include -DAVCODEC_LIBRARIES=C:/projects/ffmpeg-4.1.1-win64-dev/lib/avcodec.lib -DAVCODEC_INCLUDE_DIRS=C:/projects/ffmpeg-4.1.1-win64-dev/include -DAVUTIL_LIBRARIES=C:/projects/ffmpeg-4.1.1-win64-dev/lib/avutil.lib -DAVUTIL_INCLUDE_DIRS=C:/projects/ffmpeg-4.1.1-win64-dev/include -DSWSCALE_LIBRARIES=C:/projects/ffmpeg-4.1.1-win64-dev/lib/swscale.lib -DSWSCALE_INCLUDE_DIRS=C:/projects/ffmpeg-4.1.1-win64-dev/include -G "Visual Studio 15 2017 Win64" .. + - mv C:\Projects\calyp C:\Projects\calyp-deployment\cmake-helper\ + - mkdir C:\Projects\calyp-build + - cd C:\Projects\calyp-build + - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DUSE_DYNLOAD=OFF -DOpenCV_DIR="C:/Tools/opencv/build" -DOpenCV_DLL_DIR="C:/Tools/opencv/build/x64/vc15/bin" -DOpenCV_INSTALL_MODULES="world" -DQT_DIR="C:\Qt\latest\msvc2017_64" -DQt5_DIR="C:\Qt\latest\msvc2017_64\lib\cmake\Qt5" -DUSE_QTDBUS=OFF -DAVFORMAT_LIBRARIES=C:/Projects/ffmpeg-4.1.1-win64-dev/lib/avformat.lib -DAVFORMAT_INCLUDE_DIRS=C:/Projects/ffmpeg-4.1.1-win64-dev/include -DAVCODEC_LIBRARIES=C:/Projects/ffmpeg-4.1.1-win64-dev/lib/avcodec.lib -DAVCODEC_INCLUDE_DIRS=C:/Projects/ffmpeg-4.1.1-win64-dev/include -DAVUTIL_LIBRARIES=C:/Projects/ffmpeg-4.1.1-win64-dev/lib/avutil.lib -DAVUTIL_INCLUDE_DIRS=C:/Projects/ffmpeg-4.1.1-win64-dev/include -DSWSCALE_LIBRARIES=C:/Projects/ffmpeg-4.1.1-win64-dev/lib/swscale.lib -DSWSCALE_INCLUDE_DIRS=C:/Projects/ffmpeg-4.1.1-win64-dev/include -G "Visual Studio 15 2017 Win64" C:\Projects\calyp-deployment\cmake-helper - cmake --build . --target ALL_BUILD -- /p:Configuration=Release > log_build - cmake --build . --target INSTALL -- /p:Configuration=Release > log_install - cmake --build . --target PACKAGE -- /p:Configuration=Release > log_pkg -#on_finish: -# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +after_build: + - IF "%APPVEYOR_REPO_BRANCH%" == "master" (CALL ..\calyp-deployment\scripts\deploy-to-github.bat) + + +on_failure: + - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + diff --git a/CMakeLists.txt b/CMakeLists.txt index 39757b1..7fd71ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -215,8 +215,6 @@ ENDIF() CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h ) -INCLUDE( cmake/BuildPkg.cmake ) - ###################################################################################### # Final information dump ###################################################################################### diff --git a/cmake/BuildPkg.cmake b/cmake/BuildPkg.cmake deleted file mode 100644 index ec9defd..0000000 --- a/cmake/BuildPkg.cmake +++ /dev/null @@ -1,63 +0,0 @@ -###################################################################################### -# Create deb package -###################################################################################### - -SET(CPACK_PACKAGE_NAME ${PROJECT_NAME}) -SET(PACKAGE_NAME "" CACHE STRING "Tag instead of version" ) - -SET(CPACK_PACKAGE_CONTACT "Joao Carreira (jfmcarreira@gmail.com), Luis Lucas (luisfrlucas@gmail.com)") -SET(CPACK_PACKAGE_VERSION ${CALYP_VERSION}) -SET(CPACK_PACKAGE_ARCHITECTURE "amd64") - -IF( USE_QT4 ) - LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libqtcore4 (>= 4:4.8.5), libqtgui4 (>= 4:4.8.5), libqt4-dbus (>= 4:4.8.5)" ) - SET( APPEND_VERSION "${APPEND_VERSION}_wQT4" ) -ELSE() - LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5core5a (>= 5.2.0), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.0.2) | libqt5gui5-gles (>= 5.0.2), libqt5printsupport5 (>= 5.0.2), libqt5widgets5 (>= 5.2.0)") - SET( APPEND_VERSION "${APPEND_VERSION}_wQT5" ) -ENDIF() - -IF( USE_OPENCV ) - LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ",") - LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libopencv-core2.4, libopencv-highgui2.4") - SET( APPEND_VERSION "${APPEND_VERSION}_wOpenCV" ) -ENDIF() - -IF( USE_FFMPEG ) - LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ",") - LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libavcodec54 (>= 7:1.2.5~) | libavcodec-extra-54 (>= 7:1.2.5~), libavformat54 (>= 7:1.2.5~), libavutil52 (>= 7:1.2.5~)") - SET( APPEND_VERSION "${APPEND_VERSION}_wFFmpeg" ) -ENDIF() - -IF( UNIX ) - SET(CPACK_GENERATOR "DEB;ZIP") - SET(OS "Linux") - SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Calyp is an open-source QT based raw video player") - SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Joao Carreira (jfmcarreira@gmail.com), Luis Lucas (luisfrlucas@gmail.com)") - SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${CPACK_PACKAGE_ARCHITECTURE} ) - LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ", libc6 (>= 2.14), libgcc1 (>= 1:4.1.1) , libstdc++6 (>= 4.1.1)") - STRING(REPLACE ";" "" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS} ) -ENDIF() -IF( WIN32 ) - SET(CPACK_GENERATOR "ZIP;NSIS") - SET(OS "Windows") - - set(CPACK_NSIS_PACKAGE_NAME ${PROJECT_NAME}) - set(CPACK_NSIS_DISPLAY_NAME ${PROJECT_NAME}) - set(CPACK_NSIS_CONTACT ${CPACK_PACKAGE_CONTACT}) - - set(CPACK_PACKAGE_INSTALL_DIRECTORY "calyp" ) - - SET(GIT_BRANCH "master") # temp work around -ENDIF() - -IF( PACKAGE_NAME STREQUAL "") - SET( PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${APPEND_VERSION}-${OS}-${CPACK_PACKAGE_ARCHITECTURE}" ) -ELSE() - SET( PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PACKAGE_NAME}${APPEND_VERSION}-${OS}-${CPACK_PACKAGE_ARCHITECTURE}" ) -ENDIF() -SET( CPACK_PACKAGE_FILE_NAME ${PACKAGE_FILE_NAME} ) - -INCLUDE(CPack) - -MESSAGE( STATUS " Package Name:" "${PACKAGE_FILE_NAME}" )