vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity
4,872 Commits
29 Branches
9 Tags
31 MiB
Commit Graph

603 Commits (310ca16c1bc2dfc24aebfc7b46a8301ba7911c22)

Author SHA1 Message Date
Marius Kintel 138d5bc57e Merge remote-tracking branch 'origin/master' into scintillaeditor 
Conflicts:
	src/MainWindow.h
	src/Preferences.ui
	src/mainwin.cc
 2014-08-22 12:59:10 -04:00
Marius Kintel 8a9e0daa01 minor debug output fixes 2014-08-22 11:48:10 -04:00
Marius Kintel c5050b03b7 fontconfig check by Don Bright 2014-08-13 23:32:27 -04:00
Marius Kintel 080c9ea193 Merge remote-tracking branch 'origin/master' into scintillaeditor 
Conflicts:
	scripts/macosx-build-dependencies.sh
 2014-08-09 22:27:40 -05:00
Torsten Paul 475bf8a90f Update MacOS X dependency build. 
- use $NUMCPU for parallel build
- don't always rebuild libs when already installed
- switch to Qt 5.3.1 and disable most modules
- switch to eigen 3.2.1
- fix build order for ragel (needed by harfbuzz build)
 2014-08-03 14:37:46 +02:00
Marius Kintel fbe08862ca #879 change install name. qtmacdeploy requires a full install name path 2014-07-22 17:09:59 -04:00
Marius Kintel 74ec208581 QScintilla build script for Mac 2014-07-17 15:11:33 -04:00
Marius Kintel 9d09e6475e Disable failing test on Ubuntu 12.04 Gallium drivers 2014-06-14 16:27:37 -04:00
don bright 78803bfe10 builder.sh use master as default branch 2014-06-02 18:02:34 -07:00
don bright 1ee5f18794 change gettext detection (libintl is part of gnu libc not gettext?) 2014-06-02 17:38:24 -07:00
don bright 958345a0a5 change gettext detection (libintl is part of gnu libc not gettext). also 
disable native java in gettext. disable redundant glib build.
 2014-06-02 17:15:19 -07:00
don bright 19d3ba0d96 change gettext-tarball-existance test to use .gz not .xz, since the 
download/unpack use gz (and gz is more portable than xz)
 2014-06-02 16:14:13 -07:00
don bright eb45f9bc36 more documentation of scripts. disable java for gettext. disable docs for fontconfig 2014-06-02 16:12:54 -07:00
Marius Kintel 1d5ff65e04 freetype and harfbuzz build fixes, updated gettext, ffi, glib, harfbuzz 2014-05-29 01:19:12 -04:00
Marius Kintel c73dfa6e8e Updated to Qt-5.3.0 and CGAL-4.4 2014-05-29 00:22:59 -04:00
Marius Kintel a633c9c650 #567 Exclude the last remaining test until improved GL drivers can be used on Travis VMs 2014-05-28 20:49:27 -04:00
Marius Kintel 6ed870b53a Change order of dependency builds to avoid picking up the wrong dependency 2014-05-22 21:55:22 -04:00
Torsten Paul c64360d372 Merge branch 'master' into text-module 
Conflicts:
	tests/CMakeLists.txt
 2014-05-20 21:36:51 +02:00
Torsten Paul 34ebcb1a43 Fix handling of examples folder (fixes #795). 2014-05-18 19:40:33 +02:00
Marius Kintel ca765dd688 #252 Downgrade to Qt-5.2.0 for Mac 2014-05-12 13:32:50 -04:00
Marius Kintel 6ec9934365 bugfix: missing slash in download link 2014-05-06 01:10:27 -04:00
Marius Kintel 11ef366601 Make Mac dependencies work on 10.7+. This causes some weird artifacts. See #633 2014-04-27 01:02:18 -04:00
Don Bright 9be9d1513d build linux snapshot with QT5 by default 2014-04-26 23:48:18 -05:00
Don Bright eda854d54c default to qt5 for MXE cross build for Win 2014-04-26 22:56:51 -05:00
Don Bright d32956a942 remove /opt/qt5 hack in setenv script. (distros have their own way to specify) 2014-04-26 22:46:08 -05:00
Marius Kintel 2cba2a1b55 Merge branch 'master' into text-module 
Conflicts:
	scripts/macosx-build-homebrew.sh
	scripts/mingw-x-build-dependencies.sh
	scripts/uni-build-dependencies.sh
	scripts/uni-get-dependencies.sh
	src/GeometryEvaluator.h
	src/MainWindow.ui
	src/clipper-utils.h
	src/mainwin.cc
	tests/CMakeLists.txt
 2014-04-26 22:08:31 -04:00
Marius Kintel 05e1dd7df4 #252 Use Qt5 as default for Mac snapshots 2014-04-25 02:00:06 -04:00
Don Bright b5974b5da0 NetBSD build fixes 2014-04-22 17:00:38 +00:00
Don Bright 355aac26e3 fix datecode bug 2014-04-11 08:37:28 -05:00
Don Bright ea4a10c027 fix bugs in date code setting. fix bug with crlf conversion 2014-04-07 16:36:31 -05:00
Don Bright b25f744b25 bugfix - cd out of website path before rebuilding on loop 2014-04-04 20:10:08 -05:00
Don Bright f1f7b1a665 fix bash bug when using awk to convert lf to crlf 2014-04-03 17:08:28 -05:00
Don Bright 58017aeb08 put 'tests' in name of OpenSCAD Tests on Windows. clean up some bad scripting 2014-04-02 03:10:26 -05:00
Don Bright 24e029c76f convert text files from lf to crlf for windows test build 2014-04-02 01:14:35 -05:00
Don Bright 214870062b add WinReadme.txt to Windows(TM) test suite package to prevent confusion 2014-04-01 21:52:09 -05:00
Marius Kintel 53aaa044d7 Merge branch 'unstable' of github.com:openscad/openscad into unstable 2014-04-01 23:14:43 +02:00
Marius Kintel cba064e739 Upload to www/snapshots 2014-04-01 23:14:39 +02:00
Don Bright 1931cdacde fix too-slow upload rate limit 2014-03-31 22:14:48 -05:00
Don Bright b7f7487727 dont build GUI twice!!!! 2014-03-31 20:27:51 -05:00
Don Bright 6ce1809828 upload to www/snapshots/ directory 2014-03-31 19:46:42 -05:00
Don Bright 34358c8725 properly remove old github.openscad.com code before update 2014-03-30 18:48:25 -05:00
Marius Kintel 66b752f95a Merge branch 'master' into unstable 
Conflicts:
	README.md
	scripts/uni-build-dependencies.sh
	scripts/uni-get-dependencies.sh
 2014-03-30 23:32:48 +02:00
Don Bright 4e9275f6f0 add test suite to windows(TM) build 2014-03-30 16:24:20 -05:00
Don Bright 2b1ab8e1ed better indicate in report if all tests pass. add 'doc' to test bundle. 2014-03-30 14:57:30 -05:00
Don Bright c3a3710cb4 Merge branch 'unstable' of github.com:openscad/openscad into unstable 2014-03-30 13:07:42 -05:00
Don Bright 97ebae9f78 polish up so its easier to run under Windows(TM) 2014-03-30 12:23:58 -05:00
Marius Kintel 0507d3864f Merge branch 'unstable' of github.com:openscad/openscad into unstable 
Conflicts:
	README.md
	scripts/builder.sh
 2014-03-30 18:30:02 +02:00
Don Bright 90c549ad0a fix the use of imagemagick convert during cross-built tests. 2014-03-29 13:14:41 -05:00
Tim V. Shaporev 80f8b850be add quotes to line 80 to prevent diagnostics 2014-03-29 11:37:34 +04:00
Don Bright 53a0f9c4cf MXE cross build of tests: polish the scripts, introduce conversion script 
for CTest
 2014-03-28 22:55:37 -05:00
Don Bright 80b226bbe4 add Tests build for mxe/mingw to release-common. make GLIB2 better for crossbuild 2014-03-28 16:23:23 -05:00
Don Bright 37b0ad1ec9 enable qt5 mxe mingw cross build 2014-03-28 12:36:14 -05:00
Don Bright e6a33b3b2b build qt5 in addition to qt4 under MXE cross build 2014-03-28 12:30:45 -05:00
Don Bright 0d9b20dc14 Merge branch 'unstable' of github.com:openscad/openscad into unstable 
Conflicts:
	scripts/builder.sh
 2014-03-27 18:30:09 -05:00
Don Bright 41c7e72ca8 no longer suggest the 'time saver' cgal/opencsg dep build, to avoid confusion 
with outdated cgal versions on systems.
 2014-03-27 18:28:40 -05:00
Don Bright 49d32100df fix eigen3 find bug 2014-03-27 18:23:07 -05:00
Don Bright 45ef0c9a6e remove eigen2 checks per patch from @fcbsd to master branch 2014-03-27 18:18:38 -05:00
Don Bright 819c74d8ab rate limit scp upload 2014-03-27 18:16:41 -05:00
Don Bright a040be29e6 loop - improve sleep code 2014-03-27 18:14:06 -05:00
Don Bright f80fc6c78b fix loop bug 2014-03-25 22:10:04 -05:00
Don Bright 74b0cb5127 enable looping 2014-03-25 22:01:31 -05:00
Don Bright 46c0a8520d exit if missing nsis. do git fetch/git pull if openscad already checked out. 2014-03-25 16:49:38 -05:00
Don Bright fc665d0b3a check for nsis at beginning of builder.sh not in the middle 2014-03-24 22:14:26 -05:00
Don Bright d23a4664b1 Merge branch 'unstable' of github.com:openscad/openscad into unstable 2014-03-23 21:54:06 -05:00
Don Bright c950358b86 better ssh auth sock handling 2014-03-23 21:53:38 -05:00
Don Bright 1473cf41ac fix cmake version detection 2014-03-23 20:28:26 -05:00
Don Bright d3d1fc72da Merge branch 'unstable' of github.com:openscad/openscad into unstable 
Conflicts:
	scripts/uni-build-dependencies.sh
 2014-03-23 20:26:59 -05:00
don bright 36eb6758b0 tweak pkg-config detection. also fix weird gcc4.5 problem w NefPoly 2014-03-24 01:33:52 +01:00
don bright 3d35e5ec74 make glib2 work on debian 6 (build libffi, build pkg-config) 2014-03-24 01:17:43 +01:00
don bright 237dee86fb fix build by requiring newer cmake for string(FIND function) in tests/ build 2014-03-24 00:27:09 +01:00
Don Bright 3bdd28ec2b fix broken mxe dependency build 2014-03-23 13:13:40 -05:00
Don Bright 6d7db87b8e checkout stable branch of MXE in mingw-x-build-deps (match builder.sh) 2014-03-22 01:39:23 -05:00
Don Bright 87d553d134 .static not in stable branch of mxe yet, revert prev. commit 2014-03-22 01:36:09 -05:00
Don Bright 6fdd4e2041 do not build glib2 or gettext by default, assume most systems will have 2014-03-21 23:46:30 -05:00
Don Bright 6cb5f11f2e fix glib2 build for mingw. update mxe target to '.static' 2014-03-21 23:45:29 -05:00
Don Bright e32a3ff053 remove pythong paramiko from deps list 2014-03-21 22:56:18 -05:00
Don Bright d9220a25b3 dont always build glib2 in uni-build-deps, fix mingw issues + build on systems 
that already have glib2
 2014-03-19 20:49:15 -05:00
Don Bright 8955a66153 do not build gettext or glib2 by default. fix glib2.pri to find system version. 
fix spaces.
 2014-03-14 22:19:45 +02:00
Marius Kintel d6d55c32e5 github wants https 2014-03-06 01:04:31 -05:00
Marius Kintel 9d63d2d4c8 Enable all tests 2014-03-05 22:18:16 -05:00
Marius Kintel 875cbcceaf Experiment with travis and encoded ssh keys 2014-03-05 20:37:05 -05:00
Marius Kintel e54d0cca6e Moved MACOSX_DEPLOYMENT_TARGET to the deploy script to allow building against the current system 2014-03-03 21:32:52 -05:00
Marius Kintel 341571ce52 Manage releases on github, use markdown for release notes 2014-02-25 02:05:21 -05:00
Don Bright 776df9fc0e update release-common.sh calls to use 'snapshot', add 'release' stub 2014-02-24 18:24:39 -06:00
Marius Kintel 3ac8895d7a Enable experimental features only for snapshot builds 2014-02-23 15:47:26 -05:00
Marius Kintel 6867c50003 Added fixme for release builds 2014-02-22 11:29:43 -05:00
Don Bright 838e80ae34 refactor + rehighlight only if we are no doing a reload (issue #406) 2014-02-17 13:19:42 -06:00
Marius Kintel 93cdb34d8b Use homebrew-built libraries, use actual # of CPUs 2014-02-06 18:55:14 -05:00
Marius Kintel c7530012be Build qt5 2014-02-04 01:21:13 -05:00
Marius Kintel 256a52d9c6 Added libs needed for text() module. Added support for MACOSX_DEPLOYMENT_TARGET 2014-02-03 20:18:50 -05:00
Marius Kintel b92e5aac92 Validate deployment target 2014-02-03 20:18:06 -05:00
Torsten Paul 5dc7fd2a2b Add fonts to MacOS installer. 2014-02-02 18:01:09 -05:00
Torsten Paul 9c484f2091 Add libffi to MacOS build. 2014-02-02 18:01:09 -05:00
Torsten Paul 395a87047b Add fonts to release build and Windows installer. 2014-02-02 18:01:09 -05:00
Torsten Paul a00d4787ab Fix compilation in MinGW environment. 2014-02-02 18:01:09 -05:00
Torsten Paul 6c9d11248a Add gtk-doc-tools providing gtkdocize (needed for building harfbuzz). 2014-02-02 18:01:09 -05:00
Torsten Paul b5755b6aa0 Add libxml2 to MacOS X build. 2014-02-02 18:01:08 -05:00
Torsten Paul c6d0ad9bf5 Add libxml2 to dependency build script and configure fontconfig to use it. 2014-02-02 18:01:08 -05:00
Torsten Paul 22e91235d4 Show a warning message in case some compile variables are set. 
Currently warning is shown for:
- CFLAGS
- CXXFLAGS
- LDFLAGS
 2014-02-02 18:01:08 -05:00
Torsten Paul 0b6da3dc1e Change sed calls to work on both MacOS X and Linux. 
The syntax for the -i parameter is not compatible, so just write the
modified file temporarily and move it in place after the sed call.
 2014-02-02 18:01:08 -05:00