jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated Qt to 5.5.1, Sparkle to 1.11.0, added tweaks to build using Xcode 7

Browse source
This commit is contained in:
Marius Kintel 2015-11-03 01:35:11 -05:00
parent 5639962224
commit fbb5e895ab
1 changed files with 48 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
scripts/macosx-build-dependencies.sh
View file

@ -40,7 +40,7 @@ PACKAGES=(
"gmp 5.1.3"
"mpfr 3.1.3"
"boost 1.59.0"
"qt5 5.4.1"
"qt5 5.5.1"
"qscintilla 2.9"
# NB! For CGAL, also update the actual download URL in the function
"cgal 4.6.3"
@ -56,7 +56,7 @@ PACKAGES=(
"fontconfig 2.11.1"
)
DEPLOY_PACKAGES=(
"sparkle Cocoanetics:1e7dcb1a48b96d1a8c62100b5864bd50211cbae1"
"sparkle 1.11.0"
)
printUsage()
@ -223,8 +223,11 @@ build_qt5()
curl -O -L http://download.qt-project.org/official_releases/qt/${v[0]}.${v[1]}/$version/single/qt-everywhere-opensource-src-$version.tar.gz
fi
tar xzf qt-everywhere-opensource-src-$version.tar.gz
cd qt-everywhere-opensource-src-$version
CXXFLAGS="$CXXSTDFLAGS" ./configure -prefix $DEPLOYDIR -release -opensource -confirm-license \
cd qt-everywhere-opensource-src-$version
if ! $USING_CXX11; then
QT_EXTRA_FLAGS="-no-c++11"
fi
CXXFLAGS="$CXXSTDFLAGS" ./configure -prefix $DEPLOYDIR $QT_EXTRA_FLAGS -release -opensource -confirm-license \
-nomake examples -nomake tests \
-no-xcb -no-glib -no-harfbuzz -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc \
-no-sql-psql -no-sql-sqlite2 -no-sql-tds -no-cups -no-qml-debug \
@ -601,35 +604,51 @@ check_sparkle()
check_file lib/Sparkle.framework/Sparkle
}
# Usage: build_sparkle <githubuser>:<commitID>
# Usage:
# build_sparkle <githubuser>:<commitID>
# build_sparkle <version>
build_sparkle()
{
v=$1
github=${1%%:*} # Cut at first colon
version=${1#*:} # cut until first colon
echo "Building Sparkle" $version "..."
# Let Sparkle use the default compiler
unset CC
unset CXX
# Binary install:
version=$1
cd $BASEDIR/src
rm -rf Sparkle-$version
if [ ! -f Sparkle-$version.zip ]; then
curl -o Sparkle-$version.zip https://nodeload.github.com/$github/Sparkle/zip/$version
curl -LO https://github.com/sparkle-project/Sparkle/releases/download/$version/Sparkle-$version.tar.bz2
fi
unzip -q Sparkle-$version.zip
mkdir Sparkle-$version
cd Sparkle-$version
patch -p1 < $OPENSCADDIR/patches/sparkle.patch
if $OPTION_32BIT; then
SPARKLE_EXTRA_FLAGS="-arch i386"
fi
xcodebuild clean
xcodebuild -arch x86_64 $SPARKLE_EXTRA_FLAGS
rm -rf $DEPLOYDIR/lib/Sparkle.framework
cp -Rf build/Release/Sparkle.framework $DEPLOYDIR/lib/
install_name_tool -id $DEPLOYDIR/lib/Sparkle.framework/Versions/A/Sparkle $DEPLOYDIR/lib/Sparkle.framework/Sparkle
tar xjf ../Sparkle-$version.tar.bz2
cp -Rf Sparkle.framework $DEPLOYDIR/lib/
# Build from source:
# v=$1
# github=${1%%:*} # Cut at first colon
# version=${1#*:} # cut until first colon
#
# echo "Building Sparkle" $version "..."
#
# # Let Sparkle use the default compiler
# unset CC
# unset CXX
#
# cd $BASEDIR/src
# rm -rf Sparkle-$version
# if [ ! -f Sparkle-$version.zip ]; then
# curl -o Sparkle-$version.zip https://nodeload.github.com/$github/Sparkle/zip/$version
# fi
# unzip -q Sparkle-$version.zip
# cd Sparkle-$version
# patch -p1 < $OPENSCADDIR/patches/sparkle.patch
# if $OPTION_32BIT; then
# SPARKLE_EXTRA_FLAGS="-arch i386"
# fi
# xcodebuild clean
# xcodebuild -arch x86_64 $SPARKLE_EXTRA_FLAGS
# rm -rf $DEPLOYDIR/lib/Sparkle.framework
# cp -Rf build/Release/Sparkle.framework $DEPLOYDIR/lib/
# Install_name_tool -id $DEPLOYDIR/lib/Sparkle.framework/Versions/A/Sparkle $DEPLOYDIR/lib/Sparkle.framework/Sparkle
}
check_freetype()
@ -781,7 +800,6 @@ check_ragel()
check_file bin/ragel
}
set -x
build_ragel()
{
version=$1
@ -897,6 +915,9 @@ fi
if $USING_CXX11; then
export CXXSTDFLAGS="-std=c++11 -stdlib=libc++"
export LDSTDFLAGS="-stdlib=libc++"
else
export CXXSTDFLAGS="-std=c++03 -stdlib=libstdc++"
export LDSTDFLAGS="-stdlib=libstdc++"
fi
echo "Building for $MAC_OSX_VERSION_MIN or later"