@@ -1,50 +1,68 @@ #!/bin/bash -APP="Tetzle" -VERSION="1.0.1" +APP='Tetzle' +VERSION='1.0.1' BUNDLE="$APP.app" BUNDLE_FW="$BUNDLE/Contents/Frameworks" +BUNDLE_PLUGINS="$BUNDLE/Contents/plugins" + EXE="$BUNDLE/Contents/MacOS/$APP" -EXE_FW="@executable_path/../Frameworks" -QT_FW=`qmake -query QT_INSTALL_LIBS` -QTCORE="QtCore.framework/Versions/4/QtCore" -QTGUI="QtGui.framework/Versions/4/QtGui" -QTXML="QtXml.framework/Versions/4/QtXml" -QTOPENGL="QtOpenGL.framework/Versions/4/QtOpenGL" +EXE_FW='@executable_path/../Frameworks' + +QT_FW=$(qmake -query QT_INSTALL_LIBS) +QT_PLUGINS=$(qmake -query QT_INSTALL_PLUGINS) + +QTCORE='QtCore.framework/Versions/4/QtCore' +QTGUI='QtGui.framework/Versions/4/QtGui' +QTXML='QtXml.framework/Versions/4/QtXml' +QTOPENGL='QtOpenGL.framework/Versions/4/QtOpenGL' strip $EXE -echo -n "Copying frameworks... " +echo -n 'Copying frameworks... ' mkdir $BUNDLE_FW cp -R $QT_FW/QtCore.framework $BUNDLE_FW cp -R $QT_FW/QtGui.framework $BUNDLE_FW cp -R $QT_FW/QtXml.framework $BUNDLE_FW cp -R $QT_FW/QtOpenGL.framework $BUNDLE_FW -echo "Done" +echo 'Done' -echo -n "Setting framework names... " +echo -n 'Setting framework names... ' install_name_tool -id $EXE_FW/$QTCORE $BUNDLE_FW/$QTCORE install_name_tool -id $EXE_FW/$QTGUI $BUNDLE_FW/$QTGUI install_name_tool -id $EXE_FW/$QTXML $BUNDLE_FW/$QTXML install_name_tool -id $EXE_FW/$QTOPENGL $BUNDLE_FW/$QTOPENGL -echo "Done" +echo 'Done' -echo -n "Updating locations in executable... " +echo -n 'Updating locations in executable... ' install_name_tool -change $QTCORE $EXE_FW/$QTCORE $EXE install_name_tool -change $QTGUI $EXE_FW/$QTGUI $EXE install_name_tool -change $QTXML $EXE_FW/$QTXML $EXE install_name_tool -change $QTOPENGL $EXE_FW/$QTOPENGL $EXE -echo "Done" +echo 'Done' -echo -n "Updating locations in frameworks... " +echo -n 'Updating locations in frameworks... ' install_name_tool -change $QTCORE $EXE_FW/$QTCORE $BUNDLE_FW/$QTGUI install_name_tool -change $QTCORE $EXE_FW/$QTCORE $BUNDLE_FW/$QTXML install_name_tool -change $QTCORE $EXE_FW/$QTCORE $BUNDLE_FW/$QTOPENGL install_name_tool -change $QTGUI $EXE_FW/$QTGUI $BUNDLE_FW/$QTOPENGL -echo "Done" +echo 'Done' + +echo -n 'Copying plugins... ' +mkdir $BUNDLE_PLUGINS +cp -R $QT_PLUGINS/imageformats $BUNDLE_PLUGINS +echo 'Done' + +echo -n 'Updating locations in plugins... ' +for FILE in $(ls $BUNDLE_PLUGINS/imageformats) +do + install_name_tool -change $QTGUI $EXE_FW/$QTGUI $BUNDLE_PLUGINS/imageformats/$FILE + install_name_tool -change $QTCORE $EXE_FW/$QTCORE $BUNDLE_PLUGINS/imageformats/$FILE +done +echo 'Done' -echo -n "Creating disk image... " +echo -n 'Creating disk image... ' hdiutil create -quiet -ov -srcfolder $BUNDLE -format UDBZ -volname "$APP" "${APP}_$VERSION.dmg" hdiutil internet-enable -quiet -yes "${APP}_$VERSION.dmg" -echo "Done" +echo 'Done' mac_deploy.sh @@ -40,6 +40,15 @@ int main(int argc, char** argv) tetzle_translator.load("tetzle_" + QLocale::system().name()); app.installTranslator(&tetzle_translator); +#if defined(Q_OS_MAC) + { + QDir dir(QApplication::applicationDirPath()); + dir.cdUp(); + dir.cd("plugins"); + QApplication::setLibraryPaths(QStringList(dir.absolutePath())); + } +#endif + QDir dir = QDir::home(); #if defined(Q_OS_MAC) QString path = QDir::homePath() + "/Library/Application Support/GottCode/Tetzle/"; src/main.cpp @@ -5,3 +5,10 @@ COPY %QTDIR%\bin\QtCore4.dll Tetzle COPY %QTDIR%\bin\QtGui4.dll Tetzle COPY %QTDIR%\bin\QtXml4.dll Tetzle COPY %QTDIR%\bin\QtOpenGL4.dll Tetzle +MKDIR Tetzle\imageformats +COPY %QTDIR%\plugins\imageformats\qgif4.dll Tetzle\imageformats +COPY %QTDIR%\plugins\imageformats\qico4.dll Tetzle\imageformats +COPY %QTDIR%\plugins\imageformats\qjpeg4.dll Tetzle\imageformats +COPY %QTDIR%\plugins\imageformats\qmng4.dll Tetzle\imageformats +COPY %QTDIR%\plugins\imageformats\qsvg4.dll Tetzle\imageformats +COPY %QTDIR%\plugins\imageformats\qtiff4.dll Tetzle\imageformats windows_deploy.bat 148557a01164057cb1810476c130f7141a83a5e6 Graeme Gott graeme@gottcode.org http://github.com/gottcode/tetzle/commit/2e02f15946c58df5f585b88da77b08bb6b5e79e1 2e02f15946c58df5f585b88da77b08bb6b5e79e1 2008-06-28T14:15:53-07:00 2008-06-28T14:15:53-07:00 Add image plugins to Mac and Windows releases. a81ac3c966d30af2ebc37505b8602ec75d94c07a Graeme Gott graeme@gottcode.org