build scrip is complete. Need to add moonshot-ui to the document

diff --git a/mac-client-installer/README.MacOsBuildInstructions b/mac-client-installer/README.MacOsBuildInstructions
index fea6242..e2a62bb 100644 (file)
--- a/mac-client-installer/README.MacOsBuildInstructions
+++ b/mac-client-installer/README.MacOsBuildInstructions
@@ -12,24 +12,24 @@ $ 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 to build against - 
+in the Krb5 src directory 
 $ export CFLAGS="-arch i386"
-$ ./configure --prefix=/Users/pete/gtk/inst/
+$ ./configure --prefix=$HOME/gtk/inst/
 $ make
 $ make install
 
+and installed in moonshot/mac-client-installer/ to package up
+$ ./configure
+$ make
+$ make install DESTDIR=$HOME/moonshot/mac-client-installer/krb
+
 ## Building the moonshot SW
 $ jhbuild build  meta-moonshot-mac-client
 Will cause the following errors
@@ -46,9 +46,10 @@ make: *** No targets specified and no makefile found.  Stop.
 choose  [4] Start shell
 
 $ ./configure --prefix $HOME/moonshot/mac-client-installer/sasl --with-gss_impl=mit
-
 $ exit 
 choose [1] Rerun phase build
+*** Error during phase build of cyrus-sasl: ########## Error running make   *** [1/1]
+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

diff --git a/mac-client-installer/build-installer.sh b/mac-client-installer/build-installer.sh
index 6b12287..5783b4a 100755 (executable)
--- a/mac-client-installer/build-installer.sh
+++ b/mac-client-installer/build-installer.sh
@@ -6,12 +6,33 @@
 #  Created by pete on 02/01/2012.
 #  Copyright (c) 2011, JANET(UK)
 
-cp ./.jhbuildrc-custom ~
+#cp ./.jhbuildrc-custom ~
 
-cd ../moonshot && jhbuild run ./configure --enable-acceptor=no --with-krb5=$HOME/gtk/inst && make && make install DESTDIR=$HOME/moonshot/mac-client-installer/moonshot
+#cd ../moonshot && jhbuild run ./configure --enable-acceptor=no --with-krb5=$HOME/gtk/inst && make && make install DESTDIR=$HOME/moonshot/mac-client-installer/moonshot
 
-jhbuild build cyrus-sasl
+#jhbuild build cyrus-sasl
 
-jhbuild build moonshot-ui
+#jhbuild build moonshot-ui
+
+#cd ~/gtk/source/moonshot-ui/ &&  jhbuild run make app-bundle && jhbuild run make installer
+
+hdiutil create -size 2m -fs HFS+ -volname "Moonshot Client Software" temp.dmg 
+
+hdiutil attach temp.dmg 
+
+
+# Copy the package and the READMEs
+cp -R Moonshot\ Client\ Software.pkg /Volumes/Moonshot\ Client\ Software/ 
+# Get rid of hidden files and folders that we don't need
+cp -R resources/*  /Volumes/Moonshot\ Client\ Software/ 
+sudo rm -rf /Volumes/Moonshot\ Client\ Software/.fseventsd/ 
+sudo rm -rf /Volumes/Moonshot\ Client\ Software/.Trashes/ 
+sudo find /Volumes/Moonshot\ Client\ Software -name '.*' -type f -delete
+
+# Unmount the image
+hdiutil detach /Volumes/Moonshot\ Client\ Software 
+
+# Convert the disk image to read-only
+hdiutil convert temp.dmg -format UDZO -o moonshotclientsoftware.dmg 
+rm temp.dmg
 
-cd ~/gtk/source/moonshot-ui/ &&  jhbuild run make app-bundle && jhbuild run make installer
\ No newline at end of file

diff --git a/mac-client-installer/moonshot-mac.modules b/mac-client-installer/moonshot-mac.modules
index c67941b..225ade3 100644 (file)
--- a/mac-client-installer/moonshot-mac.modules
+++ b/mac-client-installer/moonshot-mac.modules
@@ -17,8 +17,8 @@
         </dependencies>
     </metamodule>
 
-    <autotools id="moonshot-ui" autogenargs="--prefix $HOME/moonshot/mac-client-installer/moonshot-ui  --libdir $HOME/moonshot/mac-client-installer/moonshot-ui/lib" 
-        makeinstallargs="install icons">
+    <autotools id="moonshot-ui" autogenargs="--prefix $HOME/moonshot/mac-client-installer/moonshot-ui --libdir '/Users/pete/gtk/inst/lib'" >
+ <!--       makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/moonshot-ui"-->
         <branch 
             repo="moonshot.janet.git" module="moonshot-ui.git">
         </branch>
@@ -56,7 +56,7 @@
     <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">
+            repo="moonshot.janet.git" module="cyrus-sasl.git">
         </branch>
     </autotools>