diff --git a/ico/mac_icon/elmt.icns b/ico/mac_icon/elmt.icns new file mode 100644 index 000000000..e801af60d Binary files /dev/null and b/ico/mac_icon/elmt.icns differ diff --git a/ico/mac_icon/qet.icns b/ico/mac_icon/qet.icns new file mode 100644 index 000000000..5cc23e659 Binary files /dev/null and b/ico/mac_icon/qet.icns differ diff --git a/ico/mac_icon/titleblock.icns b/ico/mac_icon/titleblock.icns new file mode 100644 index 000000000..fbbb9ee5e Binary files /dev/null and b/ico/mac_icon/titleblock.icns differ diff --git a/misc/Info.plist b/misc/Info.plist new file mode 100644 index 000000000..f7fff0a5f --- /dev/null +++ b/misc/Info.plist @@ -0,0 +1,111 @@ + + + + + CFBundleDocumentTypes + + + CFBundleTypeIconFile + elmt + CFBundleTypeExtensions + + elmt + + CFBundleTypeRole + Editor + + + CFBundleTypeIconFile + titleblock + CFBundleTypeExtensions + + titleblock + + CFBundleTypeRole + Editor + + + CFBundleTypeIconFile + qet + CFBundleTypeExtensions + + qet + + CFBundleTypeRole + Editor + + + CFBundleExecutable + qelectrotech + CFBundleIconFile + qelectrotech.icns + CFBundleIdentifier + org.qelectrotech + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleSignature + ???? + NOTE + This file was generated by Qt/QMake. + CFBundleShortVersionString + + NSHighResolutionCapable + YES + NSHighResolutionMagnifyAllowed + NO + NSHumanReadableCopyright + GNU Public License, Version 2, June 1991 + NSPrincipalClass + NSApplication + UTExportedTypeDeclarations + + + UTTypeConformsTo + + public.xml + + UTTypeDescription + QElectroTech Titleblock File + UTTypeIdentifier + org.qelectrotech.titleblock + UTTypeTagSpecification + + public.filename-extension + titleblock + + + + UTTypeConformsTo + + public.xml + + UTTypeDescription + QElectroTech Element File + UTTypeIdentifier + org.qelectrotech.elmt + UTTypeTagSpecification + + public.filename-extension + elmt + + + + UTTypeConformsTo + + public.xml + + UTTypeDescription + QElectroTech Project File + UTTypeIdentifier + org.qelectrotech.qet + UTTypeTagSpecification + + public.filename-extension + qet + + + + + diff --git a/misc/MacQetDeploy.sh b/misc/MacQetDeploy.sh index 5eb4136bf..8f5a7e51a 100644 --- a/misc/MacQetDeploy.sh +++ b/misc/MacQetDeploy.sh @@ -182,9 +182,10 @@ else exit fi +cp -R ${current_dir}/misc/Info.plist qelectrotech.app/Contents/ +cp -R ${current_dir}/ico/mac_icon/*.icns qelectrotech.app/Contents/Resources/ # On rajoute le numero de version pour "cmd + i" -sed -i "" "s/Created by Qt\/QMake<\/string>/$tagName r$revAp<\/string>/" qelectrotech.app/Contents/Info.plist - +/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $tagName r$revAp" "qelectrotech.app/Contents/Info.plist" # Version number ### copy over frameworks ############################################ @@ -326,3 +327,21 @@ svnversion | grep -q '[MS:]' ; if [ $? -eq 0 ] ; then fi + +#rsync to TF DMG builds +echo -e "\033[1;31mWould you like to upload MacOS packages "${APPNAME}"-"$tagName"_"r$revAp.dmg", n/Y?.\033[m" +read a +if [[ $a == "Y" || $a == "y" ]]; then +cp -Rf "packaging/mac-osx/${APPNAME} $tagName r$revAp.dmg" /Users/amdosx/MAC_OS_X/ +rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress /Users/amdosx/MAC_OS_X/ admin@ssh.tuxfamily.org:/home/qet/qet-repository/builds/MAC_OS_X/ +if [ $? != 0 ]; then +{ +echo "RSYNC ERROR: problem syncing ${APPNAME} $tagName r$revAp.dmg" +rsync -e ssh -av --delete-after --no-owner --no-g --chmod=g+w --progress /Users/amdosx/MAC_OS_X/ admin@ssh.tuxfamily.org:/home/qet/qet-repository/builds/MAC_OS_X/ + +} fi + +else +echo -e "\033[1;33mExit.\033[m" + +fi \ No newline at end of file