From 7342ff7cf93edfbe80c559a6128fbafaddbf93b5 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Thu, 18 Apr 2013 23:42:09 -0300 Subject: Update README.md diff --git a/README.md b/README.md index c2acded..d7560de 100644 --- a/README.md +++ b/README.md @@ -108,8 +108,7 @@ This will download the latest sources into a directory named 'openscad'. To pull the MCAD library (http://reprap.org/wiki/MCAD), do the following: cd openscad - git submodule init - git submodule update + git submodule update --init ### Building for Mac OS X -- cgit v0.10.1 From eb60b5f9377b71115741d9632f9b62f77c441dbc Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Fri, 19 Apr 2013 15:57:11 -0400 Subject: Tag search failures as warnings diff --git a/src/func.cc b/src/func.cc index 791e957..26d7e69 100644 --- a/src/func.cc +++ b/src/func.cc @@ -449,7 +449,7 @@ Value builtin_search(const Context *, const std::vector&, const std if (num_returns_per_match > 1 && matchCount >= num_returns_per_match) break; } } - if (matchCount == 0) PRINTB(" search term not found: \"%s\"", findThis.toString()[i]); + if (matchCount == 0) PRINTB(" WARNING: search term not found: \"%s\"", findThis.toString()[i]); if (num_returns_per_match == 0 || num_returns_per_match > 1) { returnvec.push_back(Value(resultvec)); } @@ -478,10 +478,10 @@ Value builtin_search(const Context *, const std::vector&, const std } if (num_returns_per_match == 1 && matchCount == 0) { if (findThis.toVector()[i].type() == Value::NUMBER) { - PRINTB(" search term not found: %s",findThis.toVector()[i].toDouble()); + PRINTB(" WARNING: search term not found: %s",findThis.toVector()[i].toDouble()); } else if (findThis.toVector()[i].type() == Value::STRING) { - PRINTB(" search term not found: \"%s\"",findThis.toVector()[i].toString()); + PRINTB(" WARNING: search term not found: \"%s\"",findThis.toVector()[i].toString()); } returnvec.push_back(Value(resultvec)); } @@ -490,7 +490,7 @@ Value builtin_search(const Context *, const std::vector&, const std } } } else { - PRINTB(" search: none performed on input %s", findThis); + PRINTB(" WARNING: search: none performed on input %s", findThis); return Value(); } return Value(returnvec); diff --git a/tests/regression/echotest/search-tests-expected.txt b/tests/regression/echotest/search-tests-expected.txt index 64df0b6..0269f43 100644 --- a/tests/regression/echotest/search-tests-expected.txt +++ b/tests/regression/echotest/search-tests-expected.txt @@ -1,9 +1,9 @@ - search term not found: "q" - search term not found: 1000 - search term not found: "zzz" - search term not found: "zzz" - search term not found: 500 - search term not found: "" + WARNING: search term not found: "q" + WARNING: search term not found: 1000 + WARNING: search term not found: "zzz" + WARNING: search term not found: "zzz" + WARNING: search term not found: 500 + WARNING: search term not found: "" ECHO: "Characters in string (\"a\"): [0]" ECHO: "Characters in string (\"adeq\"): [[0, 5], [3, 8], [4], []]" ECHO: "Default string search (\"abe\"): [0, 1, 8]" -- cgit v0.10.1 From 2e37c07f08af9ae548e0c6e42686ac4f317e89e0 Mon Sep 17 00:00:00 2001 From: don bright Date: Sat, 20 Apr 2013 14:08:04 -0700 Subject: fix eigen2 building bug rept by Roland Hieber diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc index 7c483cb..6ad9e4d 100644 --- a/src/CGALEvaluator.cc +++ b/src/CGALEvaluator.cc @@ -206,9 +206,11 @@ CGAL_Nef_polyhedron CGALEvaluator::applyResize(const CgaladvNode &node) bb = bounding_box( *N.p3 ); } - Eigen::Matrix scale, bbox_size; - scale << 1,1,1; - bbox_size << bb.xmax()-bb.xmin(), bb.ymax()-bb.ymin(), bb.zmax()-bb.zmin(); + std::vector scale, bbox_size; + for (int i=0;i<3;i++) scale.push_back( NT(1) ); + bbox_size.push_back( bb.xmax()-bb.xmin() ); + bbox_size.push_back( bb.ymax()-bb.ymin() ); + bbox_size.push_back( bb.zmax()-bb.zmin() ); for (int i=0;i<3;i++) { if (node.newsize[i]) { if (bbox_size[i]==NT(0)) { @@ -220,7 +222,7 @@ CGAL_Nef_polyhedron CGALEvaluator::applyResize(const CgaladvNode &node) } } } - NT autoscale = scale.maxCoeff(); + NT autoscale = std::max( scale[0], std::max( scale[1], scale[2] )); for (int i=0;i<3;i++) { if (node.autosize[i]) scale[i] = autoscale; } -- cgit v0.10.1 From d0bd89e6a0e87a7b9bf454404328af735b4c01d7 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Mon, 22 Apr 2013 13:35:05 -0400 Subject: We cannot target 10.5 while building on Mountain lion due to a compiler/sdk incompatibility. This should fix the build error by selecting 10.6 as a build target. Fixes #335 diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 3687041..2d0aaa4 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -29,6 +29,7 @@ OPTION_LLVM=false OPTION_CLANG=false OPTION_GCC=false DETECTED_LION=false +DETECTED_MOUNTAIN_LION=false export QMAKESPEC=macx-g++ printUsage() @@ -371,11 +372,14 @@ do done OSVERSION=`sw_vers -productVersion | cut -d. -f2` -if [[ $OSVERSION -ge 7 ]]; then - echo "Detected Lion or later" +if [[ $OSVERSION -ge 8 ]]; then + echo "Detected Mountain Lion (10.8) or later" + DETECTED_MOUNTAIN_LION=true +elif [[ $OSVERSION -ge 7 ]]; then + echo "Detected Lion (10.7) or later" DETECTED_LION=true else - echo "Detected Snow Leopard or earlier" + echo "Detected Snow Leopard (10.6) or earlier" fi USING_LLVM=false @@ -411,6 +415,20 @@ elif $USING_CLANG; then export QMAKESPEC=unsupported/macx-clang fi +if $DETECTED_MOUNTAIN_LION; then + echo "Setting build target to 10.6 or later" + MAC_OSX_VERSION_MIN=10.6 +else + echo "Setting build target to 10.5 or later" + MAC_OSX_VERSION_MIN=10.5 +fi + +if $OPTION_32BIT; then + echo "Building combined 32/64-bit binaries" +else + echo "Building 64-bit binaries" +fi + echo "Using basedir:" $BASEDIR mkdir -p $SRCDIR $DEPLOYDIR build_qt 4.8.4 -- cgit v0.10.1 From 8bcb17ddfba83e228b66dad812317b291e8c8fc5 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Mon, 22 Apr 2013 13:48:23 -0400 Subject: Build 32-bit binaries only in deployment mode diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 2d0aaa4..d1b1a63 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -28,6 +28,7 @@ OPTION_32BIT=true OPTION_LLVM=false OPTION_CLANG=false OPTION_GCC=false +OPTION_DEPLOY=false DETECTED_LION=false DETECTED_MOUNTAIN_LION=false export QMAKESPEC=macx-g++ @@ -423,6 +424,12 @@ else MAC_OSX_VERSION_MIN=10.5 fi +if $OPTION_DEPLOY; then + echo "Building deployment version of libraries" +else + OPTION_32BIT=false +fi + if $OPTION_32BIT; then echo "Building combined 32/64-bit binaries" else -- cgit v0.10.1 From f0ee85e17d474ab9119f82ee6f802d4634743b12 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Mon, 22 Apr 2013 15:18:36 -0400 Subject: Better OX version check diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index d1b1a63..f3fbc2b 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -29,8 +29,6 @@ OPTION_LLVM=false OPTION_CLANG=false OPTION_GCC=false OPTION_DEPLOY=false -DETECTED_LION=false -DETECTED_MOUNTAIN_LION=false export QMAKESPEC=macx-g++ printUsage() @@ -372,13 +370,11 @@ do esac done -OSVERSION=`sw_vers -productVersion | cut -d. -f2` -if [[ $OSVERSION -ge 8 ]]; then +OSX_VERSION=`sw_vers -productVersion | cut -d. -f2` +if (( $OSX_VERSION >= 8 )); then echo "Detected Mountain Lion (10.8) or later" - DETECTED_MOUNTAIN_LION=true -elif [[ $OSVERSION -ge 7 ]]; then +elif (( $OSX_VERSION >= 7 )); then echo "Detected Lion (10.7) or later" - DETECTED_LION=true else echo "Detected Snow Leopard (10.6) or earlier" fi @@ -392,7 +388,7 @@ elif $OPTION_GCC; then USING_GCC=true elif $OPTION_CLANG; then USING_CLANG=true -elif $DETECTED_LION; then +elif (( $OSX_VERSION >= 7 )); then USING_GCC=true fi @@ -416,7 +412,7 @@ elif $USING_CLANG; then export QMAKESPEC=unsupported/macx-clang fi -if $DETECTED_MOUNTAIN_LION; then +if (( $OSX_VERSION >= 8 )); then echo "Setting build target to 10.6 or later" MAC_OSX_VERSION_MIN=10.6 else -- cgit v0.10.1