diff --git a/Open-Sankore.packproj b/Open-Sankore.packproj index 14e6d3cf..8ddfa2b8 100644 --- a/Open-Sankore.packproj +++ b/Open-Sankore.packproj @@ -433,6 +433,8 @@ Path + Path Type + 2 Status diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index eccd8421..a295e6fc 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -166,7 +166,7 @@ macx { UB_THIRDPARTY_INTERACTIVE.path = "$$RESOURCES_DIR/library/interactive" UB_MACX_ICNS.files = $$files(resources/macx/*.icns) 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_I18N.path = $$DESTDIR/i18n # not used diff --git a/release.macx.sh b/release.macx.sh index 3152c1e5..31eacf50 100755 --- a/release.macx.sh +++ b/release.macx.sh @@ -99,9 +99,9 @@ else fi fi -#if [ $? != 0 ]; then -# abort "compilation failed" -#fi +if [ $? != 0 ]; then + abort "compilation failed" +fi NAME="Open-Sankore" @@ -135,7 +135,10 @@ $DSYMUTIL "$APP/Contents/MacOS/Open-Sankore" -o "$DSYM" $STRIP -S "$APP/Contents/MacOS/Open-Sankore" 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 $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" @@ -149,6 +152,10 @@ if [ "$1" == "pkg" ]; then mkdir -p "${PRODUCT_DIR}" fi $ICEBERG $ICEBERG_CONFIG_FILE + + #clean up mess + rm -rf $ICEBERG_CONFIG_FILE + exit 0 fi diff --git a/resources/macx/Info.plist b/resources/macx/Info.plist index b5121b1e..c2bbbd02 100644 --- a/resources/macx/Info.plist +++ b/resources/macx/Info.plist @@ -55,7 +55,7 @@ CFBundleIconFile Uniboard.icns CFBundleIdentifier - com.sankore.open-sankore + org.eduxia.open-sankore CFBundlePackageType APPL CFBundleShortVersionString diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Info.plist b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Info.plist similarity index 77% rename from resources/macx/Save PDF to Uniboard.workflow/Contents/Info.plist rename to resources/macx/Save PDF to Open-Sankore.workflow/Contents/Info.plist index 9e0c85df..93bab215 100644 --- a/resources/macx/Save PDF to Uniboard.workflow/Contents/Info.plist +++ b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Info.plist @@ -3,16 +3,16 @@ CFBundleIdentifier - com.mnemis.pdfworkflow.savepdftouniboard + com.eduxia.pdfworkflow.savepdftoopensankore CFBundleInfoDictionaryVersion 6.0 CFBundleName - Save PDF to Uniboard + Save PDF to Open-Sankoré CFBundlePackageType BNDL CFBundleShortVersionString 1.0 CFBundleSignature - UniB + EduX diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings new file mode 100644 index 00000000..bf1f4161 Binary files /dev/null and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/German.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/English.lproj/InfoPlist.strings similarity index 51% rename from resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/German.lproj/InfoPlist.strings rename to resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/English.lproj/InfoPlist.strings index 5c8fc9ac..dedd3a9a 100644 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/German.lproj/InfoPlist.strings and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/English.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/French.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/French.lproj/InfoPlist.strings similarity index 70% rename from resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/French.lproj/InfoPlist.strings rename to resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/French.lproj/InfoPlist.strings index 9e6c9fba..1b98b08a 100644 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/French.lproj/InfoPlist.strings and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/French.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/German.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/German.lproj/InfoPlist.strings new file mode 100644 index 00000000..74a6e053 Binary files /dev/null and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/German.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Italian.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Italian.lproj/InfoPlist.strings similarity index 83% rename from resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Italian.lproj/InfoPlist.strings rename to resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Italian.lproj/InfoPlist.strings index b5316b11..2efc2d10 100644 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Italian.lproj/InfoPlist.strings and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Italian.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Japanese.lproj/InfoPlist.strings similarity index 52% rename from resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings rename to resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Japanese.lproj/InfoPlist.strings index d027f9ed..c55f34ac 100644 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Dutch.lproj/InfoPlist.strings and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Japanese.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings new file mode 100644 index 00000000..c3c1fef0 Binary files /dev/null and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/da.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/da.lproj/InfoPlist.strings similarity index 83% rename from resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/da.lproj/InfoPlist.strings rename to resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/da.lproj/InfoPlist.strings index f1e69f6e..8c4bab6a 100644 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/da.lproj/InfoPlist.strings and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/da.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/fi.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/fi.lproj/InfoPlist.strings new file mode 100644 index 00000000..074c1231 Binary files /dev/null and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/fi.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/ko.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/ko.lproj/InfoPlist.strings similarity index 53% rename from resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/ko.lproj/InfoPlist.strings rename to resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/ko.lproj/InfoPlist.strings index 4598a5a6..910d41e4 100644 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/ko.lproj/InfoPlist.strings and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/ko.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/no.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/no.lproj/InfoPlist.strings new file mode 100644 index 00000000..df0bdeb2 Binary files /dev/null and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/no.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/pt.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/pt.lproj/InfoPlist.strings new file mode 100644 index 00000000..b2b1f155 Binary files /dev/null and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/pt.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/ru.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/ru.lproj/InfoPlist.strings similarity index 83% rename from resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/ru.lproj/InfoPlist.strings rename to resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/ru.lproj/InfoPlist.strings index 2b64922d..1d3142e5 100644 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/ru.lproj/InfoPlist.strings and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/ru.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/sv.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/sv.lproj/InfoPlist.strings new file mode 100644 index 00000000..cf02660a Binary files /dev/null and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/sv.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/English.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings similarity index 52% rename from resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/English.lproj/InfoPlist.strings rename to resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings index 0b70c53b..c13c61ce 100644 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/English.lproj/InfoPlist.strings and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Japanese.lproj/InfoPlist.strings b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings similarity index 52% rename from resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Japanese.lproj/InfoPlist.strings rename to resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings index a49ca268..6289afe1 100644 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Japanese.lproj/InfoPlist.strings and b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/document.wflow b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/document.wflow similarity index 98% rename from resources/macx/Save PDF to Uniboard.workflow/Contents/document.wflow rename to resources/macx/Save PDF to Open-Sankore.workflow/Contents/document.wflow index 6297b154..8cef3b04 100644 --- a/resources/macx/Save PDF to Uniboard.workflow/Contents/document.wflow +++ b/resources/macx/Save PDF to Open-Sankore.workflow/Contents/document.wflow @@ -55,7 +55,7 @@ ActionParameters COMMAND_STRING - open -b com.mnemis.Uniboard "$1" + open -b org.eduxia.open-sankore "$1" CheckedForUserDefaultShell inputMethod diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings b/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings deleted file mode 100644 index d6cf1ae8..00000000 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/Spanish.lproj/InfoPlist.strings and /dev/null differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/fi.lproj/InfoPlist.strings b/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/fi.lproj/InfoPlist.strings deleted file mode 100644 index 7d11ed67..00000000 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/fi.lproj/InfoPlist.strings and /dev/null differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/no.lproj/InfoPlist.strings b/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/no.lproj/InfoPlist.strings deleted file mode 100644 index 8ec50504..00000000 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/no.lproj/InfoPlist.strings and /dev/null differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/pt.lproj/InfoPlist.strings b/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/pt.lproj/InfoPlist.strings deleted file mode 100644 index 10535d52..00000000 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/pt.lproj/InfoPlist.strings and /dev/null differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/sv.lproj/InfoPlist.strings b/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/sv.lproj/InfoPlist.strings deleted file mode 100644 index 23adfe45..00000000 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/sv.lproj/InfoPlist.strings and /dev/null differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings b/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings deleted file mode 100644 index 75799afe..00000000 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_CN.lproj/InfoPlist.strings and /dev/null differ diff --git a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings b/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings deleted file mode 100644 index 30ff4d9f..00000000 Binary files a/resources/macx/Save PDF to Uniboard.workflow/Contents/Resources/zh_TW.lproj/InfoPlist.strings and /dev/null differ diff --git a/resources/macx/UniboardDmgBackground.png b/resources/macx/UniboardDmgBackground.png deleted file mode 100644 index aa87121e..00000000 Binary files a/resources/macx/UniboardDmgBackground.png and /dev/null differ diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm index 0e83e8a3..5d935031 100644 --- a/src/frameworks/UBPlatformUtils_mac.mm +++ b/src/frameworks/UBPlatformUtils_mac.mm @@ -48,8 +48,8 @@ void UBPlatformUtils::init() NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSString *currentPath = [[NSBundle mainBundle] pathForResource:@"Save PDF to Sankore" ofType:@"workflow"]; - NSString *installedPath = [[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to Sankore"] stringByAppendingPathExtension:@"workflow"]; + NSString *currentPath = [[NSBundle mainBundle] pathForResource:@"Save PDF to Open-Sankore" ofType:@"workflow"]; + NSString *installedPath = [[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to Open-Sankore"] stringByAppendingPathExtension:@"workflow"]; NSString *currentVersion = bundleShortVersion([NSBundle bundleWithPath:currentPath]); NSString *installedVersion = bundleShortVersion([NSBundle bundleWithPath:installedPath]); @@ -57,16 +57,17 @@ 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 createDirectoryAtPath:[installedPath stringByDeletingLastPathComponent] attributes:nil]; BOOL copyOK = [fileManager copyPath:currentPath toPath:installedPath handler:nil]; 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]; - }