Skip to content

Commit 4b1de9e

Browse files
committed
Merge branch 'v02' into v03
2 parents bfdf964 + 48e5214 commit 4b1de9e

2 files changed

Lines changed: 39 additions & 9 deletions

File tree

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ sudo apt-get install libsdl2-dev
2828
Для Windows:
2929
- качаем [SDL2-devel-2.0.3-mingw.tar.gz](https://www.libsdl.org/release/SDL2-devel-2.0.3-mingw.tar.gz), распаковываем, ищем файл SDL2-2.0.3\TARGET-w64-mingw32\lib\libSDL2.dll.a и копируем его в RUST_PATH\bin\rustlib\TARGET-pc-windows-gnu\lib\
3030
- качаем [SDL2-2.0.3-win32-x86.zip](https://www.libsdl.org/release/SDL2-2.0.3-win32-x86.zip) или [SDL2-2.0.3-win32-x64.zip](https://www.libsdl.org/release/SDL2-2.0.3-win32-x64.zip) в зависимости от платформы, распаковываем и кладем либо в директорию, которая находится в PATH, либо рядом с exe который получится после компиляции проекта
31+
- для x86 платформы качаем [gcc-core-4.8.1-4-mingw32-dll.tar.lzma](http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dll.tar.lzma), распоковываем и libgcc_s_dw2-1.dll кладем либо в директорию, которая находится в PATH, либо рядом с exe который получится после компиляции проекта
32+
33+
Готовые сборки:
34+
--
35+
В связи со сложным процессом установки под Windows - можно просто [взять](https://github.com/ReanGD/rust-software-render/releases) готовые сборки для платформ x86 и x64, для каждой версии приложения.
3136

3237
Сборка и запуск
3338
--

appveyor.yml

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ version: '{branch}.{build}'
22
skip_tags: true
33
clone_folder: c:\projects\git
44
environment:
5+
token:
6+
secure: /VxMVHbl3XzhHfFGCCu81O4JPgI42lbTT+n/opdJ7LW8XMsjgW3ztAPLI3u2TBro
57
RUST_VERSION: rust-1.3.0
68
SDL_VERSION: 2.0.3
79
matrix:
@@ -20,6 +22,12 @@ install:
2022
New-Item c:\projects\git\artifacts -type directory
2123
2224
25+
cd c:\Python27\Scripts\
26+
27+
./easy_install pip
28+
29+
./pip install --disable-pip-version-check --pre github3.py
30+
2331
cd c:\projects\downloads
2432
2533
Start-FileDownload "https://static.rust-lang.org/dist/${env:RUST_VERSION}-${env:TARGET1}-pc-windows-gnu.msi"
@@ -30,6 +38,10 @@ install:
3038
3139
Start-FileDownload "https://www.libsdl.org/release/SDL2-devel-${env:SDL_VERSION}-mingw.tar.gz"
3240
41+
If (${env:TARGET2} -eq "x86") {
42+
Start-FileDownload "http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dll.tar.lzma"
43+
}
44+
3345
3446
Start-Process -FilePath msiexec -ArgumentList /i, ${env:RUST_VERSION}-${env:TARGET1}-pc-windows-gnu.msi, INSTALLDIR="c:\projects\rust", /quiet -Wait
3547
@@ -43,6 +55,14 @@ install:
4355
4456
7z x SDL2-devel-${env:SDL_VERSION}-mingw.tar
4557
58+
If (${env:TARGET2} -eq "x86") {
59+
7z x gcc-core-4.8.1-4-mingw32-dll.tar.lzma
60+
}
61+
62+
If (${env:TARGET2} -eq "x86") {
63+
7z x gcc-core-4.8.1-4-mingw32-dll.tar
64+
}
65+
4666
4767
Copy-Item cargo-nightly-${env:TARGET1}-pc-windows-gnu\cargo\* c:\projects\cargo\ -recurse
4868
@@ -52,6 +72,10 @@ install:
5272
5373
Copy-Item SDL2.dll c:\projects\git\artifacts\
5474
75+
If (${env:TARGET2} -eq "x86") {
76+
Copy-Item bin\libgcc_s_dw2-1.dll c:\projects\git\artifacts\
77+
}
78+
5579
Copy-Item c:\projects\git\media c:\projects\git\artifacts\ -recurse
5680
5781
@@ -74,18 +98,19 @@ build_script:
7498
Copy-Item target\release\rust-software-render.exe artifacts\
7599
test_script:
76100
- ps: cargo test -v
101+
before_deploy:
102+
- ps: python -c"from github3 import login;import os;map(lambda x:x.delete(),[it for it in login(token=os.environ['token']).repository('ReanGD','rust-software-render').releases() if it.tag_name==os.environ['APPVEYOR_REPO_BRANCH']+'-'+os.environ['TARGET2']+'-win'])"
77103
artifacts:
78104
- path: artifacts
79105
name: artifacts
80-
# http://help.appveyor.com/discussions/problems/3008-artifacts-cant-uploaded-to-github-release-400-bad-request
81-
# deploy:
82-
# - provider: GitHub
83-
# tag: $(APPVEYOR_REPO_BRANCH)-win
84-
# release: $(APPVEYOR_REPO_BRANCH)-$(TARGET2)-win
85-
# description: $(APPVEYOR_REPO_BRANCH)-$(TARGET2) for windows
86-
# auth_token:
87-
# secure: /VxMVHbl3XzhHfFGCCu81O4JPgI42lbTT+n/opdJ7LW8XMsjgW3ztAPLI3u2TBro
88-
# artifact: artifacts.zip
106+
deploy:
107+
- provider: GitHub
108+
tag: $(APPVEYOR_REPO_BRANCH)-$(TARGET2)-win
109+
release: $(APPVEYOR_REPO_BRANCH)-$(TARGET2)-win
110+
description: $(APPVEYOR_REPO_BRANCH)-$(TARGET2) for windows
111+
auth_token:
112+
secure: /VxMVHbl3XzhHfFGCCu81O4JPgI42lbTT+n/opdJ7LW8XMsjgW3ztAPLI3u2TBro
113+
artifact: artifacts.zip
89114
notifications:
90115
- provider: Email
91116
to:

0 commit comments

Comments
 (0)