diff options
author | kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-01-22 13:22:16 (GMT) |
---|---|---|
committer | kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c> | 2010-01-22 13:22:16 (GMT) |
commit | e0ca60eef76b2862d8fc14f785c0759566240ab8 (patch) | |
tree | 1a49751a7e1a4f58778f87e6fe0ec1ff581910c5 | |
parent | 8561215e0959ed049356b525f0875d842eca296a (diff) |
Bugfixes for Mac build
git-svn-id: http://svn.clifford.at/openscad/trunk@335 b57f626f-c46c-0410-a088-ec61d464b74c
-rwxr-xr-x | publish-macosx.sh | 4 | ||||
-rwxr-xr-x | release-common.sh | 4 | ||||
-rwxr-xr-x | release-macosx.sh | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/publish-macosx.sh b/publish-macosx.sh index 4b9abb4..a6b44e6 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 6037f23..10a1d1b 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 31d17a6..8ac5dc0 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.." |