App file now produced OK

[moonshot.git] / mac-client-installer / moonshot-mac.modules

diff --git a/mac-client-installer/moonshot-mac.modules b/mac-client-installer/moonshot-mac.modules
index 5ab9637..66e5c8c 100644 (file)
--- a/mac-client-installer/moonshot-mac.modules
+++ b/mac-client-installer/moonshot-mac.modules
@@ -2,24 +2,32 @@
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
+    
+    <repository type="git" name="moonshot.janet.git"
+    href="http://www.project-moonshot.org/git"/>
 
     <repository type="git" name="moonshot-ui.janet.git"
     href="http://www.project-moonshot.org/git/moonshot-ui.git"/>
+    
+    <repository type="tarball" name="ftp.cyrus-sasl.org" default="yes"
+    href="ftp://ftp.cyrusimap.org/cyrus-sasl/"/>
 
-    <repository type="git" name="moonshot-ui.gitorious.git"
-    href="git://gitorious.codethink.co.uk/moonshot-ui/moonshot-ui.git"/>
-
-    <include href="gtk-osx.modules"/>
-
+<!--    <include href="gtk-osx.modules"/> -->
+  <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
     <metamodule id="meta-moonshot-mac-client">
         <dependencies>
+            <dep package="cyrus-sasl"/> 
+            <dep package="moonshot"/> 
             <dep package="moonshot-ui"/>
         </dependencies>
     </metamodule>
 
-    <autotools id="moonshot-ui">
+    
+    <autotools id="moonshot-ui" 
+        makeinstallargs="install icons app-bundle">
         <branch 
-        repo="moonshot-ui.gitorious.git"/>
+            repo="moonshot.janet.git" module="moonshot-ui.git">
+        </branch>
         <dependencies>
             <dep package="libgee"/>
             <dep package="dbus-glib"/>
@@ -31,9 +39,13 @@
             <dep package="pango"/>
             <dep package="atk"/>
             <dep package="gdk-pixbuf"/>
-            <dep package="gtk+"/>
-            <dep package="gtk-mac-integration"/>
+            <dep package="gtk+"/> 
+            <dep package="vala"/>
+            <dep package="shared-mime-info"/>
+            <dep package="meta-gtk-osx-themes"/>
             <dep package="meta-gtk-osx-core"/>
+<!--            <dep package="gtk+-3.0"/> -->
+            <dep package="gtk-mac-integration"/>
         </dependencies>
     </autotools>
     
@@ -45,7 +57,24 @@
             <dep package="glib"/>
         </dependencies>
     </tarball>
-    
+
+    <autotools id="moonshot" autogenargs="--enable-acceptor=no --with-krb5=$PREFIX"
+        makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/moonshot">
+        <branch 
+        repo="moonshot.janet.git" module="moonshot.git">
+        <patch file="0001-Move-moonshot-files-up.patch" strip="1"/>
+        </branch>
+    </autotools>
+
+    <repository type="git" name="moonshotclient.gitorious.git"
+    href="git://gitorious.org/moonshot-identity-client"/>
+
+    <autotools id="cyrus-sasl" autogenargs="--prefix $HOME/moonshot/mac-client-installer/sasl --with-gss_impl=mit"
+        makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/sasl">
+        <branch 
+            repo="moonshotclient.gitorious.git" module="cyrus-sasl.git">
+        </branch>
+    </autotools>
 
 
 </moduleset>