Skip to content

Commit

Permalink
Remove usr dir before Windows build, version downloaded binaries
Browse files Browse the repository at this point in the history
Issue #33
  • Loading branch information
barche committed Jan 31, 2017
1 parent c6fa8d8 commit 7b612ee
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ test_script:
- C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"QML\")"

after_test:
- IF NOT DEFINED MSYSTEM C:\projects\julia\bin\julia -e "cd(joinpath(Pkg.dir(\"QML\"), \"deps\")); run(`7z a $(ENV[\"APPVEYOR_BUILD_FOLDER\"])\\QML-julia-$(VERSION.major).$(VERSION.minor)-win$(Sys.WORD_SIZE).zip usr`)"
- IF NOT DEFINED MSYSTEM C:\projects\julia\bin\julia -e "cd(joinpath(Pkg.dir(\"QML\"), \"deps\")); run(`7z a $(ENV[\"APPVEYOR_BUILD_FOLDER\"])\\QML$(get(ENV, \"APPVEYOR_REPO_TAG_NAME\", \"\"))-julia-$(VERSION.major).$(VERSION.minor)-win$(Sys.WORD_SIZE).zip usr`)"
- echo %APPVEYOR_JOB_NAME%

artifacts:
Expand Down
7 changes: 5 additions & 2 deletions deps/build.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using BinDeps
using CxxWrap

const QML_JL_VERSION = v"0.3.0"
const QML_JL_VERSION = v"0.3.1"

QT_ROOT = get(ENV, "QT_ROOT", "")

Expand Down Expand Up @@ -84,6 +84,9 @@ makeopts = ["--", "-j", "$(Sys.CPU_CORES+2)"]
# Set generator if on windows
genopt = "Unix Makefiles"
@static if is_windows()
if isdir(prefix)
rm(prefix, recursive=true)
end
if get(ENV, "MSYSTEM", "") == ""
makeopts = "--"
if Sys.WORD_SIZE == 64
Expand Down Expand Up @@ -140,7 +143,7 @@ deps = [qmlwrap]
if endswith(pkgverstring,"+")
bin_uri = URI("https://ci.appveyor.com/api/projects/barche/qml-jl/artifacts/$(zipfilename)?job=Environment%3a+JULIAVERSION%3djulialang%2fbin%2fwinnt%2f$(archname)%2f$(shortversion)%2fjulia-$(shortversion)-latest-win$(Sys.WORD_SIZE).exe%2c+BUILD_ON_WINDOWS%3d1")
else
bin_uri = URI("https://github.com/barche/QML.jl/releases/download/v$(pkgverstring)/QML-julia-$(VERSION.major).$(VERSION.minor)-win$(Sys.WORD_SIZE).zip")
bin_uri = URI("https://github.com/barche/QML.jl/releases/download/v$(pkgverstring)/QMLv$(pkgverstring)-julia-$(VERSION.major).$(VERSION.minor)-win$(Sys.WORD_SIZE).zip")
end
provides(Binaries, Dict(bin_uri => deps), os = :Windows)
end
Expand Down

0 comments on commit 7b612ee

Please sign in to comment.