Skip to content

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

Fixed issue http://188.165.53.52/jira/browse/SANKORE-306

parent 817168d9
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 14 deletions
Open-Sankore.packproj
View file @ 87ef37b7
...@@ -433,6 +433,8 @@ ...@@ -433,6 +433,8 @@
<dict> <dict>
<key>Path</key> <key>Path</key>
<string></string> <string></string>
<key>Path Type</key>
<integer>2</integer>
<key>Status</key> <key>Status</key>
<false/> <false/>
</dict> </dict>
......
Sankore_3.1.pro
View file @ 87ef37b7
...@@ -166,7 +166,7 @@ macx { ...@@ -166,7 +166,7 @@ macx {
UB_THIRDPARTY_INTERACTIVE.path = "$$RESOURCES_DIR/library/interactive" UB_THIRDPARTY_INTERACTIVE.path = "$$RESOURCES_DIR/library/interactive"
UB_MACX_ICNS.files = $$files(resources/macx/*.icns) UB_MACX_ICNS.files = $$files(resources/macx/*.icns)
UB_MACX_ICNS.path = "$$RESOURCES_DIR" UB_MACX_ICNS.path = "$$RESOURCES_DIR"
UB_MACX_EXTRAS.files = "resources/macx/Save PDF to Uniboard.workflow" UB_MACX_EXTRAS.files = "resources/macx/Save PDF to Open-Sankore.workflow"
UB_MACX_EXTRAS.path = "$$RESOURCES_DIR" UB_MACX_EXTRAS.path = "$$RESOURCES_DIR"
UB_I18N.path = $$DESTDIR/i18n # not used UB_I18N.path = $$DESTDIR/i18n # not used
......
release.macx.sh
View file @ 87ef37b7
...@@ -99,9 +99,9 @@ else ...@@ -99,9 +99,9 @@ else
fi fi
fi fi
#if [ $? != 0 ]; then if [ $? != 0 ]; then
# abort "compilation failed" abort "compilation failed"
#fi fi
NAME="Open-Sankore" NAME="Open-Sankore"
...@@ -135,7 +135,10 @@ $DSYMUTIL "$APP/Contents/MacOS/Open-Sankore" -o "$DSYM" ...@@ -135,7 +135,10 @@ $DSYMUTIL "$APP/Contents/MacOS/Open-Sankore" -o "$DSYM"
$STRIP -S "$APP/Contents/MacOS/Open-Sankore" $STRIP -S "$APP/Contents/MacOS/Open-Sankore"
if [ "$1" == "pkg" ]; then if [ "$1" == "pkg" ]; then
ICEBERG_CONFIG_FILE="Open-Sankore.packproj" BASE_ICEBERG_CONFIG_FILE="Open-Sankore.packproj"
#copy the standard file for working with
ICEBERG_CONFIG_FILE="Open-Sankore-working.packproj"
cp -r $BASE_ICEBERG_CONFIG_FILE $ICEBERG_CONFIG_FILE
# set version information # set version information
$PLISTBUDDY -c "Set :Hierarchy:Attributes:Settings:Description:International:IFPkgDescriptionVersion $VERSION" "$ICEBERG_CONFIG_FILE" $PLISTBUDDY -c "Set :Hierarchy:Attributes:Settings:Description:International:IFPkgDescriptionVersion $VERSION" "$ICEBERG_CONFIG_FILE"
$PLISTBUDDY -c "Set :Hierarchy:Attributes:Settings:Display\ Information:CFBundleShortVersionString $VERSION" "$ICEBERG_CONFIG_FILE" $PLISTBUDDY -c "Set :Hierarchy:Attributes:Settings:Display\ Information:CFBundleShortVersionString $VERSION" "$ICEBERG_CONFIG_FILE"
...@@ -149,6 +152,10 @@ if [ "$1" == "pkg" ]; then ...@@ -149,6 +152,10 @@ if [ "$1" == "pkg" ]; then
mkdir -p "${PRODUCT_DIR}" mkdir -p "${PRODUCT_DIR}"
fi fi
$ICEBERG $ICEBERG_CONFIG_FILE $ICEBERG $ICEBERG_CONFIG_FILE
#clean up mess
rm -rf $ICEBERG_CONFIG_FILE
exit 0 exit 0
fi fi
......
resources/macx/Info.plist
View file @ 87ef37b7
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>Uniboard.icns</string> <string>Uniboard.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.sankore.open-sankore</string> <string>org.eduxia.open-sankore</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
......
resources/macx/Save PDF to Uniboard.workflow/Contents/Info.plist → resources/macx/Save PDF to Open-Sankore.workflow/Contents/Info.plist
View file @ 87ef37b7
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.mnemis.pdfworkflow.savepdftouniboard</string> <string>com.eduxia.pdfworkflow.savepdftoopensankore</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>Save PDF to Uniboard</string> <string>Save PDF to Open-Sankoré</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>BNDL</string> <string>BNDL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0</string> <string>1.0</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>UniB</string> <string>EduX</string>
</dict> </dict>
</plist> </plist>
resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings 0 → 100644
View file @ 87ef37b7
B/* Localized versions of Info.plist keys */ B/* Localized versions of Info.plist keys */
resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/German.lproj/InfoPlist.strings 0 → 100644
View file @ 87ef37b7
B/* Localized versions of Info.plist keys */ B/* Localized versions of Info.plist keys */
resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings 0 → 100644
View file @ 87ef37b7
B/* Localized versions of Info.plist keys */ B/* Localized versions of Info.plist keys */
resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/fi.lproj/InfoPlist.strings 0 → 100644
View file @ 87ef37b7
B/* Localized versions of Info.plist keys */ B/* Localized versions of Info.plist keys */
resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/no.lproj/InfoPlist.strings 0 → 100644
View file @ 87ef37b7
B/* Localized versions of Info.plist keys */ B/* Localized versions of Info.plist keys */
resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/pt.lproj/InfoPlist.strings 0 → 100644
View file @ 87ef37b7
B/* Localized versions of Info.plist keys */ B/* Localized versions of Info.plist keys */
resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/sv.lproj/InfoPlist.strings 0 → 100644
View file @ 87ef37b7
B/* Localized versions of Info.plist keys */ B/* Localized versions of Info.plist keys */
resources/macx/Save PDF to Uniboard.workflow/Contents/document.wflow → resources/macx/Save PDF to Open-Sankore.workflow/Contents/document.wflow
View file @ 87ef37b7
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<key>ActionParameters</key> <key>ActionParameters</key>
<dict> <dict>
<key>COMMAND_STRING</key> <key>COMMAND_STRING</key>
<string>open -b com.mnemis.Uniboard "$1"</string> <string>open -b org.eduxia.open-sankore "$1"</string>
<key>CheckedForUserDefaultShell</key> <key>CheckedForUserDefaultShell</key>
<true/> <true/>
<key>inputMethod</key> <key>inputMethod</key>
......
resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings deleted 100644 → 0
View file @ 817168d9
Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings and /dev/null differ Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings and /dev/null differ
resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/ko.lproj/InfoPlist.strings deleted 100644 → 0
View file @ 817168d9
Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/ko.lproj/InfoPlist.strings and /dev/null differ Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/ko.lproj/InfoPlist.strings and /dev/null differ
resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/no.lproj/InfoPlist.strings deleted 100644 → 0
View file @ 817168d9
Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/no.lproj/InfoPlist.strings and /dev/null differ Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/no.lproj/InfoPlist.strings and /dev/null differ
resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/pt.lproj/InfoPlist.strings deleted 100644 → 0
View file @ 817168d9
Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/pt.lproj/InfoPlist.strings and /dev/null differ Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/pt.lproj/InfoPlist.strings and /dev/null differ
resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/sv.lproj/InfoPlist.strings deleted 100644 → 0
View file @ 817168d9
Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/sv.lproj/InfoPlist.strings and /dev/null differ Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/sv.lproj/InfoPlist.strings and /dev/null differ
resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings deleted 100644 → 0
View file @ 817168d9
Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings and /dev/null differ Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings and /dev/null differ
resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings deleted 100644 → 0
View file @ 817168d9
Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings and /dev/null differ Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings and /dev/null differ
src/frameworks/UBPlatformUtils_mac.mm
View file @ 87ef37b7
...@@ -48,8 +48,8 @@ void UBPlatformUtils::init() ...@@ -48,8 +48,8 @@ void UBPlatformUtils::init()
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSString *currentPath = [[NSBundle mainBundle] pathForResource:@"Save PDF to Sankore" ofType:@"workflow"]; NSString *currentPath = [[NSBundle mainBundle] pathForResource:@"Save PDF to Open-Sankore" ofType:@"workflow"];
NSString *installedPath = [[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to Sankore"] stringByAppendingPathExtension:@"workflow"]; NSString *installedPath = [[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to Open-Sankore"] stringByAppendingPathExtension:@"workflow"];
NSString *currentVersion = bundleShortVersion([NSBundle bundleWithPath:currentPath]); NSString *currentVersion = bundleShortVersion([NSBundle bundleWithPath:currentPath]);
NSString *installedVersion = bundleShortVersion([NSBundle bundleWithPath:installedPath]); NSString *installedVersion = bundleShortVersion([NSBundle bundleWithPath:installedPath]);
...@@ -57,16 +57,17 @@ void UBPlatformUtils::init() ...@@ -57,16 +57,17 @@ void UBPlatformUtils::init()
{ {
NSFileManager *fileManager = [NSFileManager defaultManager]; NSFileManager *fileManager = [NSFileManager defaultManager];
[fileManager removeFileAtPath:installedPath handler:nil]; [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 createDirectoryAtPath:[installedPath stringByDeletingLastPathComponent] attributes:nil]; [fileManager createDirectoryAtPath:[installedPath stringByDeletingLastPathComponent] attributes:nil];
BOOL copyOK = [fileManager copyPath:currentPath toPath:installedPath handler:nil]; BOOL copyOK = [fileManager copyPath:currentPath toPath:installedPath handler:nil];
if (!copyOK) if (!copyOK)
{ {
qWarning("Could not install the 'Save PDF to Sankore' workflow"); qWarning("Could not install the 'Save PDF to Open-Sankoré workflow");
} }
} }
[pool drain]; [pool drain];
} }
......
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