diff --git a/YACReaderLibrary/YACReaderLibraryServer.pro b/YACReaderLibrary/YACReaderLibraryServer.pro index 42cf0a61..d377d567 100644 --- a/YACReaderLibrary/YACReaderLibraryServer.pro +++ b/YACReaderLibrary/YACReaderLibraryServer.pro @@ -12,7 +12,7 @@ INCLUDEPATH += ../common \ ./db DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY QT_NO_DEBUG_OUTPUT - +QMAKE_MAC_SDK = macosx10.11 #load default build flags #do a basic dependency check include(headless_config.pri) diff --git a/YACReaderLibrary/headless/main.cpp b/YACReaderLibrary/headless/main.cpp index 20fe8a6e..5888208f 100644 --- a/YACReaderLibrary/headless/main.cpp +++ b/YACReaderLibrary/headless/main.cpp @@ -83,7 +83,7 @@ void logSystemAndConfig() #elif defined Q_OS_UNIX && !defined Q_OS_MAC if(QLibrary::isLibrary(QString(LIBDIR)+"/yacreader/7z.so") | QLibrary::isLibrary(QString(LIBDIR)+"/p7zip/7z.so")) #else - if(QLibrary::isLibrary(QApplication::applicationDirPath()+"/utils/7z.so")) + if(QLibrary::isLibrary(QCoreApplication::applicationDirPath()+"/utils/7z.so")) #endif QLOG_INFO() << "7z : found"; else diff --git a/cleanOSX.sh b/cleanOSX.sh index 0e55aa9e..5923cf7a 100755 --- a/cleanOSX.sh +++ b/cleanOSX.sh @@ -10,4 +10,5 @@ cd .. cd YACReaderLibrary make clean rm -R YACReaderLibrary.app +rm -R YACReaderLibraryServer.app cd .. diff --git a/compileOSX.sh b/compileOSX.sh index 18228b93..b5a34ed8 100755 --- a/compileOSX.sh +++ b/compileOSX.sh @@ -5,15 +5,20 @@ fi echo "Compiling YACReader" cd ./YACReader -/Users/luisangel/my_dev/Qt5.5.0/5.5/clang_64/bin/qmake -spec macx-clang "CONFIG+=release" -#qmake -spec macx-g++ "CONFIG+=release" +/Users/luisangel/my_dev/Qt5.5.1/5.5/clang_64/bin/qmake YACReader.pro -spec macx-clang "CONFIG+=release" make cd .. echo "Compiling YACReaderLibrary" cd ./YACReaderLibrary -/Users/luisangel/my_dev/Qt5.5.0/5.5/clang_64/bin/qmake -spec macx-clang "CONFIG+=release" -#qmake -spec macx-g++ "CONFIG+=release" +/Users/luisangel/my_dev/Qt5.5.1/5.5/clang_64/bin/qmake YACReaderLibrary.pro -spec macx-clang "CONFIG+=release" +make +cd .. + +echo "Compiling YACReaderLibraryServer" +cd ./YACReaderLibrary +make clean +/Users/luisangel/my_dev/Qt5.5.1/5.5/clang_64/bin/qmake YACReaderLibraryServer.pro -spec macx-clang "CONFIG+=release" make cd .. @@ -21,27 +26,27 @@ echo "Configuring release apps" cp -R ./YACReader/YACReader.app ./YACReader.app cp -R ./YACReaderLibrary/YACReaderLibrary.app ./YACReaderLibrary.app +cp -R ./YACReaderLibrary/YACReaderLibraryServer.app ./YACReaderLibraryServer.app ./releaseOSX.sh -#cp -R ./PlugInsYACReader ./YACReader.app/Contents/PlugIns -#cp -R ./PlugInsLibrary ./YACReaderLibrary.app/Contents/PlugIns - echo "Copying to destination folder" dest='YACReader-'$1' MacOSX-Intel' mkdir "$dest" cp -R ./YACReader.app "./${dest}/YACReader.app" cp -R ./YACReaderLibrary.app "./${dest}/YACReaderLibrary.app" +cp -R ./YACReaderLibraryServer.app "./${dest}/YACReaderLibraryServer" + cp ./COPYING.txt "./${dest}/" cp ./README.txt "./${dest}/" -mkdir "./${dest}/icons/" -cp ./images/db.png "./${dest}/icons/" -cp ./images/coversPackage.png "./${dest}/icons/" +#mkdir "./${dest}/icons/" +#cp ./images/db.png "./${dest}/icons/" +#cp ./images/coversPackage.png "./${dest}/icons/" echo "Creating dmg package" #tar -czf "${dest}".tar.gz "${dest}" #hdiutil create "${dest}".dmg -srcfolder "./${dest}" -ov -./create-dmg --volname 'YACReader '$1' Installer' --volicon icon.icns --window-size 600 403 --icon-size 128 --app-drop-link 485 90 --background background.png --icon YACReader 80 90 --icon YACReaderLibrary 235 90 --eula COPYING.txt --icon icons 470 295 --icon README.txt 120 295 --icon COPYING.txt 290 295 "./${dest}.dmg" "./${dest}" +./create-dmg --volname 'YACReader '$1' Installer' --volicon icon.icns --window-size 600 403 --icon-size 128 --app-drop-link 485 90 --background background.png --icon YACReader 80 90 --icon YACReaderLibrary 235 90 --eula COPYING.txt --icon YACReaderLibraryServer 470 295 --icon README.txt 120 295 --icon COPYING.txt 290 295 "./${dest}.dmg" "./${dest}" echo "Done!" diff --git a/releaseOSX.sh b/releaseOSX.sh index 79e82966..68aea133 100755 --- a/releaseOSX.sh +++ b/releaseOSX.sh @@ -1,17 +1,16 @@ #!/bin/bash -/Users/luisangel/my_dev/Qt5.5.0/5.5/clang_64/bin/macdeployqt YACReader.app -/Users/luisangel/my_dev/Qt5.5.0/5.5/clang_64/bin/macdeployqt YACReaderLibrary.app -qmldir=./YACReaderLibrary/qml - -#macdeployqt YACReader.app -#macdeployqt YACReaderLibrary.app +/Users/luisangel/my_dev/Qt5.5.1/5.5/clang_64/bin/macdeployqt YACReader.app +/Users/luisangel/my_dev/Qt5.5.1/5.5/clang_64/bin/macdeployqt YACReaderLibrary.app -qmldir=./YACReaderLibrary/qml +/Users/luisangel/my_dev/Qt5.5.1/5.5/clang_64/bin/macdeployqt YACReaderLibraryServer.app cp -R ./utils ./YACReader.app/Contents/MacOS/ cp -R ./utils ./YACReaderLibrary.app/Contents/MacOS/ +cp -R ./utils ./YACReaderLibraryServer.app/Contents/MacOS/ cp -R ./release/server ./YACReaderLibrary.app/Contents/MacOS/ +cp -R ./release/server ./YACReaderLibraryServer.app/Contents/MacOS/ cp -R ./release/languages ./YACReader.app/Contents/MacOS/ cp -R ./release/languages ./YACReaderLibrary.app/Contents/MacOS/ -#cd ./YACReaderLibrary.app/Contents/MacOS/ -#touch YACReaderLibrary.ini -#ln -s ../../../YACReader.app/Contents/MacOS/YACReader +cp -R ./release/languages ./YACReaderLibraryServer.app/Contents/MacOS/ +/Users/luisangel/my_dev/YACReader/YACReader_hg/create-dmg