USe the gitorious repo for cyrus-sasl for now (to get roung the problem of framerwors...

diff --git a/mac-client-installer/README.MacOsBuildInstructions b/mac-client-installer/README.MacOsBuildInstructions
index a15816d..eba65bd 100644 (file)
--- a/mac-client-installer/README.MacOsBuildInstructions
+++ b/mac-client-installer/README.MacOsBuildInstructions
@@ -5,20 +5,32 @@
 # install jhbuild
 Install jhbuild, which Creates working folder ~/gtk
 
+# install gtk-mac-bundler
+Either$ cd ~
+$ wget http://ftp.gnome.org/pub/gnome/sources/gtk-mac-bundler/0.6/gtk-mac-bundler-0.6.1.tar.bz2
+$ tar jxvf gtk-mac-bundler-0.6.1.tar.gz
+$ cd gtk-mac-bundler-0.6.1
+$ make install
+
+or, to use the most recent code:
+$ git clone git://git.gnome.org/gtk-mac-bundler
+$ cd gtk-mac-bundler
+$ make install
+
 # bootstrap jhbuild
 copy file moonshot/mac-client-installer/.jhbuildrc-custom to $HOME
 then
 $ jhbuild bootstrap --ignore-system
 
 # Kerberos 
-Need MIT Kerberos 1.9.2 installed 
-- in ~/gtk/inst - in the Krb5 src directory 
+Need MIT Kerberos 1.9.2 installed in ~/gtk/inst 
+- in the Krb5 src directory 
 $ export CFLAGS="-arch i386"
 $ ./configure --prefix=/Users/pete/gtk/inst/
 $ make
 $ make install
 
-# Building the moonshot SW
+## Building the moonshot SW
 $ jhbuild build  meta-moonshot-mac-client
 Will cause the following errors
 
@@ -32,8 +44,9 @@ choose [2] Ignore error and continue
 make: *** No targets specified and no makefile found.  Stop.
 *** Error during phase build of cyrus-sasl: ########## Error running make   *** [39/41]
 choose  [4] Start shell
-4
-$ ./configure --prefix /Users/pete/gtk/inst --libdir '/Users/pete/gtk/inst/lib' --with-gss_impl=mit 
+
+$ ./configure --prefix $HOME/moonshot/mac-client-installer/sasl --with-gss_impl=mit
+
 $ exit 
 choose [1] Rerun phase build
 

diff --git a/mac-client-installer/moonshot-mac.modules b/mac-client-installer/moonshot-mac.modules
index 433b1e1..8ead3c3 100644 (file)
--- a/mac-client-installer/moonshot-mac.modules
+++ b/mac-client-installer/moonshot-mac.modules
@@ -12,9 +12,6 @@
     <repository type="git" name="moonshot-ui.gitorious.git"
     href="git@gitorious.codethink.co.uk:moonshot-ui/moonshot-ui.git"/>
     
-    <repository type="git" name="cyrus-sasl.janet.git"
-    href="http://www.project-moonshot.org/git/cyrus-sasl"/>
-    
     <repository type="tarball" name="ftp.cyrus-sasl.org" default="yes"
     href="ftp://ftp.cyrusimap.org/cyrus-sasl/"/>
 
@@ -22,13 +19,14 @@
   <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
     <metamodule id="meta-moonshot-mac-client">
         <dependencies>
-            <dep package="moonshot-ui"/>
             <dep package="cyrus-sasl"/> 
             <dep package="moonshot"/> 
+            <dep package="moonshot-ui"/>
         </dependencies>
     </metamodule>
 
-    <autotools id="moonshot-ui" makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/moonshot-ui" >
+    
+    <autotools id="moonshot-ui" makeinstallargs="install icons app-bundle">
         <branch 
             repo="moonshot.janet.git" module="moonshot-ui.git">
         </branch>
@@ -62,7 +60,7 @@
         </dependencies>
     </tarball>
 
-    
+     
     <autotools id="moonshot" autogenargs="--enable-acceptor=no --with-krb5=$PREFIX"
         makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/moonshot">
         <branch 
@@ -72,15 +70,20 @@
         <dependencies>
        </dependencies>
     </autotools>
-    
-    <autotools id="cyrus-sasl" autogenargs="--with-gss_impl=mit"
+
+    <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="moonshot.janet.git" module="cyrus-sasl.git">
+            repo="moonshotclient.gitorious.git" module="cyrus-sasl.git">
+            <patch file="0002-For-Mac-OS-install-the-framework-in-DESTDIR-Library-.patch" strip="1"/>
         </branch>
         <dependencies>
         </dependencies>
     </autotools>
 
+
 </moduleset>