GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-09-24 10:13:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into adaptive-slicing-spline

Browse Source
This commit is contained in:
Florens Wasserfall 2017-03-07 16:36:31 +01:00
commit 09149760bb
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package/deploy-bintray.sh
View File

@ -30,7 +30,15 @@ if [ -z ${current_branch+x} ]; then
current_branch="unknown" current_branch="unknown"
fi fi
if [ "$current_branch" == "master" ] && [ "$APPVEYOR_PULL_REQUEST_NUMBER" == "" ]; then if [ ! -z ${GITHUB_PR_NUMBER+x} ]; then
PR_ID=$GITHUB_PR_NUMBER
fi
if [ ! -z ${APPVEYOR_PULL_REQUEST_NUMBER+x} ]; then
PR_ID=$APPVEYOR_PULL_REQUEST_NUMBER
fi
if [ "$current_branch" == "master" ] && [ -z ${PR_ID} ]; then
# If building master, goes in slic3r_dev or slic3r, depending on whether or not this is a tagged build # If building master, goes in slic3r_dev or slic3r, depending on whether or not this is a tagged build
if [ -z ${TAGGED+x} ]; then if [ -z ${TAGGED+x} ]; then
SLIC3R_PKG=slic3r_dev SLIC3R_PKG=slic3r_dev
@ -40,8 +48,9 @@ if [ "$current_branch" == "master" ] && [ "$APPVEYOR_PULL_REQUEST_NUMBER" == ""
version=$SLIC3R_BUILD_ID version=$SLIC3R_BUILD_ID
else else
# If building a branch, put the package somewhere else. # If building a branch, put the package somewhere else.
echo "Delploying pull request $PR_ID"
SLIC3R_PKG=Slic3r_Branches SLIC3R_PKG=Slic3r_Branches
version=$SLIC3R_BUILD_ID-$current_branch version=${SLIC3R_BUILD_ID}-PR${PR_ID}
fi fi
file=$1 file=$1
@ -56,5 +65,5 @@ echo "Publishing ${file} to ${version}..."
curl -H "X-Bintray-Package: $SLIC3R_PKG" -H "X-Bintray-Version: $version" -H 'X-Bintray-Publish: 1' -H 'X-Bintray-Override: 1' -T $file -u${USER}:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/$(basename $1) curl -H "X-Bintray-Package: $SLIC3R_PKG" -H "X-Bintray-Version: $version" -H 'X-Bintray-Publish: 1' -H 'X-Bintray-Override: 1' -T $file -u${USER}:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/$(basename $1)
#curl -X POST -u${USER}:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/${SLIC3R_PKG}/$version/publish #curl -X POST -u${USER}:${API} https://api.bintray.com/content/lordofhyphens/Slic3r/${SLIC3R_PKG}/$version/publish
# Wait 5s for the server to catch up # Wait 5s for the server to catch up
sleep 5 #sleep 5
curl -H 'Content-Type: application/json' -X PUT -d "{ \"list_in_downloads\":true }" -u${USER}:${API} https://api.bintray.com/file_metadata/lordofhyphens/Slic3r/$(basename $1) #curl -H 'Content-Type: application/json' -X PUT -d "{ \"list_in_downloads\":true }" -u${USER}:${API} https://api.bintray.com/file_metadata/lordofhyphens/Slic3r/$(basename $1)

1
xs/src/libslic3r/Fill/FillRectilinear.cpp
View File

@ -1,4 +1,3 @@
#undef NDEBUG
#include "../ClipperUtils.hpp" #include "../ClipperUtils.hpp"
#include "../ExPolygon.hpp" #include "../ExPolygon.hpp"
#include "../PolylineCollection.hpp" #include "../PolylineCollection.hpp"