Builds OK - instructions complete

but old instructions are still present

diff --git a/mac-client-installer/README.MacOsBuildInstructions b/mac-client-installer/README.MacOsBuildInstructions
index 599eec7..a15816d 100644 (file)
--- a/mac-client-installer/README.MacOsBuildInstructions
+++ b/mac-client-installer/README.MacOsBuildInstructions
@@ -1,21 +1,54 @@
 ### Building Mac OS Installer using jhbuild
 
 ## Preparation
+
+# install jhbuild
 Install jhbuild, which Creates working folder ~/gtk
 
-Need Kerberos installed in ~/gtk/inst - in the Krb5 src directory 
+# 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 
 $ export CFLAGS="-arch i386"
 $ ./configure --prefix=/Users/pete/gtk/inst/
 $ make
 $ make install
 
-## Building the moonshot SW
-copy file moonshot/mac-client-installer/.jhbuildrc-custom to $HOME
-then
-$ jhbuild bootstrap
+# Building the moonshot SW
+$ jhbuild build  meta-moonshot-mac-client
+Will cause the following errors
+
+*** Error during phase build of perl-xml-parser: ########## Error running make LD_RUN_PATH= *** [6/37]
+choose  [4] Start shell
+$ git apply ~/moonshot/mac-client-installer/0001-Remove-arch-ppc-flags.patch 
+$ make
+$ exit 
+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 
+$ exit 
+choose [1] Rerun phase build
+
+*** Error during phase configure of moonshot: ########## Error running ./autogen.sh --prefix /Users/pete/gtk/inst --libdir '/Users/pete/gtk/inst/lib' --enable-acceptor=no --with-krb5=$PREFIX/usr/local --enable-acceptor=no  *** [40/41]
+choose [4] Start shell
+$ git apply ~/moonshot/mac-client-installer/0001-Move-moonshot-files-up.patch 
+$ cp -R moonshot/libeap .
+$ ./autogen.sh --prefix /Users/pete/gtk/inst --libdir '/Users/pete/gtk/inst/lib' --enable-acceptor=no 
+$ 4
 
+$ exit
+choose  [1] Rerun phase build
 
 
+### Old instructions
 
 
 ###Introduction

diff --git a/mac-client-installer/moonshot-mac.modules b/mac-client-installer/moonshot-mac.modules
index 90677dd..433b1e1 100644 (file)
--- a/mac-client-installer/moonshot-mac.modules
+++ b/mac-client-installer/moonshot-mac.modules
@@ -30,7 +30,8 @@
 
     <autotools id="moonshot-ui" makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/moonshot-ui" >
         <branch 
-        repo="moonshot-ui.gitorious.git"/>
+            repo="moonshot.janet.git" module="moonshot-ui.git">
+        </branch>
         <dependencies>
             <dep package="libgee"/>
             <dep package="dbus-glib"/>
@@ -62,7 +63,7 @@
     </tarball>
 
     
-    <autotools id="moonshot" autogenargs="--enable-acceptor=no --with-krb5=$PREFIX/usr/local"
+    <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">
@@ -75,7 +76,8 @@
     <autotools id="cyrus-sasl" autogenargs="--with-gss_impl=mit"
         makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/sasl">
         <branch 
-        repo="cyrus-sasl.janet.git"/>
+            repo="moonshot.janet.git" module="cyrus-sasl.git">
+        </branch>
         <dependencies>
         </dependencies>
     </autotools>