From 430bb3d7bdc47ff160bc32d558e55ece406734ba Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Tue, 28 May 2013 20:57:23 -0400 Subject: Added note about Qt dependency diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 4df6d0f..870b498 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -44,6 +44,7 @@ Misc: o Build scripts have been further improved o Regression test now creates single monolithic .html file for easier uploading o Regression test auto-starts & stops Xvfb / Xvnc if on headless unix machine +o The backend is finally independent of Qt o Windows: We now have a 64-bit version OpenSCAD 2013.01 -- cgit v0.10.1 From 083763e96a24c25ac5dca97f4a223972b2989a17 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Tue, 28 May 2013 21:15:58 -0400 Subject: updated MCAD diff --git a/libraries/MCAD b/libraries/MCAD index 9af8990..1cc850b 160000 --- a/libraries/MCAD +++ b/libraries/MCAD @@ -1 +1 @@ -Subproject commit 9af89906fa87e2c7fa21f914f00f3fe3879c69f3 +Subproject commit 1cc850b44914e1863adfaea2d6f9c848bbc514ea -- cgit v0.10.1 From 6476048af28f39586af44c4d9c0cb453e7cf74ee Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Wed, 29 May 2013 01:30:01 -0400 Subject: Added info on how to update MCAD diff --git a/doc/release-checklist.txt b/doc/release-checklist.txt index f5bb759..a1cc6ff 100644 --- a/doc/release-checklist.txt +++ b/doc/release-checklist.txt @@ -1,6 +1,19 @@ OpenSCAD Release Checklist -------------------------- +o Pre-release preparations + - Merge MCAD + o In MCAD clone: + $ git fetch upstream + $ git merge upstream/master + $ git push + o In OpenSCAD: + $ cd libraries/MCAD + $ git pull + $ cd ../.. + $ git commit -m "Updated MCAD" + $ git push + (See bottom of this file for how to build release binaries) o Set VERSION and VERSIONDATE environment variable -- cgit v0.10.1 From b46429c5773550a7aa6db1e9a788e09cb64dd349 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Wed, 29 May 2013 01:38:06 -0400 Subject: Updated scripts to match recent website changes in openscad/openscad.github.com#10 diff --git a/scripts/builder.sh b/scripts/builder.sh index 6a143e3..71023da 100755 --- a/scripts/builder.sh +++ b/scripts/builder.sh @@ -176,19 +176,19 @@ update_win_www_download_links() DATECODE=`date +"%Y.%m.%d"` rm win_snapshot_links.js - echo "snapinfo['WIN64_SNAPSHOT1_URL'] = '$BASEURL$WIN64_PACKAGEFILE1'" >> win_snapshot_links.js - echo "snapinfo['WIN64_SNAPSHOT2_URL'] = '$BASEURL$WIN64_PACKAGEFILE2'" >> win_snapshot_links.js - echo "snapinfo['WIN64_SNAPSHOT1_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js - echo "snapinfo['WIN64_SNAPSHOT2_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js - echo "snapinfo['WIN64_SNAPSHOT1_SIZE'] = '$WIN64_PACKAGEFILE1_SIZE'" >> win_snapshot_links.js - echo "snapinfo['WIN64_SNAPSHOT2_SIZE'] = '$WIN64_PACKAGEFILE2_SIZE'" >> win_snapshot_links.js - - echo "snapinfo['WIN32_SNAPSHOT1_URL'] = '$BASEURL$WIN32_PACKAGEFILE1'" >> win_snapshot_links.js - echo "snapinfo['WIN32_SNAPSHOT2_URL'] = '$BASEURL$WIN32_PACKAGEFILE2'" >> win_snapshot_links.js - echo "snapinfo['WIN32_SNAPSHOT1_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js - echo "snapinfo['WIN32_SNAPSHOT2_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js - echo "snapinfo['WIN32_SNAPSHOT1_SIZE'] = '$WIN32_PACKAGEFILE1_SIZE'" >> win_snapshot_links.js - echo "snapinfo['WIN32_SNAPSHOT2_SIZE'] = '$WIN32_PACKAGEFILE2_SIZE'" >> win_snapshot_links.js + echo "fileinfo['WIN64_SNAPSHOT1_URL'] = '$BASEURL$WIN64_PACKAGEFILE1'" >> win_snapshot_links.js + echo "fileinfo['WIN64_SNAPSHOT2_URL'] = '$BASEURL$WIN64_PACKAGEFILE2'" >> win_snapshot_links.js + echo "fileinfo['WIN64_SNAPSHOT1_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js + echo "fileinfo['WIN64_SNAPSHOT2_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js + echo "fileinfo['WIN64_SNAPSHOT1_SIZE'] = '$WIN64_PACKAGEFILE1_SIZE'" >> win_snapshot_links.js + echo "fileinfo['WIN64_SNAPSHOT2_SIZE'] = '$WIN64_PACKAGEFILE2_SIZE'" >> win_snapshot_links.js + + echo "fileinfo['WIN32_SNAPSHOT1_URL'] = '$BASEURL$WIN32_PACKAGEFILE1'" >> win_snapshot_links.js + echo "fileinfo['WIN32_SNAPSHOT2_URL'] = '$BASEURL$WIN32_PACKAGEFILE2'" >> win_snapshot_links.js + echo "fileinfo['WIN32_SNAPSHOT1_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js + echo "fileinfo['WIN32_SNAPSHOT2_NAME'] = 'OpenSCAD $DATECODE'" >> win_snapshot_links.js + echo "fileinfo['WIN32_SNAPSHOT1_SIZE'] = '$WIN32_PACKAGEFILE1_SIZE'" >> win_snapshot_links.js + echo "fileinfo['WIN32_SNAPSHOT2_SIZE'] = '$WIN32_PACKAGEFILE2_SIZE'" >> win_snapshot_links.js echo 'modified win_snapshot_links.js' PAGER=cat git diff diff --git a/scripts/publish-macosx.sh b/scripts/publish-macosx.sh index a3b0090..ed72163 100755 --- a/scripts/publish-macosx.sh +++ b/scripts/publish-macosx.sh @@ -26,9 +26,9 @@ update_www_download_links() if [ -f $webdir/$incfile ]; then cd $webdir - echo "snapinfo['MAC_SNAPSHOT_URL'] = '$BASEURL$packagefile'" > $incfile - echo "snapinfo['MAC_SNAPSHOT_NAME'] = 'OpenSCAD $version'" >> $incfile - echo "snapinfo['MAC_SNAPSHOT_SIZE'] = '$filesize'" >> $incfile + echo "fileinfo['MAC_SNAPSHOT_URL'] = '$BASEURL$packagefile'" > $incfile + echo "fileinfo['MAC_SNAPSHOT_NAME'] = 'OpenSCAD $version'" >> $incfile + echo "fileinfo['MAC_SNAPSHOT_SIZE'] = '$filesize'" >> $incfile echo 'modified mac_snapshot_links.js' git --no-pager diff -- cgit v0.10.1 From 31b234140dba2e919113a521c1b3c2131eea075c Mon Sep 17 00:00:00 2001 From: Don Bright Date: Thu, 30 May 2013 06:02:38 +0200 Subject: improve bison detection diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh index ef8c904..4d5505e 100755 --- a/scripts/check-dependencies.sh +++ b/scripts/check-dependencies.sh @@ -155,8 +155,15 @@ flex_sysver() bison_sysver() { + # bison (GNU Bison) 2.7.12-4996 if [ ! -x $1/bin/bison ]; then return ; fi - bison_sysver_result=`$1/bin/bison --version | grep bison | sed s/"[^0-9.]"/" "/g` + bison_sver=`$1/bin/bison --version | grep bison` + debug bison_sver1: $bison_sver + bison_sver=`echo $bison_sver | awk -F ")" ' { print $2 } '` + debug bison_sver2: $bison_sver + bison_sver=`echo $bison_sver | awk -F "-" ' { print $1 } '` + debug bison_sver3: $bison_sver + bison_sysver_result=$bison_sver } gcc_sysver() @@ -425,7 +432,7 @@ find_installed_version() debug $depname"_sysver" $syspath eval $depname"_sysver" $syspath fsv_tmp=`eval echo "$"$depname"_sysver_result"` - if [ $fsv_tmp ]; then break; fi + if [ $fsv_tmp ]; then break; fi fi done fi -- cgit v0.10.1