diff --git a/Project.toml b/Project.toml index 5aa9b685..bec46135 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Polymake" uuid = "d720cf60-89b5-51f5-aff5-213f193123e7" repo = "https://github.com/oscar-system/Polymake.jl.git" -version = "0.2.0" +version = "0.1.0" [deps] BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232" @@ -13,6 +13,13 @@ Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" +[compat] +julia = "^1.0" +BinaryProvider = "^0.5.3" +CMake = "^1.1.1" +CxxWrap = "^0.8.2" +JSON = "^0.20.0" + [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/REQUIRE b/REQUIRE deleted file mode 100644 index b0e6404c..00000000 --- a/REQUIRE +++ /dev/null @@ -1,6 +0,0 @@ -julia 1.0 -BinaryProvider -CMake -CxxWrap -JSON -Libdl diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index a5df9e9d..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,47 +0,0 @@ -environment: - matrix: - - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe" - - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe" - - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe" - - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe" - -## uncomment the following lines to allow failures on nightly julia -## (tests will run but not make your overall status red) -#matrix: -# allow_failures: -# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe" -# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe" - -branches: - only: - - master - - /release-.*/ - -notifications: - - provider: Email - on_build_success: false - on_build_failure: false - on_build_status_changed: false - -install: - - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12" -# If there's a newer build queued for the same PR, cancel this one - - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod ` - https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | ` - Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` - throw "There are newer queued builds for this pull request, failing early." } -# Download most recent Julia Windows binary - - ps: (new-object net.webclient).DownloadFile( - $env:JULIA_URL, - "C:\projects\julia-binary.exe") -# Run installer silently, output to C:\projects\julia - - C:\projects\julia-binary.exe /S /D=C:\projects\julia - -build_script: -# Need to convert from shallow to complete for Pkg.clone to work - - IF EXIST .git\shallow (git fetch --unshallow) - - C:\projects\julia\bin\julia -e "versioninfo(); - Pkg.clone(pwd(), \"Polymake\"); Pkg.build(\"Polymake\")" - -test_script: - - C:\projects\julia\bin\julia -e "Pkg.test(\"Polymake\")" diff --git a/deps/build.jl b/deps/build.jl index 5f44e175..70f72f00 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -9,14 +9,15 @@ const verbose = "--verbose" in ARGS # Dependencies that must be installed before this package can be built dependencies = [ - "https://github.com/bicycle1885/ZlibBuilder/releases/download/v1.0.3/build_Zlib.v1.2.11.jl", - "https://github.com/benlorenz/XML2Builder/releases/download/v1.0.1-1/build_XML2Builder.v2.9.7.jl", - "https://github.com/benlorenz/XSLTBuilder/releases/download/v1.1.32/build_XSLTBuilder.v1.1.32.jl", - "https://github.com/benlorenz/boostBuilder/releases/download/v1.67.0/build_boost.v1.67.0.jl", - "https://github.com/benlorenz/GMPBuilder/releases/download/v6.1.2-2/build_GMP.v6.1.2.jl", - "https://github.com/benlorenz/MPFRBuilder/releases/download/v4.0.1-3/build_MPFR.v4.0.1.jl", - "https://github.com/benlorenz/perlBuilder/releases/download/v5.28.0/build_perl.v5.28.0.jl", + "https://github.com/bicycle1885/ZlibBuilder/releases/download/v1.0.4/build_Zlib.v1.2.11.jl", + "https://github.com/bicycle1885/XML2Builder/releases/download/v1.0.2/build_XML2Builder.v2.9.9.jl", + "https://github.com/benlorenz/XSLTBuilder/releases/download/v1.1.33/build_XSLTBuilder.v1.1.33.jl", + "https://github.com/benlorenz/boostBuilder/releases/download/v1.70.0/build_boost.v1.70.0.jl", + "https://github.com/JuliaPackaging/Yggdrasil/releases/download/GMP-v6.1.2-1/build_GMP.v6.1.2.jl", + "https://github.com/JuliaPackaging/Yggdrasil/releases/download/MPFR-v4.0.2-1/build_MPFR.v4.0.2.jl", + "https://github.com/benlorenz/perlBuilder/releases/download/v5.28.2/build_perl.v5.28.2.jl", "https://github.com/benlorenz/ninjaBuilder/releases/download/v1.9.0/build_ninja.v1.9.0.jl", + ] @@ -52,16 +53,16 @@ products = Product[ ] # Download binaries from hosted location -bin_prefix = "https://github.com/benlorenz/polymakeBuilder/releases/download/v3.3" +bin_prefix = "https://github.com/benlorenz/polymakeBuilder/releases/download/v3.4-1" # Listing of files generated by BinaryBuilder: download_info = Dict( - Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc6)) => ("$bin_prefix/polymake.v3.3.0.i686-linux-gnu-gcc6.tar.gz", "67c8d0606618136e389cee64eab3420c5932e249a1dd3b6159b64991e8550bec"), - Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/polymake.v3.3.0.i686-linux-gnu-gcc7.tar.gz", "9b094f235abc213dee8d19548f32cac1038803052ea16b93461fb7c14d453c81"), - Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/polymake.v3.3.0.i686-linux-gnu-gcc8.tar.gz", "df5a649b2bab705423ff6fa1ed38f2c0819d42017c4d7a835855aa49ed3cd19c"), - Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc6)) => ("$bin_prefix/polymake.v3.3.0.x86_64-linux-gnu-gcc6.tar.gz", "58db546b3954ee25609797cf836c3d5c82dc56005dc3af60219c7d23d200980b"), - Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/polymake.v3.3.0.x86_64-linux-gnu-gcc7.tar.gz", "5fa4f79758b3332e64cce997f3f4142976d5a6e3c2d8d9d7c6798f793e37408d"), - Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/polymake.v3.3.0.x86_64-linux-gnu-gcc8.tar.gz", "2885239064d1fdbe025e5eea613cc753497e22e3fcfa22154b201e2b55dbbf54"), + Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc6)) => ("$bin_prefix/polymake.v3.4.0.i686-linux-gnu-gcc6.tar.gz", "17d73efceacaacd76643fd5920c073313be90fb1dc5434f9304fab1643321788"), + Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/polymake.v3.4.0.i686-linux-gnu-gcc7.tar.gz", "5cd679d8276a498a63bb18529f821ebf0ac533c220bedac3298133ec82f9226a"), + Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/polymake.v3.4.0.i686-linux-gnu-gcc8.tar.gz", "9b05dd1171a994f8340d03c316103148c0fdc438aa54a3ec123001bf76ac6612"), + Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc6)) => ("$bin_prefix/polymake.v3.4.0.x86_64-linux-gnu-gcc6.tar.gz", "ece0b32f6c5907166d16c9425dc8d1dc4ca77ebf754f1e8279a91140f4869d40"), + Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/polymake.v3.4.0.x86_64-linux-gnu-gcc7.tar.gz", "1e151e8e666649d397f00b5dc39fc679a135e2d0d5cddc7e8ba63f2399e4cfa7"), + Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/polymake.v3.4.0.x86_64-linux-gnu-gcc8.tar.gz", "b1a42341f486073c41fa7ef0beb26c54c5c15d633bd6f69b92b758477c4f2295"), )