Move everything from whitequark/solvespace to solvespace/solvespace.

pull/4/head
whitequark 2016-04-19 16:57:28 +00:00
parent 2edc61d072
commit d2b21666e1
4 changed files with 45 additions and 13 deletions

2
.gitmodules vendored
View File

@ -10,4 +10,4 @@
url = http://git.sv.nongnu.org/r/freetype/freetype2.git url = http://git.sv.nongnu.org/r/freetype/freetype2.git
[submodule "extlib/libdxfrw"] [submodule "extlib/libdxfrw"]
path = extlib/libdxfrw path = extlib/libdxfrw
url = https://github.com/whitequark/libdxfrw.git url = https://github.com/solvespace/libdxfrw.git

View File

@ -11,6 +11,28 @@ script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis/build-debian.sh; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis/build-debian.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis/build-macos.sh; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis/build-macos.sh; fi
deploy: deploy:
# Releases to solvespace/solvespace
- provider: releases
api_key:
secure: dDlkIawHcODlW9B/20/cQCtzeoocvs0hKuNngRKXKqzXLWTRq33oq/B7+39tAixWbmv6exTpijiKrRNFiSCW5Z4iwHLwaRD4XJznxw63e/Hus/dxg2Tvqx7XFpkCz8mT1Z+gZQE5YxAngeZPpI/sZbZtF1UO3yH5eLeeokZ15p26ZskQUPoYuzrTgTzYL3XfpG3F+20rNBawH1ycsCTVD/08/n31d2m3CrKAsbW7er92ek6w4fzKr7NW8WeXjrPJETVpw5fQg1Od3pRGW8dPQaJcvKQEogMp8Mm0ETYd0qigg89/giBz7QwOgmAWQ4dH+DfZH4Ojl//127QztBolMvyDMQBykWrtJoGcij05sT6K2IJr2FHeUBO12MAEdjiVvhQj3DtTzjPiZAHHDBSLWxLKWWhlhHE4pq7g1MQhqXkaAHI2BLNzwLmaowbMT0bECf9yfz6xx18h6XPQFX44oOktraobVALFlyHqeKa8zdcUt22LF6uAL1m5dxL0tny3eXCIPE4UH/RZgua/cHV9G3cUvKQa/QnFSLRhvWVSbGB+7YsHouBJcsUOOW1gmd5442XuC7mpppccRldh+GSxUk6TBJRAx7TeQ0ybDUaoco9MUqp2twv3KreR2+8Q12PDaAhfQVNEGdF3wTm1sShImjCN4VN3eSLlBEbve1QRQXM=
skip_cleanup: true
file_glob: true
file:
- ../*.deb
on:
repo: solvespace/solvespace
tags: true
condition: "$TRAVIS_OS_NAME == linux"
- provider: releases
api_key:
secure: dDlkIawHcODlW9B/20/cQCtzeoocvs0hKuNngRKXKqzXLWTRq33oq/B7+39tAixWbmv6exTpijiKrRNFiSCW5Z4iwHLwaRD4XJznxw63e/Hus/dxg2Tvqx7XFpkCz8mT1Z+gZQE5YxAngeZPpI/sZbZtF1UO3yH5eLeeokZ15p26ZskQUPoYuzrTgTzYL3XfpG3F+20rNBawH1ycsCTVD/08/n31d2m3CrKAsbW7er92ek6w4fzKr7NW8WeXjrPJETVpw5fQg1Od3pRGW8dPQaJcvKQEogMp8Mm0ETYd0qigg89/giBz7QwOgmAWQ4dH+DfZH4Ojl//127QztBolMvyDMQBykWrtJoGcij05sT6K2IJr2FHeUBO12MAEdjiVvhQj3DtTzjPiZAHHDBSLWxLKWWhlhHE4pq7g1MQhqXkaAHI2BLNzwLmaowbMT0bECf9yfz6xx18h6XPQFX44oOktraobVALFlyHqeKa8zdcUt22LF6uAL1m5dxL0tny3eXCIPE4UH/RZgua/cHV9G3cUvKQa/QnFSLRhvWVSbGB+7YsHouBJcsUOOW1gmd5442XuC7mpppccRldh+GSxUk6TBJRAx7TeQ0ybDUaoco9MUqp2twv3KreR2+8Q12PDaAhfQVNEGdF3wTm1sShImjCN4VN3eSLlBEbve1QRQXM=
skip_cleanup: true
file: build/solvespace.dmg
on:
repo: solvespace/solvespace
tags: true
condition: "$TRAVIS_OS_NAME == osx"
# Releases to whitequark/solvespace (to be removed)
- provider: releases - provider: releases
api_key: api_key:
secure: DA3tW0My37vbi2t3dZ061281Xm8KSIkeLdFZsQISrut0g1kkbWuBTPxAfvE3B6OE8p47wAclE/wxA1+obMTVkY0oYpd5u+JelYNHxU/oL8Ww0xdUANwKNJ1JD2EZP8nSz7JSvxuGILC6AFPoTjawsG97SXwiTyp7z0PA6nvzraE= secure: DA3tW0My37vbi2t3dZ061281Xm8KSIkeLdFZsQISrut0g1kkbWuBTPxAfvE3B6OE8p47wAclE/wxA1+obMTVkY0oYpd5u+JelYNHxU/oL8Ww0xdUANwKNJ1JD2EZP8nSz7JSvxuGILC6AFPoTjawsG97SXwiTyp7z0PA6nvzraE=

View File

@ -1,7 +1,8 @@
SolveSpace SolveSpace
========== ==========
This repository contains the official repository of [SolveSpace][]. This repository contains the source code of [SolveSpace][], a parametric
2d/3d CAD.
[solvespace]: http://solvespace.com [solvespace]: http://solvespace.com
@ -13,7 +14,7 @@ Installation
Binary packages for Mac OS X and Debian derivatives are available Binary packages for Mac OS X and Debian derivatives are available
via [GitHub releases][rel]. via [GitHub releases][rel].
[rel]: https://github.com/whitequark/solvespace/releases [rel]: https://github.com/solvespace/solvespace/releases
### Other systems ### Other systems
@ -38,8 +39,8 @@ Before building, check out the necessary submodules:
After that, build SolveSpace as following: After that, build SolveSpace as following:
mkdir cbuild mkdir build
cd cbuild cd build
cmake .. cmake ..
make make
sudo make install sudo make install
@ -60,19 +61,19 @@ Before building, check out the necessary submodules:
After that, build 32-bit SolveSpace as following: After that, build 32-bit SolveSpace as following:
mkdir cbuild mkdir build
cd cbuild cd build
cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw32.cmake .. cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw32.cmake ..
make solvespace make solvespace
Or, build 64-bit SolveSpace as following: Or, build 64-bit SolveSpace as following:
mkdir cbuild mkdir build
cd cbuild cd build
cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw64.cmake .. cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw64.cmake ..
make solvespace make solvespace
The application is built as `cbuild/src/solvespace.exe`. The application is built as `build/src/solvespace.exe`.
Space Navigator support will not be available. Space Navigator support will not be available.
@ -92,12 +93,12 @@ Before building, check out the necessary submodules:
After that, build SolveSpace as following: After that, build SolveSpace as following:
mkdir cbuild mkdir build
cd cbuild cd build
cmake .. cmake ..
make make
The app bundle is built in `cbuild/src/solvespace.app`. The app bundle is built in `build/src/solvespace.app`.
[homebrew]: http://brew.sh/ [homebrew]: http://brew.sh/

View File

@ -19,6 +19,15 @@ artifacts:
- path: build\src\RelWithDebInfo\solvespace.pdb - path: build\src\RelWithDebInfo\solvespace.pdb
name: solvespace.pdb name: solvespace.pdb
deploy: deploy:
# Releases to solvespace/solvespace
- provider: GitHub
auth_token:
secure: P9/pf2nM+jlWKe7pCjMp41HycBNP/+5AsmE/TETrDUoBOa/9WFHelqdVFrbRn9IC
description: ""
artifact: solvespace.exe
on:
appveyor_repo_tag: true
# Releases to whitequark/solvespace (to be removed)
- provider: GitHub - provider: GitHub
auth_token: auth_token:
secure: Flqxu1cz6PyxVT1wzTP4bSrQOY8wFrO7pJxYxvjEkLqIUU4dsDQrs2rac/A9deet secure: Flqxu1cz6PyxVT1wzTP4bSrQOY8wFrO7pJxYxvjEkLqIUU4dsDQrs2rac/A9deet