mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed osx build for 8.5.0

Browse Source
This commit is contained in:
Luis Ángel San Martín 2016-02-18 18:23:41 +01:00
parent 08975089a4
commit 66266bc326
5 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
YACReaderLibrary/YACReaderLibraryServer.pro
View File

@ -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)

2
YACReaderLibrary/headless/main.cpp
View File

@ -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

1
cleanOSX.sh
View File

@ -10,4 +10,5 @@ cd ..
cd YACReaderLibrary
make clean
rm -R YACReaderLibrary.app
rm -R YACReaderLibraryServer.app
cd ..

27
compileOSX.sh
View File

@ -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!"

15
releaseOSX.sh
View File

@ -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