diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
| commit | ca41979ee514f642c506e4f4d81461f19b587bf2 (patch) | |
| tree | f31feb004d0b724d5240c8a227c7f0c886939a1b /doc | |
| parent | eff16283358217b43b310269a72e0cb47357a8b3 (diff) | |
| parent | abc9da96c89b337377ee62ac29ee54e4e7b0a514 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into issue11_2
Conflicts:
RELEASE_NOTES
openscad.pro
src/mainwin.cc
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/checklist-macosx.txt | 20 | ||||
| -rw-r--r-- | doc/release-checklist.txt | 9 |
2 files changed, 7 insertions, 22 deletions
diff --git a/doc/checklist-macosx.txt b/doc/checklist-macosx.txt deleted file mode 100644 index a72a8d3..0000000 --- a/doc/checklist-macosx.txt +++ /dev/null @@ -1,20 +0,0 @@ -NB! This is the Mac OS X deployment checklist. - See build-macosx.txt for how to build a development build of - OpenSCAD for your system only without manually compiling all - dependencies. - -o Macports: - sudo port install cmake ImageMagick - -o Qt4 - - Download and install the combined 32-bit and 64-bit build for 10.5-10.6 from here: - http://qt.nokia.com/downloads/qt-for-open-source-cpp-development-on-mac-os-x - -o Build dependencies from source - - scripts/macosx-build-dependencies.sh - -o Build and Deploy OpenSCAD - -# Update VERSION in publish-macosx.sh - scripts/publish-macosx.sh diff --git a/doc/release-checklist.txt b/doc/release-checklist.txt index c51c919..f5bb759 100644 --- a/doc/release-checklist.txt +++ b/doc/release-checklist.txt @@ -3,9 +3,12 @@ OpenSCAD Release Checklist (See bottom of this file for how to build release binaries) -o Update VERSION environment variable +o Set VERSION and VERSIONDATE environment variable + (VERSIONDATE is new and used to identify releases. VERSION is for humans. + For development builds, set VERSION and VERSIONDATE to the same value) export VERSION=2013.01 + export VERSIONDATE=2013.01.17 It will be used by the commands below, as well as these files: @@ -38,13 +41,15 @@ o Update external resources: - http://en.wikipedia.org/wiki/OpenSCAD o Notify package managers - Ubuntu: https://launchpad.net/~chrysn + - Fedora: Miro Hrončok <miro@hroncok.cz> or <mhroncok@redhat.com> - MacPorts: Build and Upload Release Binaries --------------------------------- -$ export VERSION=<openscad version, e.g. 2013.01> +$ export VERSIONDATE=<date of release in YYYY.MM.DD format, e.g. 2013.01.17> +$ export VERSION=<openscad version, e.g. 2013.01> # If development snapshot, you don't need version is the same as VERSIONDATE $ tar xzf openscad-$VERSION.src.tar.gz $ cd openscad-$VERSION |