Bump the version number in configure.ac to 1.0.5

[moonshot-ui.git] / mac / moonshot-ui.bundle

diff --git a/mac/moonshot-ui.bundle b/mac/moonshot-ui.bundle
index 2bcbe1c..d2da9b1 100644 (file)
--- a/mac/moonshot-ui.bundle
+++ b/mac/moonshot-ui.bundle
@@ -12,20 +12,22 @@
          defined by jhbuild, so it you are not using jhbuild you can
          either define your own or just hardcode the path here.
     -->
-    <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
+      <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
+      <prefix name="installer-dir">${env:HOME}/moonshot/mac-client-installer/moonshot-ui/</prefix>
+         <prefix name="dbus-source-dir">${env:HOME}/gtk/source/dbus-1.4.16/</prefix>
 
     <!-- The project directory is the default location of the created
          app. If you leave out the path, the current directory is
          used. Note the usage of an environment variable here again.
     -->
-    <destination overwrite="yes"></destination>
+    <destination overwrite="yes">${prefix:installer-dir}</destination>
 
     <image>
       <!-- Not implemented yet (DMG image). -->
     </image>
 
     <!-- Comment this out to keep the install names in binaries -->
-    <run-install-name-tool/>
+    <!--<run-install-name-tool/>-->
  
     <!-- Optionally specify a launcher script to use. If the
          application sets up everything needed itself, like
@@ -35,10 +37,6 @@
     -->
     <launcher-script>${project}/launcher.sh</launcher-script >
 
-    <!-- Not implemented: Optional runtime, could be python or mono
-         for example.
-    -->
-    <!-- runtime copy="yes">/usr/bin/python</runtime -->
     <!-- Indicate the active gtk version to use. This is needed only
          for gtk+-3.0 projects. -->
     <gtk>gtk+-2.0</gtk>
@@ -50,7 +48,8 @@
   -->
   <plist>${project}/moonshot-ui.plist</plist>
 
-  <main-binary>${prefix}/bin/moonshot</main-binary>
+ <!--   <main-binary>${prefix:installer-dir}bin/moonshot</main-binary>-->
+    <main-binary>${prefix}/bin/moonshot</main-binary>
 
   <!-- Copy in GTK+ modules.  Note the ${gtkdir} macro, which expands
        to the correct library subdirectory for the specified gtk
@@ -78,6 +77,16 @@
     ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/*.so
   </binary>
 
+<!-- DBUS -->
+       <binary>${prefix}/bin/dbus-*</binary>
+       <!-- org.janet.Moonshot.service -->
+       <data>${prefix}/share/dbus-1</data>
+       <binary>${prefix}/libexec/dbus-daemon-launch-helper</binary>
+       <data dest="${bundle}/Contents/Resources/etc/dbus-1/session.d/">${prefix:dbus-source-dir}/test/data/valid-config-files/session.d/</data> 
+       <!-- session.conf: we're not shipping system.conf -->
+       <data dest="${bundle}/Contents/Resources/etc/dbus-1/session.conf">${prefix:dbus-source-dir}/bus/session.conf</data>
+       
+       
   <!-- Translation filenames, one for each program or library that you
        want to copy in to the bundle. The "dest" attribute is
        optional, as usual. Bundler will find all translations of that
@@ -86,7 +95,6 @@
     ${prefix}/share/locale
   </translations>
 
-
   <!-- Data to copy in, usually Glade/UI files, images, sounds files
        etc. The destination inside the bundle can be specified if the
        files should end up at a different location, by using the
@@ -99,17 +107,10 @@
 
   <!-- Copy in the themes data. You may want to trim this to save space
        in your bundle. -->
-  <data>
-    ${prefix}/share/themes
-  </data>
+       <data>${prefix}/share/themes/Default</data>
 
-  <!-- Copy icons. Note that the .icns file is an Apple format which
-       contains up to 4 sizes of icon. You can use
-       /Developer/Applications/Utilities/Icon Composer.app to import
-       artwork and create the file. >
-  <data dest="${bundle}/Contents/Resources">
-    ${project}/Giggle.icns
-  </data -->
+       <!-- App icon -->
+       <data dest="${bundle}/Contents/Resources">${project}/moonshot-ui.icns</data>
 
   <!-- This is where theme commands go. You can copy them in from your
        theme of choice if they provide and example, or you can just