diff --git a/compileOSX.sh b/compileOSX.sh index ce976a67..6dd091d2 100755 --- a/compileOSX.sh +++ b/compileOSX.sh @@ -9,7 +9,9 @@ SKIP_CODESIGN=${3:-false} QT_VERSION=${4:-""} -if [ "$4" == "clean" ]; then +echo "building macos binaries with these params: ${VERSION} ${BUILD_NUMBER} ${SKIP_CODESIGN} ${QT_VERSION}" + +if [ "$5" == "clean" ]; then ./cleanOSX.sh fi @@ -75,8 +77,8 @@ fi echo "Preparing apps for release, Done." -echo "Copying to destination folder" -dest="YACReader-$VERSION.$BUILD_NUMBER MacOSX-Intel$QT_VERSION" +dest="YACReader-$VERSION.$BUILD_NUMBER MacOSX-Intel ${QT_VERSION}" +echo "Copying to destination folder ${dest}" mkdir -p "$dest" cp -R YACReader.app "${dest}/YACReader.app" cp -R YACReaderLibrary.app "${dest}/YACReaderLibrary.app" @@ -85,18 +87,11 @@ cp -R YACReaderLibraryServer.app "${dest}/YACReaderLibraryServer" cp COPYING.txt "${dest}/" cp README.md "${dest}/" -#mkdir -p "${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 $VERSION.$BUILD_NUMBER 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.md 120 295 --icon COPYING.txt 290 295 "$dest.dmg" "$dest" sed -i'' -e "s/#VERSION#/$VERSION/g" dmg.json sed -i'' -e "s/#BUILD_NUMBER#/$BUILD_NUMBER/g" dmg.json +sed -i'' -e "s/#QT_VERSION#/$QT_VERSION/g" dmg.json appdmg dmg.json "$dest.dmg" if [ "$SKIP_CODESIGN" = false ]; then diff --git a/dmg.json b/dmg.json index 6a56f45d..d5ba3a78 100644 --- a/dmg.json +++ b/dmg.json @@ -1,5 +1,5 @@ { - "title": "YACReader-#VERSION#.#BUILD_NUMBER#", + "title": "YACReader-#VERSION#.#BUILD_NUMBER# #QT_VERSION#", "icon": "icon.icns", "background": "background.png", "window": { @@ -20,31 +20,31 @@ "x": 80, "y": 90, "type": "file", - "path": "YACReader-#VERSION#.#BUILD_NUMBER# MacOSX-Intel/YACReader.app" + "path": "YACReader-#VERSION#.#BUILD_NUMBER# MacOSX-Intel #QT_VERSION#/YACReader.app" }, { "x": 235, "y": 90, "type": "file", - "path": "YACReader-#VERSION#.#BUILD_NUMBER# MacOSX-Intel/YACReaderLibrary.app" + "path": "YACReader-#VERSION#.#BUILD_NUMBER# MacOSX-Intel #QT_VERSION#/YACReaderLibrary.app" }, { "x": 470, "y": 295, "type": "file", - "path": "YACReader-#VERSION#.#BUILD_NUMBER# MacOSX-Intel/YACReaderLibraryServer" + "path": "YACReader-#VERSION#.#BUILD_NUMBER# MacOSX-Intel #QT_VERSION#/YACReaderLibraryServer" }, { "x": 120, "y": 295, "type": "file", - "path": "YACReader-#VERSION#.#BUILD_NUMBER# MacOSX-Intel/README.md" + "path": "YACReader-#VERSION#.#BUILD_NUMBER# MacOSX-Intel #QT_VERSION#/README.md" }, { "x": 290, "y": 295, "type": "file", - "path": "YACReader-#VERSION#.#BUILD_NUMBER# MacOSX-Intel/COPYING.txt" + "path": "YACReader-#VERSION#.#BUILD_NUMBER# MacOSX-Intel #QT_VERSION#/COPYING.txt" } ] -} \ No newline at end of file +}