CHANGE: updated installer code

firefly.py

@@ -17,11 +17,11 @@
 
 # #-------------------------------------------------------------------------------
 # # Load firefly components
-orun('config.py')
-orun('colormapConfig.py')
-orun('render.py')
-orun('loader.py')
-orun('flyControl.py')
+orun('firefly/config.py')
+orun('firefly/colormapConfig.py')
+orun('firefly/render.py')
+orun('firefly/loader.py')
+orun('firefly/flyControl.py')
 
 #-------------------------------------------------------------------------------
 # Application state

install-config/config-offline.xml.in

@@ -5,11 +5,10 @@
     <Title>Firefly</Title>
     <Publisher>The Firefly team</Publisher>
     <StartMenuDir>Firefly</StartMenuDir>
-    <TargetDir>@@ApplicationsDir@@/firefly</TargetDir>
+    <TargetDir>@@ApplicationsDir@@/firefly.app</TargetDir>
     <ProductUrl>http://www.github.com/febret/firefly/</ProductUrl>
-    <InstallerApplicationIcon>omega64-transparent</InstallerApplicationIcon>
-    <Logo>watermark.png</Logo>
-    <Banner>banner.png</Banner>
+    <InstallerApplicationIcon>icon</InstallerApplicationIcon>
+    <Logo>icon.png</Logo>
     <CreateLocalRepository>True</CreateLocalRepository>
     <MaintenanceToolName>UninstallFirefly</MaintenanceToolName>
 </Installer>

install-config/installscript.js

@@ -7,8 +7,21 @@ Component.prototype.createOperations = function(archive)
     component.createOperations(archive);
 
 	if(typeof systemInfo != "undefined" && systemInfo.kernelType != "winnt") {
+	    // NOTE: This is specific for OSX, not linux!
+
+	    // Create links to Chromium embedded framework resources file
+		component.addOperation("Execute", "mkdir", "-p", "@TargetDir@/Contents/Frameworks/Chromium Embedded Framework.framework", 
+			"UNDOEXECUTE", "rm", "-rf", "@TargetDir@/Contents/Frameworks/Chromium Embedded Framework.framework");
+
+	    // Create links to Chromium embedded framework resources file
+		component.addOperation("Execute", "ln", "-s", "@TargetDir@/bin/Resources", "@TargetDir@/Contents/Frameworks/Chromium Embedded Framework.framework/Resources");
+		component.addOperation("Execute", "ln", "-s", "@TargetDir@/bin", "@TargetDir@/Contents/MacOS");
+
 		// Create links to executable and data in /usr
-		component.addOperation("Execute", "ln", "-s", "@TargetDir@/bin/orun", "/usr/local/bin/firefly", 
+		component.addOperation("Execute", "ln", "-s", "@TargetDir@/Contents/MacOS/orun", "/usr/local/bin/firefly", 
 			"UNDOEXECUTE", "rm", "/usr/local/bin/firefly");
+
+		component.addOperation("Execute", "ln", "-s", "@TargetDir@/UninstallFirefly.app/Contents/MacOS/UninstallFirefly", "/usr/local/bin/firefly-uninstall", 
+			"UNDOEXECUTE", "rm", "/usr/local/bin/firefly-uninstall");
     }
 }