diff options
| -rw-r--r-- | doc/TODO.txt | 8 | ||||
| -rw-r--r-- | doc/release-checklist.txt | 36 | ||||
| -rw-r--r-- | openscad.pro | 10 | ||||
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 4 | ||||
| -rwxr-xr-x | scripts/macosx-sanity-check.py | 14 | ||||
| -rw-r--r-- | src/dxfdim.cc | 2 |
6 files changed, 66 insertions, 8 deletions
diff --git a/doc/TODO.txt b/doc/TODO.txt index a053b58..cca4a2a 100644 --- a/doc/TODO.txt +++ b/doc/TODO.txt @@ -75,12 +75,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 @@ -138,11 +142,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/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 diff --git a/openscad.pro b/openscad.pro index e81cb36..5b3a398 100644 --- a/openscad.pro +++ b/openscad.pro @@ -1,3 +1,13 @@ +# 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 { diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index ef4653c..e06a8ac 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -158,7 +158,7 @@ echo "Using basedir:" $BASEDIR mkdir -p $SRCDIR $DEPLOYDIR build_gmp 5.0.1 build_mpfr 3.0.0 -build_boost 1.44.0 +build_boost 1.46.1 build_cgal 3.7 -build_glew 1.5.6 +build_glew 1.5.8 build_opencsg 1.3.0 diff --git a/scripts/macosx-sanity-check.py b/scripts/macosx-sanity-check.py index 243020f..3938d74 100755 --- a/scripts/macosx-sanity-check.py +++ b/scripts/macosx-sanity-check.py @@ -9,6 +9,9 @@ # # Author: Marius Kintel <marius@kintel.net> # +# This script lives here: +# https://github.com/kintel/MacOSX-tools +# import sys import os @@ -49,9 +52,14 @@ def lookup_library(file): def find_dependencies(file): libs = [] - p = subprocess.Popen(["otool", "-L", file], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - output = p.communicate()[0] - if p.returncode != 0: return None + args = ["otool", "-L", file] + if DEBUG: print "Executing " + " ".join(args) + p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + output,err = p.communicate() + if p.returncode != 0: + print "Failed with return code " + str(p.returncode) + ":" + print err + return None deps = output.split('\n') for dep in deps: # print dep diff --git a/src/dxfdim.cc b/src/dxfdim.cc index 060691b..4c53d86 100644 --- a/src/dxfdim.cc +++ b/src/dxfdim.cc @@ -34,7 +34,7 @@ #include "mathc99.h" #include <QHash> -#include <QDatetime> +#include <QDateTime> #include <QFileInfo> QHash<QString,Value> dxf_dim_cache; |