Ported recent changes to master into the visitor branch

3 files changed, 42 insertions, 43 deletions

diff --git a/doc/TODO.txt b/doc/TODO.txt
index 0e1576a..1d29fb1 100644
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -71,12 +71,16 @@ o 3D View
   - Improve mouse rotation
   - Add modifier key combos to handle pan and zoom on 1 mouse button systems
   - Show grid
+  - Measurement ticks on the axes that look like rulers that one can turn off and on.
   - 4 x split view w/orthogonal cameras?
   - Quick highlighting of object under the cursor in the editor
   - View All
+  - Allow specifying viewpoint in the scad file
   - overlay indicator displaying current view mode
   - OpenCSG rendering: Coincident surfaces causes z-buffer fighting. Is this somehow
     avoidable tuning the depth tests in OpenCSG? 
+  - Use OpenGL picking to facilitate ray-tracing like features like measuring
+    thicknesses, distances, slot thicknesses etc.
 o Editor wishlist
   - More infrastructure for external editor (allow communication from the outside)
   - Preferences GUI for the features below
@@ -134,11 +138,11 @@ o Language Frontend
     the "Flex & Bison" O'Reilly book, "Start States and Nested Input
     Files", page 28, for an example.
   - Allow local variables and functions everywhere (not only on module level)
-  - allow 0/1 f/t FALSE/TRUE as boolean values
-  - allow any expression to be evaluated as boolean (e.g. 1 = true, 0 = false)
+  - allow any expression to be evaluated as boolean (!0 = true, 0 = false)
   - 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
 o DXF Import/Export
   - Use dxflib from RibbonSoft for import/export? -> investigate
   - Import
diff --git a/doc/build-macosx.txt b/doc/build-macosx.txt
deleted file mode 100644
index 71750b8..0000000
--- a/doc/build-macosx.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-o Prerequisites (MacPorts):
-  - NB! CGAL requires gcc >= 4.2 (This is default in 10.6 Snow Leopard)
-  - eigen
-  - boost
-  - gmp
-  - mpfr
-  - cmake
-  - qt4-mac-devel
-  - glew
-
-o An important note about paths: 
-  You can choose where to put the libs you build yourself as long as
-  this is reflected in the environment variables as specified under
-  'Build OpenSCAD'.
-
-o Build CGAL >= 3.5
-
-  tar xzf CGAL-3.6.tar.gz
-  cd CGAL-3.6
-  cmake -DCMAKE_INSTALL_PREFIX=$PWD/../install/CGAL-3.6 -DBUILD_SHARED_LIBS=FALSE
-  make -j4
-  make install
-
-o Patch OpenCSG >= 1.3.0
-
-  tar xzf OpenCSG-1.3.0.tar.gz
-  cd OpenCSG-1.3.0
-  patch -p1 < ../openscad/patches/OpenCSG-1.3.0-MacOSX-port.patch
-
-o Build OpenCSG
-
-  qmake -recursive
-  make
-  
-o Build OpenSCAD
-
-  cd openscad
-  export OPENCSGDIR=$PWD/../OpenCSG-1.3.0
-  export CGALDIR=$PWD/../install/CGAL-3.6
-  qmake
-  make
diff --git a/doc/release-checklist.txt b/doc/release-checklist.txt
new file mode 100644
index 0000000..d0e1174
--- /dev/null
+++ b/doc/release-checklist.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