Skip to content

O
OpenBoard
Commit c42faa7e authored by Claudio Valerio's avatar Claudio Valerio
Browse files
Options

maac os build successful after rename

parent 06a8d52c
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 114 deletions
OpenBoard.packproj
View file @ c42faa7e
......@@ -75,7 +75,7 @@
<key>GID</key>
<integer>80</integer>
<key>Path</key>
<string>build/macx/release/product/Open-Sankore.app</string>
<string>build/macx/release/product/OpenBoard.app</string>
<key>Path Type</key>
<integer>2</integer>
<key>Privileges</key>
......@@ -479,9 +479,9 @@
<key>IFPkgDescriptionDeleteWarning</key>
<string></string>
<key>IFPkgDescriptionDescription</key>
<string>Open-Sankore is an hardware independent interactive whiteboard</string>
<string>OpenBoard is an hardware independent interactive whiteboard</string>
<key>IFPkgDescriptionTitle</key>
<string>Open-Sankoré</string>
<string>OpenBoard</string>
<key>IFPkgDescriptionVersion</key>
<string>1.40.b.00</string>
</dict>
......@@ -489,15 +489,15 @@
<key>Display Information</key>
<dict>
<key>CFBundleGetInfoString</key>
<string>Open-Sankore 1.0 Copyrights © 2011 Open-Sankoré</string>
<string>OpenBoard 1.0 Copyrights © 2013 OpenBoard</string>
<key>CFBundleIconFile</key>
<string>resources/macx/UniboardDmg.icns</string>
<string>resources/macx/OpenBoardDmg.icns</string>
<key>CFBundleIconFile Path Type</key>
<integer>2</integer>
<key>CFBundleIdentifier</key>
<string>org.open-sankore.pkg.Open-Sankore</string>
<string>org.OpenBoard.pkg.OpenBoard</string>
<key>CFBundleName</key>
<string>Open-Sankoré</string>
<string>OpenBoard</string>
<key>CFBundleShortVersionString</key>
<string>1.40.b.00</string>
</dict>
......@@ -534,7 +534,7 @@
<key>IFPkgFlagPackageSelection</key>
<integer>0</integer>
<key>Name</key>
<string>Open-Sankore</string>
<string>OpenBoard</string>
<key>Status</key>
<integer>1</integer>
<key>Type</key>
......
release.macx.sh
View file @ c42faa7e
......@@ -35,7 +35,7 @@ BASE_QT_TRANSLATIONS_DIRECTORY=../Qt4.8/translations
function notify {
GROWLNOTIFY=`which growlnotify`
if [ -x "$GROWLNOTIFY" ]; then
$GROWLNOTIFY --name uniboard-build --iconpath /Developer/Applications/Xcode.app --message "$1" "Uniboard"
$GROWLNOTIFY --name OpenBoard-build --iconpath /Developer/Applications/Xcode.app --message "$1" "OpenBoard"
fi
printf "\033[32m--->\033[0m $1\n"
}
......@@ -80,16 +80,16 @@ done
}
trap "defaults write com.mnemis.Uniboard.release Running -bool NO" EXIT
trap "defaults write org.oe-f.OpenBoard.release Running -bool NO" EXIT
notify "Running Uniboard release script (`date`)"
notify "Running OpenBoard release script (`date`)"
script_is_running=`defaults read com.mnemis.Uniboard.release Running 2>/dev/null`
script_is_running=`defaults read org.oe-f.OpenBoard.release Running 2>/dev/null`
if [[ $? -eq 0 ]] && [[ "$script_is_running" = "1" ]]; then
trap EXIT
abort "another release script already running"
fi
defaults write com.mnemis.Uniboard.release Running -bool YES
defaults write org.oe-f.OpenBoard.release Running -bool YES
# Check for executables
checkExecutable "$QMAKE"
......@@ -135,8 +135,8 @@ else
LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`"
if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then
echo creating a tag with the version $VERSION
git tag -a "v$VERSION" -m "Generated setup for v$VERSION"
git push origin --tags
# git tag -a "v$VERSION" -m "Generated setup for v$VERSION"
# git push origin --tags
fi
fi
......@@ -203,7 +203,7 @@ cp *.pdf "$VOLUME"
cp -R "$APP" "$VOLUME"
ln -s /Applications "$VOLUME"
$DMGUTIL --set --iconsize=96 --toolbar=false --icon=resources/macx/UniboardDmg.icns "$VOLUME"
$DMGUTIL --set --iconsize=96 --toolbar=false --icon=resources/macx/OpenBoard.icns "$VOLUME"
$DMGUTIL --set --x=20 --y=60 --width=580 --height=440 "$VOLUME"
$DMGUTIL --set --x=180 --y=120 "$VOLUME/`basename \"$APP\"`"
$DMGUTIL --set --x=400 --y=120 "$VOLUME/Applications"
......
resources/OpenBoard.qrc
View file @ c42faa7e
......@@ -208,7 +208,6 @@
<file>webbrowser/notfound.html</file>
<file>webbrowser/object-wrapper.html</file>
<file alias="PowerPointImport.applescript">macx/PowerPointImport.applescript</file>
<file>macx/upgrade.sh</file>
<file>podcast/OpenBoard.prx</file>
<file>www/OpenBoard-web-player.html</file>
<file>images/toolbar/tutorial.png</file>
......
resources/macx/Info.plist
View file @ c42faa7e
......@@ -8,14 +8,14 @@
<key>CFBundleTypeIconFile</key>
<string>ubz.icns</string>
<key>CFBundleTypeName</key>
<string>com.mnemis.uniboard.document</string>
<string>org.oe-f.OpenBoard.document</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSHandlerRank</key>
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<string>com.mnemis.uniboard.document</string>
<string>org.oe-f.OpenBoard.document</string>
</array>
</dict>
<dict>
......@@ -49,19 +49,19 @@
</dict>
</array>
<key>CFBundleExecutable</key>
<string>Open-Sankore</string>
<string>OpenBoard</string>
<key>CFBundleGetInfoString</key>
<string>Open-Sankore @SHORT_VERSION@</string>
<string>OpenBoard @SHORT_VERSION@</string>
<key>CFBundleIconFile</key>
<string>Uniboard.icns</string>
<string>OpenBoard.icns</string>
<key>CFBundleIdentifier</key>
<string>org.eduxia.open-sankore</string>
<string>org.oe-f.OpenBoard</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>5.0.0 (rDEVELOPMENT)</string>
<key>CFBundleSignature</key>
<string>UniB</string>
<string>OpenB</string>
<key>CFBundleVersion</key>
<string>0</string>
<key>SUPublicDSAKeyFile</key>
......@@ -70,9 +70,9 @@
<array>
<dict>
<key>UTTypeIdentifier</key>
<string>com.mnemis.uniboard.document</string>
<string>org.oe-f.OpenBoard.document</string>
<key>UTTypeDescription</key>
<string>Open-Sankore document</string>
<string>OpenBoard document</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.presentation</string>
......
resources/macx/Save PDF to Open-Sankore.workflow/Contents/Info.plist → resources/macx/Save PDF to OpenBoard.workflow/Contents/Info.plist
View file @ c42faa7e
......@@ -3,11 +3,11 @@
<plist version="1.0">
<dict>
<key>CFBundleIdentifier</key>
<string>com.eduxia.pdfworkflow.savepdftoopensankore</string>
<string>org.oe-f.pdfworkflow.savepdftoopensankore</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Save PDF to Open-Sankoré</string>
<string>Save PDF to OpenBoard</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
......
resources/macx/appcast-mac.xml deleted 100644 → 0
View file @ 06a8d52c
<?xml version="1.0" encoding="utf-8"?>
<rss xmlns:ub="http://uniboard.mnemis.com/software" version="2.0">
<channel>
<title>Uniboard</title>
<link>http://www.mnemis.com</link>
<description>Uniboard Appcast</description>
<item>
<title>Uniboard 4.5.4</title>
<description>Download the new version of Uniboard 4</description>
<link>http://assets.getuniboard.com/installer/Uniboard 4.5.4.dmg</link>
<ub:version>4.5.4.3093</ub:version>
<pubDate>Thu, 9 Apr 2010 14:44:00 CET</pubDate>
</item>
<item>
<title>Uniboard <%= version %></title>
<description>Download the new version of Uniboard 4</description>
<link>http://assets.getuniboard.com/installer/<%= installer_filename %></link>
<ub:version><%= long_version %></ub:version>
<pubDate><%= rssdatetime %></pubDate>
</item>
</channel>
</rss>
resources/macx/growl.applescript deleted 100644 → 0
View file @ 06a8d52c
tell application "System Events"
set isRunning to Â
(count of (every process whose name is "GrowlHelperApp")) > 0
end tell
if isRunning then
tell application "GrowlHelperApp"
-- Make a list of all the notification types
-- that this script will ever send:
set the allNotificationsList to Â
{"Uniboard Update Install"}
set the enabledNotificationsList to Â
{"Uniboard Update Install"}
register as application Â
"Uniboard" all notifications allNotificationsList Â
default notifications enabledNotificationsList Â
icon of application "Uniboard"
notify with name Â
"Uniboard Update Install" title Â
"Uniboard" description Â
"Uniboard is installing a new version." application name "Uniboard"
end tell
end if
\ No newline at end of file
resources/macx/upgrade.sh deleted 100644 → 0
View file @ 06a8d52c
# --------------------------------------------------------------------
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# ---------------------------------------------------------------------
#!/bin/bash
#
# Usage: upgrade.sh "Uniboard 4.3.5" "/Users/Name/Downloads/Uniboard 4.3.5.dmg" "/Applications/Uniboard.app"
#
DMG_NAME=$1
DMG_PATH=$2
TARGET_PATH=$3
umount "$DMG_NAME" 2> /dev/null
hdiutil attach "$DMG_PATH" -nobrowse
rm -rf "$TARGET_PATH"
cp -R "/Volumes/$DMG_NAME/Uniboard.app" "$TARGET_PATH"
hdiutil detach "/Volumes/$DMG_NAME"
open $TARGET_PATH
src/frameworks/UBPlatformUtils_mac.mm
View file @ c42faa7e
......@@ -74,12 +74,12 @@ void UBPlatformUtils::init()
NSFileManager *fileManager = [NSFileManager defaultManager];
[fileManager removeFileAtPath:installedPath handler:nil];
// removing the old version of the script named Save PDF to Uniboard
[fileManager removeFileAtPath:[[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to Uniboard"] stringByAppendingPathExtension:@"workflow"] handler:nil];
[fileManager removeFileAtPath:[[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to OpenBoard"] stringByAppendingPathExtension:@"workflow"] handler:nil];
[fileManager createDirectoryAtPath:[installedPath stringByDeletingLastPathComponent] attributes:nil];
BOOL copyOK = [fileManager copyPath:currentPath toPath:installedPath handler:nil];
if (!copyOK)
{
qWarning("Could not install the 'Save PDF to Open-Sankoré workflow");
qWarning("Could not install the 'Save PDF to OpenBoard workflow");
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment