Merge openscad/master

Author: kevinmehall

README

@@ -34,13 +34,19 @@ To build OpenSCAD, you need some libraries and tools. The version
 numbers in brackets specify the versions which have been used for
 development. Other versions may or may not work as well..
 
-* Qt4 (4.4 - 4.6):
+* Qt4 (4.4 - 4.7):
   http://www.qtsoftware.com/
 
-* CGAL (3.5.x):
+* CGAL (3.6 - 3.7):
   http://www.cgal.org/
 
-* boost (1.35 - 1.41, required by CGAL)
+* GMP (5.0.x):
+  http://www.gmplib.org/
+
+* MPFR (3.0.x):
+  http://www.mpfr.org/
+
+* boost (1.35 - 1.44, required by CGAL)
   http://www.boost.org/
 
 * cmake (2.6.x, required by CGAL)
@@ -49,13 +55,13 @@ development. Other versions may or may not work as well..
 * OpenCSG (1.3.0):
   http://www.opencsg.org/
 
-* GLEW (bundled with OpenCSG)
+* GLEW (1.5.x, also bundled with OpenCSG)
   http://glew.sourceforge.net/
 
 * Eigen2 (2.0.11)
   http://eigen.tuxfamily.org/
 
-* GCC C++ Compiler (4.0, 4.2, 4.3.1):
+* GCC C++ Compiler (4.2, 4.3.1):
   http://gcc.gnu.org/
 
 * Bison (2.4):

RELEASE_NOTES

@@ -1,10 +1,18 @@
+OpenSCAD 20XX.YY
+================
+
 
-OpenSCAD 2010.XX
+OpenSCAD 2011.01
 ================
 
 o Added rands() function
 o Added sign() function
+o Now supports escaping of the following characters in strings: \n, \t, \r, \\, \"
+o Support nested includes
+o Improved parsing of numbers
+o DXF: output LWPOLYLINE instead of just LINE entities
 o Bugfixes: More robust DXF export
+o Some bugs fixed, maybe some new bugs added
 
 OpenSCAD 2010.05
 ================

bison.pri

@@ -0,0 +1,15 @@
+#setup bison for qmake
+bison.name = Bison ${QMAKE_FILE_IN}
+bison.input = BISONSOURCES
+bison.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp
+bison.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN}
+bison.CONFIG += target_predeps
+bison.variable_out = GENERATED_SOURCES
+silent:bison.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands
+QMAKE_EXTRA_COMPILERS += bison
+bison_header.input = BISONSOURCES
+bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.hpp
+bison_header.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN}
+bison_header.CONFIG += target_predeps no_link
+silent:bison_header.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands
+QMAKE_EXTRA_COMPILERS += bison_header

boost.pri

@@ -0,0 +1,11 @@
+boost {
+  isEmpty(DEPLOYDIR) {
+    # Optionally specify location of boost using the
+    # BOOSTDIR env. variable
+    BOOST_DIR = $$(BOOSTDIR)
+    !isEmpty(BOOST_DIR) {
+      INCLUDEPATH += $$BOOST_DIR
+      message("boost location: $$BOOST_DIR")
+    }
+  }
+}

cgal.pri

@@ -12,6 +12,11 @@ cgal {
     }
   }
 
-  LIBS += -lCGAL -lmpfr -lgmp -lboost_thread
+  LIBS += -lCGAL -lmpfr -lboost_thread
+  win32 {
+    LIBS += -lmpir
+  } else {
+    LIBS += -lgmp
+  }
   QMAKE_CXXFLAGS += -frounding-math
 }

doc/TODO.txt

@@ -4,8 +4,9 @@ BUGS
 o Some invalid DXF data gets pass the import checks and breaks the tessing code
 o Tesselation via GLU sometimes produces strange results
 o Export STL: Exports existing CGAL model even though the current model is changed, but not CGAL rendered
-o It's now possible to start a new rendering while one is already running.
+o It's now possible to start a new rendering while one is already running (which call processEvents())
   -> turn off most (or all) interaction while rendering
+  -> Lock all or only one MainWindow (MDI)?
 o Look into the polygon winding and rotate_extrude() problem reported by Britton
 
 STL Import BUGS
@@ -142,6 +143,7 @@ o Language Frontend
   - Rethink for vs. intersection_for vs. group. Should for loops
     generate child lists instead, and make these passable to other
     modules or accessible by child()?
+  - constants: PI, TRUE, FALSE
 o DXF Import/Export
   - Use dxflib from RibbonSoft for import/export? -> investigate
   - Import
@@ -168,6 +170,11 @@ o Grammar
   - import_*() -> *_import() (consistent prefix vs. postfix)
   - linear_extrude()/rotate_extrude(): Cumbersome names? -> (extrude, revolve, lathe, sweep ?) 
 
+IDEAS FOR LANGUAGE CHANGES
+--------------------------
+o More strict checking of module parameters to make e.g. this fail:
+  module test(a,b) { a=1; b=2; echo(a,b,c); } test(c=3);
+
 CODE
 ----
 
@@ -185,6 +192,11 @@ o Consider decoupling DXF-specific functionality from the 2D subsystem
 o Visitation refactoring
   - Make AbstractNode members private/protected?
 
+BUILD SYSTEM
+------------
+o Fedora is reported to ship with byacc, which doesn't support bison extensions (e.g. %debuig). Look into this, either be yacc-compatible or force the build system to use bison.
+o We currently link in -lboost_thread. Should we always use -lboost_thread-mt under Linux or can we pick this up using qmake?
+
 TESTING
 -------
 o Caching and MDI looks suspicious when the code relies on external resources
@@ -208,9 +220,6 @@ MISC
 ----
 o Streamline the cmd-line interface a bit
   - Implicit output file format
-o Mac OS X:
-  - 32-bit compatibility
-    o Build everything including i386 arch
 
 o Write checklists for typical extension work (add new module, add new function)
   -> make sure new test files are added

doc/build-macosx.txt

@@ -0,0 +1,36 @@
+OpenSCAD Release Checklist
+--------------------------
+
+o Update version
+  release-linux.sh
+  publish-macosx.sh
+  FIXME: Windows
+
+o Update RELEASE_NOTES
+
+o Tag release
+  git tag "openscad-2011.01"
+
+o build source package
+  git archive --format=tar openscad-2011.01  --prefix=openscad-2011.01/ | gzip > openscad-2011.01.tar.gz
+
+o build binaries
+  Mac OS X
+  - publish-macosx.sh -> OpenSCAD-2011.01.dmg
+  Linux: FIXME 32 vs. 64 bit
+  - release-linux.sh
+  Windows: FIXME 32 vs. 64 bit
+
+o Set back version: release-linux.sh, publish-macosx.sh, FIXME: Windows
+
+o Upload
+  - Github
+    Upload manually here: https://github.com/openscad/openscad/downloads
+    FIXME: Write a script
+
+  - Google code
+    - Get password from https://code.google.com/hosting/settings
+    ./scripts/googlecode_upload.py -u kintel -w <passwd> -s "OpenSCAD 2011.11 Windows" -p openscad openscad-2011.01.win32.zip
+    ./scripts/googlecode_upload.py -u kintel -w <passwd> -s "OpenSCAD 2011.11 Linux x86" -p openscad openscad-2011.01.linux-x86.tar.gz
+    ./scripts/googlecode_upload.py -u kintel -w <passwd> -s "OpenSCAD 2011.11 Mac OS X" -p openscad openscad-2011.01.dmg
+    ./scripts/googlecode_upload.py -u kintel -w <passwd> -s "OpenSCAD 2011.11 Source code" -p openscad openscad-2011.01.src.tar.gz

doc/release-checklist.txt

@@ -0,0 +1,10 @@
+#setup flex for qmake
+
+flex.name = Flex ${QMAKE_FILE_IN}
+flex.input = FLEXSOURCES
+flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp
+flex.commands = flex -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN}
+flex.CONFIG += target_predeps
+flex.variable_out = GENERATED_SOURCES
+silent:flex.commands = @echo Lex ${QMAKE_FILE_IN} && $$flex.commands
+QMAKE_EXTRA_COMPILERS += flex

flex.pri

@@ -1,12 +1,50 @@
-isEmpty(VERSION) VERSION = $$system(date "+%Y.%m.%d")
+# Auto-include config_<variant>.pri if the VARIANT variable is give on the
+# command-line, e.g. qmake VARIANT=mybuild
+!isEmpty(VARIANT) {
+  message("Variant: $${VARIANT}")
+  exists(config_$${VARIANT}.pri) {
+    message("Including config_$${VARIANT}.pri")
+    include(config_$${VARIANT}.pri)
+  }
+}
+
+win32 {
+  isEmpty(VERSION) VERSION = $$system(date /t)
+} else {
+  isEmpty(VERSION) VERSION = $$system(date "+%Y.%m.%d")
+}
+
+#configure lex / yacc
+win32 {
+  include(flex.pri)
+  include(bison.pri)
+  FLEXSOURCES = src/lexer.l
+  BISONSOURCES = src/parser.y
+} else {
+  LEXSOURCES += src/lexer.l
+  YACCSOURCES += src/parser.y
+}
+
+#configure additional directories
+win32 {
+    INCLUDEPATH += $$(MPIRDIR)
+    INCLUDEPATH += $$(MPFRDIR)
+}
+
 DEFINES += OPENSCAD_VERSION=$$VERSION
 
+win32:DEFINES += _USE_MATH_DEFINES NOMINMAX _CRT_SECURE_NO_WARNINGS
+
+#disable warning about too long decorated names
+win32:QMAKE_CXXFLAGS += -wd4503
+
 python{
 	TEMPLATE = lib
 	SOURCES += src/python.cc
 }else{
 	TEMPLATE = app
 }
+
 RESOURCES = openscad.qrc
 
 OBJECTS_DIR = objects
@@ -51,6 +89,7 @@ macx:CONFIG += mdi
 CONFIG += cgal
 CONFIG += opencsg
 CONFIG += progresswidget
+CONFIG += boost
 
 #Uncomment the following line to enable QCodeEdit
 #CONFIG += qcodeedit
@@ -70,6 +109,7 @@ progresswidget {
 include(cgal.pri)
 include(opencsg.pri)
 include(eigen2.pri)
+include(boost.pri)
 
 # Standard include path for misc external libs
 #macx {
@@ -80,8 +120,6 @@ include(eigen2.pri)
 # QMAKE_CXXFLAGS += -pg
 # QMAKE_LFLAGS   += -pg
 
-LEXSOURCES += src/lexer.l
-YACCSOURCES += src/parser.y
 
 FORMS   += src/MainWindow.ui \
            src/Preferences.ui
@@ -109,7 +147,8 @@ HEADERS += src/CGAL_renderer.h \
            src/printutils.h \
            src/value.h \
            src/progress.h \
-           src/editor.h
+           src/editor.h \
+           src/mathc99.h
 
 SOURCES += src/openscad.cc \
            src/mainwin.cc \
@@ -146,7 +185,8 @@ SOURCES += src/openscad.cc \
            src/nef2dxf.cc \
            src/Preferences.cc \
            src/progress.cc \
-           src/editor.cc
+           src/editor.cc \
+           src/mathc99.cc
 
 macx {
   HEADERS += src/AppleEvents.h \

openscad.pro

@@ -24,7 +24,7 @@ VS_VERSION_INFO VERSIONINFO
 				VALUE "CompanyName", "\0"
 				VALUE "FileDescription", "OpenSCAD Executable\0"
 				VALUE "FileVersion", "development build\0"
-				VALUE "LegalCopyright", "Copyright (C) 2009 Clifford Wolf\0"
+				VALUE "LegalCopyright", "Copyright (C) 2009-2011 Clifford Wolf and Marius Kintel\0"
 				VALUE "OriginalFilename", "openscad.exe\0"
 				VALUE "ProductName", "OpenSCAD\0"
 			END

openscad_win32.rc

@@ -476,7 +476,7 @@ elf_open(const char *filename, int flags, Elf_Ehdr *ehdr)
    if (ehdr->e_phentsize != sizeof(Elf_Phdr))
    {
      fprintf(stderr, "section size was read as %d, not %d!\n",
-            ehdr->e_phentsize, sizeof(Elf_Phdr));
+            ehdr->e_phentsize, (int)sizeof(Elf_Phdr));
      close(fd);
      return -1;
    }