GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-31 10:52:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,209 Commits 65 Branches 55 Tags
Commit Graph

53 Commits

Author SHA1 Message Date
Joseph Lenox
a5df41042f Revert "Put build system back the way it was so we don't break things when merging in cppgui stuff" 
This reverts commit 961dd6b06fba9ce7f2fd46e52db241e256531f4a.
 2018-07-11 22:14:51 -05:00
Joseph Lenox
667af0be2a Put build system back the way it was so we don't break things when merging in cppgui stuff 2018-07-11 22:14:51 -05:00
Joseph Lenox
0facb7dcb2 Update pushed to main travis file. 
Quiet down wxmac install as well.
 2018-07-11 22:14:51 -05:00
Joseph Lenox
093a621187 Make brew louder so that it doesn't trip Travis timeouts. 2018-07-11 22:14:51 -05:00
Joseph Lenox
017e3af98d Issue brew update before install. 2018-07-11 22:14:51 -05:00
Joseph Lenox
d1d75c4c0f ... 2018-07-11 22:14:51 -05:00
Joseph Lenox
6ea42b2aae Fix boost download and travis 2018-07-11 22:14:51 -05:00
Joseph Lenox
a8b51536bd fix bash 2018-07-11 22:14:51 -05:00
Joseph Lenox
1fd6558c66 setting envionment variables via matrix 2018-07-11 22:14:51 -05:00
Joseph Lenox
9bbee7a627 try homebrew 2018-07-11 22:14:51 -05:00
Joseph Lenox
720d4f1571 made download more flexible. 2018-07-11 22:14:51 -05:00
Joseph Lenox
cb07da66c7 Build wx and cache the build dir instead of the installdir. Also add it to PATH so that wx-config will be found. 2018-07-11 22:14:51 -05:00
Joseph Lenox
49f41e55d4 wrong argument to tar 2018-07-11 22:14:51 -05:00
Joseph Lenox
310301e964 Build wxwidgets on osx if it's not cached. 2018-07-11 22:14:51 -05:00
Joseph Lenox
687a814c11 push CXX and CC to a subscript. 2018-07-11 22:14:51 -05:00
Joseph Lenox
afaf0889e7 Oops, forgot a ] 2018-07-11 22:14:51 -05:00
Joseph Lenox
26f875f161 try to build on both linux and osx with travis 2018-07-11 22:14:51 -05:00
Joseph Lenox
b8c34866f0 fix the startup script to point at the binary. 2018-07-11 22:14:51 -05:00
Joseph Lenox
ef9a0871d1 ripped out most of the perl-dependent stuff from Slic3r's archive build script on Linux (do less useless stuff on Travis). 2018-07-11 22:14:51 -05:00
Joseph Lenox
919345ada4 Tweaks; removing perl deps from travis. 2018-07-11 22:14:51 -05:00
Jacob Greenfield
4fa6251dd5 Pillar config (#4410) 
Implements workaround for #4407 

* Added support for pillar size configuration.
* Pillars UI fix
* Pillar configuration fix
* Fixed misspelled variable name.
* Strings are not numbers.
* Fixed pillar spacing label.
 2018-05-12 20:03:50 -05:00
efa
dc9d7ed70f Now work as startup script from every directory, also if runt from a link in /usr/bin, with spaces, or from a desktop shortcut (#4266) 2018-01-21 16:16:28 -06:00
Joseph Lenox
19ea7a596a
Long retract support in marlin and repetier for FW retract. (#4108) 
* For reprap (really Marlin) or Repetier flavors and a toolchange retract, produce G10 S1 instead of G10.

Also refactored comments (were getting eaten by fw retract)

* Fixed tests to check for correct retract gcode output.

* Better reference to scalar.

* Added config checks for if fw tool retracts are in place and firmware is repetier/marlin, disable the advanced option.

* Disable z lift if firmware retraction is enabled.

* With gcode comments on, indicates which extruder Slic3r thinks it is retracting/unretracting.
 2018-01-08 15:08:30 -06:00
Joseph Lenox
d6469b284a Added --no-gui flag to force CLI usage (allows for CLI usage with AppImage build). 
Forced --gui flag in AppImage build.
 2017-09-02 13:36:20 -05:00
Joseph Lenox
66074f5398 Merge pull request #4110 from probonopd/patch-2 
Fix Version= key
 2017-09-02 10:16:31 -05:00
Joseph Lenox
5da256283d Removed Version (which was improperly used). Fixes #4109 2017-09-02 10:12:57 -05:00
probonopd
eba7d99d53 Fix Version= key 
Closes #4109
 2017-09-02 17:07:44 +02:00
Joseph Lenox
837be65c6c Added libglut.so.3 to install list, also upgraded make_archive.sh to permit bash-style comments 2017-06-22 07:13:50 -05:00
Joseph Lenox
435fa6fb02 Merge pull request #4041 from alexrj/refactor-coreperl 
Refactor out the perl packages into a common file.
 2017-06-21 22:45:25 -05:00
Joseph Lenox
3187f4f181 Removed an unnecessary second call of sftp script, fixed one small error with naming. 2017-06-21 22:35:05 -05:00
Joseph Lenox
4c958d24ee Refactor out the perl packages into a common file. 2017-06-21 22:21:27 -05:00
Joseph Lenox
26becd8b51 Produce AppImage from the leavings of the normal bz2. (#4039) 
* Produce AppImage from the leavings of the normal bz2.
 2017-06-21 22:19:26 -05:00
Joseph Lenox
02b2fdfc00 Add libjbig.so.0 to package list. 2017-05-31 12:37:36 -05:00
Joseph Lenox
6a7057b1eb Wx::AUI is now not stripped from the builds. 
Fixes #3988
 2017-05-30 13:39:51 -05:00
Joseph Lenox
450a918cea Added a couple more WX libs 2017-05-21 11:51:26 -05:00
Joseph Lenox
fec2ea3881 Re-added tiff, jpg, png, lzma libraries 2017-05-21 11:50:12 -05:00
Joseph Lenox
9c506a4497 Remove everything that isn't alien-wxwidgets 2017-05-21 11:42:36 -05:00
Joseph Lenox
72c44bcad6 Linux build (#3973) 
* Point LD_LIBRARY_PATH to correct bin dir.

* remove libm and libresolv from library list because Ubuntu.
 2017-05-21 11:33:24 -05:00
Alessandro Ranellucci
1a788196fa Try to fix LWP not working in packages. #3906 2017-04-29 14:13:14 +02:00
Travis CI User
5f6a12c163 stable-ish libraries for Linux 2017-04-19 02:03:11 +00:00
Joseph Lenox
ab278f03e1 Deploy PRs to branches/ subdir. (#3865) 
* Deploy PRs to branches/ subdir.

* wrong path to util

* added PR number to file name

* check for appveyor pr variable

* also use branches if pushing a branch on windows

* also use branches if pushing a branch on unix

* wrong or operator on powershell
 2017-04-06 20:37:53 -05:00
Joseph Lenox
04b59affce only decrypt if the key is available (#3858) 
* only decrypt if the key is available

* Use script instead of explicit command

* Don't deploy if the keyfile is missing/empty.

* Don't deploy if key is not available.

* Don't decrypt appveyor key if no secret

* wrong name

* Fix the logic and a typo
 2017-04-05 11:27:04 -05:00
Travis CI User
c41510e86b Use wxpar to pull the shared libs to ./shlib/ 2017-04-04 03:58:20 +00:00
Joseph Lenox
bc846d2bda Copy symlinks too properly 2017-04-02 15:44:56 -05:00
Joseph Lenox
23f3df4b1f Moved shell.cpp to ../common, borrowed and modified for FORCE_GUI from @bubnikv 
Changed path in compile_wrapper, made makefile for linux with default paths pointed
at where they would be on Travis.
 2017-04-02 15:34:53 -05:00
Joseph Lenox
c77c524c07 just used completely different processing if WXDIR is used. 2017-04-02 14:37:04 -05:00
Joseph Lenox
6bbf56641e see if wx_dir is set 2017-04-02 14:19:56 -05:00
Joseph Lenox
077ff68b8f moved all build cache priming to @lordofhyphens web server to avoid loading bintray more 2017-04-02 12:07:15 -05:00
Joseph Lenox
ea28afba1d Add WXDIR to library search path for finding wx libs for custom libraries 2017-04-02 11:46:18 -05:00
Joseph Lenox
d325248baf Load precached wxlibs 2017-04-02 09:24:14 -05:00