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

Open-Sankore.packproj

@@ -433,6 +433,8 @@
 					<dict>
 						<key>Path</key>
 						<string></string>
+						<key>Path Type</key>
+						<integer>2</integer>
 						<key>Status</key>
 						<false/>
 					</dict>

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
 

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
 

resources/macx/Info.plist

@@ -55,7 +55,7 @@
 		<key>CFBundleIconFile</key>
 		<string>Uniboard.icns</string>
 		<key>CFBundleIdentifier</key>
-		<string>com.sankore.open-sankore</string>
+		<string>org.eduxia.open-sankore</string>
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>

resources/macx/Save PDF to Open-Sankore.workflow/Contents/Info.plist

@@ -3,16 +3,16 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleIdentifier</key>
-	<string>com.mnemis.pdfworkflow.savepdftouniboard</string>
+	<string>com.eduxia.pdfworkflow.savepdftoopensankore</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Save PDF to Uniboard</string>
+	<string>Save PDF to Open-Sankoré</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
-	<string>UniB</string>
+	<string>EduX</string>
 </dict>
 </plist>

resources/macx/Save PDF to Open-Sankore.workflow/Contents/document.wflow

@@ -55,7 +55,7 @@
 				<key>ActionParameters</key>
 				<dict>
 					<key>COMMAND_STRING</key>
-					<string>open -b com.mnemis.Uniboard "$1"</string>
+					<string>open -b org.eduxia.open-sankore "$1"</string>
 					<key>CheckedForUserDefaultShell</key>
 					<true/>
 					<key>inputMethod</key>

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];
-
 }