diff --git a/publish-macosx.sh b/publish-macosx.sh index 4b9abb4f..a6b44e68 100755 --- a/publish-macosx.sh +++ b/publish-macosx.sh @@ -3,6 +3,8 @@ VERSION=`date "+%Y.%m.%d"` #VERSION=2010.02 -./release-macosx.sh -v $VERSION +export OPENCSGDIR=$PWD/../OpenCSG-1.2.0 + +./release-common.sh -v $VERSION cp openscad-$VERSION.zip ~/Documents/Dropbox/Public ln -sf openscad-$VERSION.zip ~/Documents/Dropbox/Public/openscad-latest.zip diff --git a/release-common.sh b/release-common.sh index 6037f238..10a1d1be 100755 --- a/release-common.sh +++ b/release-common.sh @@ -58,7 +58,7 @@ case $OS in ;; esac -qmake VERSION=$VERSION CONFIG+=$CONFIG CONFIG-=debug +qmake VERSION=$VERSION CONFIG+=$CONFIG CONFIG-=debug openscad.pro make -s clean case $OS in MACOSX) @@ -77,6 +77,7 @@ rm -rf openscad-$VERSION rm -f openscad-$VERSION.zip mkdir -p openscad-$VERSION/examples cp examples/* openscad-$VERSION/examples/ +chmod -R 644 openscad-$VERSION/examples/* case $OS in MACOSX) @@ -99,6 +100,7 @@ case $OS in install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui OpenSCAD.app/Contents/Frameworks/libopencsg.dylib install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore OpenSCAD.app/Contents/Frameworks/libopencsg.dylib install_name_tool -id libGLEW.1.5.1.dylib OpenSCAD.app/Contents/Frameworks/libGLEW.1.5.1.dylib + mv OpenSCAD.app openscad-$VERSION ;; WIN) #package diff --git a/release-macosx.sh b/release-macosx.sh index 31d17a67..8ac5dc05 100755 --- a/release-macosx.sh +++ b/release-macosx.sh @@ -29,7 +29,7 @@ fi echo "Building openscad-$VERSION..." export OPENCSGDIR=$PWD/../OpenCSG-1.2.0 -qmake VERSION=$VERSION CONFIG+=mdi +qmake VERSION=$VERSION CONFIG+=mdi openscad.pro make clean make -j2 echo "Preparing executable.."