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

154 Commits

Author SHA1 Message Date
Joseph Lenox
5053a52562 add WXVERSION back in 2018-07-11 22:14:51 -05:00
Joseph Lenox
67c65cce94 Use old packaging system instead of new packaging (REVERT THIS LATER) 2018-07-11 22:14:51 -05:00
Joseph Lenox
fa382ebd70 Put build system into a hybrid. 2018-07-11 22:14:51 -05:00
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
Robert Sanchez
ecfc175c41 Added icon files for MacOS (#4376) 
* Added icon files for MacOS
Added icons designed by Akira Yasuda for STL and GCODE files. Modified plist generator to include references to icons and dmg creator to include them.

* Update make_dmg.sh

* Fix tabs/spacing
 2018-04-23 13:11:45 -05:00
Joseph Lenox
eb2a1a6dce Don't abort if no symlink exists. 2018-02-24 21:42:21 -06:00
Joseph Lenox
2d9580edb4 create symlink properly 2018-02-24 19:48:42 -06:00
Joseph Lenox
4e40de6307 Fixed mode of sftp-symlink and extension. 2018-02-24 19:19:57 -06:00
Joseph Lenox
c7e3e7f22c Update travis to create a "latest" symlink. 2018-02-24 19:01:48 -06: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
Alessandro Ranellucci
65e1fe22e0 Restored Storable module in OSX package 2017-06-14 11:32:31 +02:00
Joseph Lenox
2bedc5c9df Link to libstdc++ statically. (#4016) 
* Link to libstdc++ statically.

* use a linker flag instead.

* Update Build.PL

* Link to static paths on Travis only.

* Fix SFTP to abort of SFTP errors.

* Create sftp.sh

* always set -static-libstdc++ now in ldflags

also removed gcc 4.6 workaround

* remove buggy gcc check for 4.7, it is no longer supported

* Remove -lstdc++

Static linking is done on Travis for linux.

* Filter -lstdc++ on linux, static c++
 2017-06-09 08:05:21 -05:00
Joseph Lenox
6c509710ef Oops, syntax error in packaging script. 2017-05-31 23:42:18 -05:00
Joseph Lenox
02b2fdfc00 Add libjbig.so.0 to package list. 2017-05-31 12:37:36 -05:00
Joseph Lenox
8d5fa3e6e2 Clean up unused files from packaged library on Appveyor only. 2017-05-30 15:34:22 -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
8b21cca5af Revised package and wrapper compilation script to make both less fragile. 
compile_wrapper now can be called from anywhere and can accept a path to strawberry perl, perl version, and c++ compiler.


package_win32.ps1 can now be run from anywhere (puts its output in Slic3r root dir still), automatically detects 64bit/32bit and has more overrides. It will also call compiler_wrapper if the wrapper execs do not exist.
 2017-05-30 13:06:14 -05:00
Joseph Lenox
c837a060df Remove AUI from cleaning 
060187ad1703f70c8e2c2847829216c38e889403 uses it now
 2017-05-30 10:04:29 -05:00
Joseph Lenox
02ef5e90ce moved package creation back to build script from deploy 2017-05-30 07:14:54 -05:00
Joseph Lenox
7aff8267da Forgot to revert mkdir 2017-05-29 23:51:05 -05:00