Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge r1522 from Zyzzyva 0.14.x branch.

Normally a no-no to merge to a tag, but since it's just a build script...

Update Mac OS X installer creation script.  Do not include the
libQtTest library, and change the reference to QtXml in the libzyzzyva0
library.
  • Loading branch information...
commit 2585f571a2102b77b7413039cc3d4ac72ab28063 1 parent 9d651ad
@boshvark authored
Showing with 8 additions and 47 deletions.
  1. +8 −47 installer/create-macx-dmg.sh
View
55 installer/create-macx-dmg.sh
@@ -68,7 +68,7 @@ install_name_tool -change \
zyzzyva.app/Contents/MacOS/zyzzyva
# Copy Qt frameworks into bundle and tell the executable to link to them
-for i in Qt3Support QtGui QtNetwork QtSql QtXml QtCore ; do
+for i in QtGui QtNetwork QtSql QtXml QtCore ; do
# Copy Qt framework into bundle
echo "Copying $i.framework into bundle..."
@@ -96,17 +96,6 @@ for i in Qt3Support QtGui QtNetwork QtSql QtXml QtCore ; do
zyzzyva.app/Contents/MacOS/zyzzyva
done
-# Copy libQtTest into bundle
-echo "Copying libQtTest into bundle..."
-cp $QTDIR/lib/libQtTest.4.dylib zyzzyva.app/Contents/Frameworks
-
-# Change link locations for libQtTest in executable
-echo "Changing link location for libQtTest in Zyzzyva executable..."
-install_name_tool -change \
- $QTDIR/lib/libQtTest.4.dylib \
- @executable_path/../Frameworks/libQtTest.4.dylib \
- zyzzyva.app/Contents/MacOS/zyzzyva
-
# Change reference to QtCore in QtGui framework
echo "Changing link location for QtCore.framework in QtGui.framework..."
install_name_tool -change \
@@ -135,41 +124,6 @@ install_name_tool -change \
@executable_path/../Frameworks/QtCore.framework/Versions/$QTVER/QtCore \
zyzzyva.app/Contents/Frameworks/QtXml.framework/Versions/$QTVER/QtXml
-# Change reference to QtCore in Qt3Support framework
-echo "Changing link location for QtCore.framework in Qt3Support.framework..."
-install_name_tool -change \
- $QTDIR/lib/QtCore.framework/Versions/$QTVER/QtCore \
- @executable_path/../Frameworks/QtCore.framework/Versions/$QTVER/QtCore \
- zyzzyva.app/Contents/Frameworks/Qt3Support.framework/Versions/$QTVER/Qt3Support
-
-# Change reference to QtGui in Qt3Support framework
-echo "Changing link location for QtGui.framework in Qt3Support.framework..."
-install_name_tool -change \
- $QTDIR/lib/QtGui.framework/Versions/$QTVER/QtGui \
- @executable_path/../Frameworks/QtGui.framework/Versions/$QTVER/QtGui \
- zyzzyva.app/Contents/Frameworks/Qt3Support.framework/Versions/$QTVER/Qt3Support
-
-# Change reference to QtNetwork in Qt3Support framework
-echo "Changing link location for QtNetwork.framework in Qt3Support.framework..."
-install_name_tool -change \
- $QTDIR/lib/QtNetwork.framework/Versions/$QTVER/QtNetwork \
- @executable_path/../Frameworks/QtNetwork.framework/Versions/$QTVER/QtNetwork \
- zyzzyva.app/Contents/Frameworks/Qt3Support.framework/Versions/$QTVER/Qt3Support
-
-# Change reference to QtSql in Qt3Support framework
-echo "Changing link location for QtSql.framework in Qt3Support.framework..."
-install_name_tool -change \
- $QTDIR/lib/QtSql.framework/Versions/$QTVER/QtSql \
- @executable_path/../Frameworks/QtSql.framework/Versions/$QTVER/QtSql \
- zyzzyva.app/Contents/Frameworks/Qt3Support.framework/Versions/$QTVER/Qt3Support
-
-# Change reference to QtXml in Qt3Support framework
-echo "Changing link location for QtXml.framework in Qt3Support.framework..."
-install_name_tool -change \
- $QTDIR/lib/QtXml.framework/Versions/$QTVER/QtXml \
- @executable_path/../Frameworks/QtXml.framework/Versions/$QTVER/QtXml \
- zyzzyva.app/Contents/Frameworks/Qt3Support.framework/Versions/$QTVER/Qt3Support
-
# Change reference to QtCore in Assistant client
echo "Changing link location for QtCore.framework in Assistant client..."
install_name_tool -change \
@@ -219,6 +173,13 @@ install_name_tool -change \
@executable_path/../Frameworks/QtNetwork.framework/Versions/$QTVER/QtNetwork \
zyzzyva.app/Contents/Frameworks/libzyzzyva.0.dylib
+# Change reference to QtSql in libzyzzyva
+echo "Changing link location for QtSql.framework in libzyzzyva..."
+install_name_tool -change \
+ $QTDIR/lib/QtSql.framework/Versions/$QTVER/QtSql \
+ @executable_path/../Frameworks/QtSql.framework/Versions/$QTVER/QtSql \
+ zyzzyva.app/Contents/Frameworks/libzyzzyva.0.dylib
+
# Change reference to QtXml in libzyzzyva
echo "Changing link location for QtXml.framework in libzyzzyva..."
install_name_tool -change \
Please sign in to comment.
Something went wrong with that request. Please try again.