diff --git a/README.md b/README.md index 71ea00f..6f56cb7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ APBS - Adaptive Poisson-Boltzmann Solver ======================================== [![Documentation Status](https://readthedocs.org/projects/apbs/badge/?version=latest)](https://apbs.readthedocs.io/en/latest/?badge=latest) -[![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/Electrostatics/apbs?branch=master&svg=true)](https://ci.appveyor.com/project/intendo/apbs) [![Github Action Build Status](https://github.com/Electrostatics/apbs/workflows/Build/badge.svg)](https://github.com/Electrostatics/apbs/actions) This repository contains the APBS software. diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 2a7311b..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,177 +0,0 @@ -version: 3.1.{build} - -skip_commits: - message: /\[chore\]/ - -branches: - only: - - master - -image: - - Visual Studio 2019 - -clone_folder: c:\projects\source - -clone_depth: 2 - -environment: - PYTHON: "C:\\Python37-x64" - APPVEYOR_RDP_PASSWORD: "RedRum666!" - -artifacts: - - path: '**\APBS*.zip' - name: APBS.zip - -matrix: - fast_finish: false - -# cache: -# - C:\ProgramData\chocolatey\bin -> appveyor.yml # swig.exe -# - C:\ProgramData\chocolatey\lib -> appveyor.yml # supporting swig Lib files. - -# For interactive debugging using Remote Desktop, you need the init, on_finish, and APPVEYOR_RDP_PASSWORD -# - https://www.appveyor.com/docs/how-to/rdp-to-build-worker/ - -# init: -# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - -# on_finish: -# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - -install: - # Install non-python dependencies using chocolatey package manager - - IF NOT EXIST C:\ProgramData\chocolatey\bin\swig.exe choco install --ignorechecksum -f -r -y swig --version=4.0.0 - # - type C:\ProgramData\chocolatey\logs\chocolatey.log - # - where /r C:\ProgramData\chocolatey swig.swg - - SET SWIG_DIR=C:\ProgramData\chocolatey\lib\swig\tools\install - - SET SWIG_EXECUTABLE=C:\ProgramData\chocolatey\lib\swig\tools\install\swig.exe - - # Add SWIG, Python, and CMake to PATH - - SET PATH=%PYTHON%;%PYTHON%\Scripts;C:\Users\appveyor\AppData\Roaming\Python\Python37\Scripts;C:\Program Files\CMake\bin;C:\Program Files\APBS\bin;C:\projects\source\build\bin;C:\ProgramData\chocolatey\lib\swig\tools\install;C:\ProgramData\chocolatey\bin;%PATH% - - echo %PATH% - - - cmake --version - - cpack --version - - # Check that we have the expected version and architecture for Python - - where /r C:\Python37-x64 python.exe - - python --version - - python -m pip install --user --upgrade pip - - # Install the build dependencies of the project. If some dependencies contain - # compiled extensions and are not provided as pre-built wheel packages, - # pip will build them from source using the MSVC compiler matching the - # target Python version and architecture - - pip.exe install --user wheel - - pip.exe install --user -r c:\projects\source\requirements.txt - -build_script: - # Setup Visual Studio Environment for compiling, linking, and logging - - set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\vsdevcmd\core\vsdevcmd_start.bat" - - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - - # set - # REM set VSDIR="C:\Program Files (x86)\Microsoft Visual Studio" - # set VSDIR="C:\" - # FOR /F "tokens=* USEBACKQ" %F IN (`where /r %VSDIR% vsdevcmd_start.bat`) DO (SET vsdevcmd="%F") - # REM Should be something like C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\vsdevcmd\core\vsdevcmd_start.bat" - # ECHO "VS DEV CMD BAT FILE = %vsdevcmd%" - # call %vsdevcmd% - # FOR /F "tokens=* USEBACKQ" %F IN (`where /r %VSDIR% vsvars64.bat`) DO (SET vsdevcmd="%F") - # REM Should be something like "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" - # ECHO "VS VARS FILE = %vsdevcmd%" - # call %vsdevcmd% - - # Install BLAS - - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Sy mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-python2-pip mingw-w64-x86_64-openblas mingw-w64-x86_64-lapack" - - - # Get the external projects configured - - cd c:\projects\source - - git submodule update --init --recursive - - - echo "*****************************************************************************" - - echo PYBIND11_BUILD - - echo "*****************************************************************************" - - set pybind11_DIR=C:\projects\source\externals\pybind11\install - - cd externals\pybind11 - - mkdir build - - mkdir install - - cd build - - - echo "*****************************************************************************" - - echo PYBIND11_CONFIGURE - - echo "*****************************************************************************" - - cmake .. -DCMAKE_INSTALL_PREFIX=%pybind11_DIR% -DDOWNLOAD_CATCH=ON - - - echo "*****************************************************************************" - - echo PYBIND11_MAKE_INSTALL - - echo "*****************************************************************************" - # cmake --build . --config Release --parallel 1 --target install -- /m:1 /v:diag /logger:%MSBuildLogger% - - cmake --build . --config Release --parallel 1 --target install -- /m:1 /logger:%MSBuildLogger% - - set pybind11_DIR=C:\projects\source\externals\pybind11\install\share\cmake\pybind11 - - - echo "*****************************************************************************" - - echo APBS_CONFIG - - echo "*****************************************************************************" - - mkdir c:\projects\source\build - - cd c:\projects\source\build - # NOTE: This installs APBS in C:\Program Files\APBS - - cmake --trace-source=externals/fetk/maloc/src/CMakeLists.txt --trace-expand -DCMAKE_INSTALL_INCLUDEDIR=include -DPYBIND11_DIR=%pybind11_DIR% -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_TESTING=ON -DBUILD_TOOLS=ON -DCHECK_EPSILON=ON -DENABLE_FETK=OFF -DENABLE_BEM=ON -DENABLE_GEOFLOW=ON -DENABLE_INLINE=ON -DENABLE_PBAM=ON -DENABLE_PYTHON=OFF -DENABLE_TESTS=ON -DBUILD_SHARED_LIBS=OFF -DENABLE_VERBOSE_DEBUG=ON -DGET_NanoShaper=ON -G "Visual Studio 16 2019" -A x64 c:\projects\source - - - echo "*****************************************************************************" - - echo APBS_CMAKE_OUTPUT - - echo "*****************************************************************************" - - if exist c:\projects\source\build\CMakeFiles\CMakeOutput.log type c:\projects\source\build\CMakeFiles\CMakeOutput.log - - - echo "*****************************************************************************" - - echo APBS_CMAKE_ERROR - - echo "*****************************************************************************" - - if exist c:\projects\source\build\CMakeFiles\CMakeError.log type c:\projects\source\build\CMakeFiles\CMakeError.log - - - echo "*****************************************************************************" - - echo APBS_MAKE_INSTALL - - echo "*****************************************************************************" - - cd c:\projects\source\build - - cmake --build . --config Release --parallel 1 --target install -- /m:1 /logger:%MSBuildLogger% - -# - echo "*****************************************************************************" -# - echo APBS_TEST VERBOSE -# - echo "*****************************************************************************" -# - cd c:\projects\source\build -# - ctest -C Release -VV -R protein-rna - - - echo "*****************************************************************************" - - echo APBS_TEST - - echo "*****************************************************************************" - - cd c:\projects\source\build - - ctest -C Release --verbose --output-on-failure - -# - echo "*****************************************************************************" -# - echo APBS_TEST PBAM EXAMPLE -# - echo "*****************************************************************************" -# - cd C:\Program Files\APBS\share\apbs\tests -# - python apbs_tester.py -e "C:\Program Files\APBS\bin\apbs.exe" -c test_cases.cfg -t pbam - - - echo "*****************************************************************************" - - echo APBS_PACKAGE - - echo "*****************************************************************************" - - cd c:\projects\source\build -# NOTE: Full path needed to avoid problems with chocolatey version of cpack (will give nuspec error) -# - SET PATH=C:\Program Files\CMake\bin;C:\Program Files\APBS\bin;C:\projects\source\build\bin - - cpack -C Release -G ZIP - - unzip -l APBS*.zip - - - echo "*****************************************************************************" - - echo APBS_CLEANUP - - echo "*****************************************************************************" - - forfiles /S /P c:\projects\source\build\_CPack_Packages /M *.zip /C "cmd /c if @isdir==FALSE del @file" - - - echo "*****************************************************************************" - - echo APBS_DONE - - echo "*****************************************************************************" - -on_failure: - - if exist c:\projects\source\build\CMakeFiles\CMakeError.log type c:\projects\source\build\CMakeFiles\CMakeError.log - - if exist c:\projects\source\build\CMakeFiles\CMakeOutput.log type c:\projects\source\build\CMakeFiles\CMakeOutput.log