Automated builds and creation fo installer package and disk image works
authorPete Fotheringham <pete.fotheringham@codethink.co.uk>
Mon, 2 Jan 2012 18:33:40 +0000 (18:33 +0000)
committerPete Fotheringham <pete.fotheringham@codethink.co.uk>
Mon, 2 Jan 2012 18:33:40 +0000 (18:33 +0000)
mac-client-installer/Moonshot Client Software.pmdoc/01krb-contents.xml [deleted file]
mac-client-installer/Moonshot Client Software.pmdoc/01krb.xml [deleted file]
mac-client-installer/Moonshot Client Software.pmdoc/02sasl-contents.xml [deleted file]
mac-client-installer/Moonshot Client Software.pmdoc/02sasl.xml [deleted file]
mac-client-installer/Moonshot Client Software.pmdoc/index.xml
mac-client-installer/README.MacOsBuildInstructions
mac-client-installer/build-installer.sh
mac-client-installer/moonshot-mac.modules
moonshot/build-aux/compile

diff --git a/mac-client-installer/Moonshot Client Software.pmdoc/01krb-contents.xml b/mac-client-installer/Moonshot Client Software.pmdoc/01krb-contents.xml
deleted file mode 100644 (file)
index 2cd2760..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="PackageRoot" o="root" g="admin" p="16893" pt="." m="true" t="bom"><f n="usr" o="root" g="wheel" p="16877"><f n="local" o="root" g="admin" p="16893"><f n="bin" o="root" g="admin" p="16893"><f n="compile_et" o="root" g="admin" p="33261"/><f n="gss-client" o="root" g="admin" p="33261" c="true"/><f n="k5srvutil" o="root" g="admin" p="33261"/><f n="kadmin" o="root" g="admin" p="33261" c="true"/><f n="kdestroy" o="root" g="admin" p="33261" c="true"/><f n="kinit" o="root" g="admin" p="33261" c="true"/><f n="klist" o="root" g="admin" p="33261" c="true"/><f n="kpasswd" o="root" g="admin" p="33261" c="true"/><f n="krb5-config" o="root" g="admin" p="33261"/><f n="ktutil" o="root" g="admin" p="33261" c="true"/><f n="kvno" o="root" g="admin" p="33261" c="true"/><f n="sclient" o="root" g="admin" p="33261" c="true"/><f n="sim_client" o="root" g="admin" p="33261" c="true"/><f n="uuclient" o="root" g="admin" p="33261" c="true"/></f><f n="include" o="pete" g="admin" p="16877"><f n="com_err.h" o="root" g="admin" p="33188"/><f n="gssapi" o="root" g="admin" p="16877"><f n="gssapi.h" o="root" g="admin" p="33188"/><f n="gssapi_ext.h" o="root" g="admin" p="33188"/><f n="gssapi_generic.h" o="root" g="admin" p="33188"/><f n="gssapi_krb5.h" o="root" g="admin" p="33188"/><f n="mechglue.h" o="root" g="admin" p="33188"/></f><f n="gssapi.h" o="root" g="admin" p="33188"/><f n="gssrpc" o="root" g="admin" p="16877"><f n="auth.h" o="root" g="admin" p="33188"/><f n="auth_gss.h" o="root" g="admin" p="33188"/><f n="auth_gssapi.h" o="root" g="admin" p="33188"/><f n="auth_unix.h" o="root" g="admin" p="33188"/><f n="clnt.h" o="root" g="admin" p="33188"/><f n="netdb.h" o="root" g="admin" p="33188"/><f n="pmap_clnt.h" o="root" g="admin" p="33188"/><f n="pmap_prot.h" o="root" g="admin" p="33188"/><f n="pmap_rmt.h" o="root" g="admin" p="33188"/><f n="rename.h" o="root" g="admin" p="33188"/><f n="rpc.h" o="root" g="admin" p="33188"/><f n="rpc_msg.h" o="root" g="admin" p="33188"/><f n="svc.h" o="root" g="admin" p="33188"/><f n="svc_auth.h" o="root" g="admin" p="33188"/><f n="types.h" o="root" g="admin" p="33188"/><f n="xdr.h" o="root" g="admin" p="33188"/></f><f n="kadm5" o="root" g="admin" p="16877"><f n="admin.h" o="root" g="admin" p="33188"/><f n="chpass_util_strings.h" o="root" g="admin" p="33188"/><f n="kadm_err.h" o="root" g="admin" p="33188"/></f><f n="kdb.h" o="root" g="admin" p="33188"/><f n="krb5" o="root" g="admin" p="16877"><f n="kadm5_hook_plugin.h" o="root" g="admin" p="33188"/><f n="krb5.h" o="root" g="admin" p="33188"/><f n="locate_plugin.h" o="root" g="admin" p="33188"/><f n="plugin.h" o="root" g="admin" p="33188"/><f n="pwqual_plugin.h" o="root" g="admin" p="33188"/></f><f n="krb5.h" o="root" g="admin" p="33188"/><f n="profile.h" o="root" g="admin" p="33188"/></f><f n="lib" o="pete" g="admin" p="16877"><f n="krb5" o="root" g="admin" p="16877"><f n="plugins" o="root" g="admin" p="16877"><f n="authdata" o="root" g="admin" p="16877"/><f n="kdb" o="root" g="admin" p="16877"><f n="db2.so" o="root" g="admin" p="33188" c="true"/></f><f n="libkrb5" o="root" g="admin" p="16877"/><f n="preauth" o="root" g="admin" p="16877"><f n="encrypted_challenge.so" o="root" g="admin" p="33188" c="true"/><f n="pkinit.so" o="root" g="admin" p="33188" c="true"/></f></f></f><f n="libcom_err.3.0.dylib" o="root" g="admin" p="33188" c="true"/><f n="libcom_err.3.dylib" o="pete" g="wheel" p="41453"/><f n="libcom_err.dylib" o="pete" g="wheel" p="41453"/><f n="libgssapi_krb5.2.2.dylib" o="root" g="admin" p="33188" c="true"/><f n="libgssapi_krb5.2.dylib" o="pete" g="wheel" p="41453"/><f n="libgssapi_krb5.dylib" o="pete" g="wheel" p="41453"/><f n="libgssrpc.4.1.dylib" o="root" g="admin" p="33188" c="true"/><f n="libgssrpc.4.dylib" o="pete" g="wheel" p="41453"/><f n="libgssrpc.dylib" o="pete" g="wheel" p="41453"/><f n="libk5crypto.3.1.dylib" o="root" g="admin" p="33188" c="true"/><f n="libk5crypto.3.dylib" o="pete" g="wheel" p="41453"/><f n="libk5crypto.dylib" o="pete" g="wheel" p="41453"/><f n="libkadm5clnt.dylib" o="pete" g="wheel" p="41453"/><f n="libkadm5clnt_mit.8.0.dylib" o="root" g="admin" p="33188" c="true"/><f n="libkadm5clnt_mit.8.dylib" o="pete" g="wheel" p="41453"/><f n="libkadm5clnt_mit.dylib" o="pete" g="wheel" p="41453"/><f n="libkadm5srv.dylib" o="pete" g="wheel" p="41453"/><f n="libkadm5srv_mit.8.0.dylib" o="root" g="admin" p="33188" c="true"/><f n="libkadm5srv_mit.8.dylib" o="pete" g="wheel" p="41453"/><f n="libkadm5srv_mit.dylib" o="pete" g="wheel" p="41453"/><f n="libkdb5.5.0.dylib" o="root" g="admin" p="33188" c="true"/><f n="libkdb5.5.dylib" o="pete" g="wheel" p="41453"/><f n="libkdb5.dylib" o="pete" g="wheel" p="41453"/><f n="libkrb5.3.3.dylib" o="root" g="admin" p="33188" c="true"/><f n="libkrb5.3.dylib" o="pete" g="wheel" p="41453"/><f n="libkrb5.dylib" o="pete" g="wheel" p="41453"/><f n="libkrb5support.1.1.dylib" o="root" g="admin" p="33188" c="true"/><f n="libkrb5support.1.dylib" o="pete" g="wheel" p="41453"/><f n="libkrb5support.dylib" o="pete" g="wheel" p="41453"/></f><f n="sbin" o="root" g="admin" p="16877"><f n="gss-server" o="root" g="admin" p="33261" c="true"/><f n="kadmin.local" o="root" g="admin" p="33261" c="true"/><f n="kadmind" o="root" g="admin" p="33261" c="true"/><f n="kdb5_util" o="root" g="admin" p="33261" c="true"/><f n="kprop" o="root" g="admin" p="33261" c="true"/><f n="kpropd" o="root" g="admin" p="33261" c="true"/><f n="kproplog" o="root" g="admin" p="33261" c="true"/><f n="krb5-send-pr" o="root" g="admin" p="33261"/><f n="krb5kdc" o="root" g="admin" p="33261" c="true"/><f n="sim_server" o="root" g="admin" p="33261" c="true"/><f n="sserver" o="root" g="admin" p="33261" c="true"/><f n="uuserver" o="root" g="admin" p="33261" c="true"/></f><f n="share" o="pete" g="admin" p="16877"><f n="et" o="root" g="admin" p="16877"><f n="et_c.awk" o="root" g="admin" p="33188"/><f n="et_h.awk" o="root" g="admin" p="33188"/></f><f n="examples" o="root" g="admin" p="16877"><f n="krb5" o="root" g="admin" p="16877"><f n="kdc.conf" o="root" g="admin" p="33188"/><f n="krb5.conf" o="root" g="admin" p="33188"/><f n="services.append" o="root" g="admin" p="33188"/></f></f><f n="gnats" o="root" g="admin" p="16877"><f n="mit" o="root" g="admin" p="33188"/></f><f n="man" o="pete" g="admin" p="16877"><f n="man1" o="pete" g="admin" p="16877"><f n="compile_et.1" o="root" g="admin" p="33188"/><f n="k5srvutil.1" o="root" g="admin" p="33188"/><f n="kadmin.1" o="root" g="admin" p="33188"/><f n="kdestroy.1" o="root" g="admin" p="33188"/><f n="kerberos.1" o="root" g="admin" p="33188"/><f n="kinit.1" o="root" g="admin" p="33188"/><f n="klist.1" o="root" g="admin" p="33188"/><f n="kpasswd.1" o="root" g="admin" p="33188"/><f n="krb5-config.1" o="root" g="admin" p="33188"/><f n="krb5-send-pr.1" o="root" g="admin" p="33188"/><f n="ksu.1" o="root" g="admin" p="33188"/><f n="ktutil.1" o="root" g="admin" p="33188"/><f n="kvno.1" o="root" g="admin" p="33188"/><f n="sclient.1" o="root" g="admin" p="33188"/></f><f n="man5" o="pete" g="admin" p="16893"><f n=".k5login.5" o="root" g="admin" p="33188"/><f n="kdc.conf.5" o="root" g="admin" p="33188"/><f n="krb5.conf.5" o="root" g="admin" p="33188"/></f><f n="man8" o="root" g="admin" p="16877"><f n="kadmin.local.8" o="root" g="admin" p="33188"/><f n="kadmind.8" o="root" g="admin" p="33188"/><f n="kdb5_util.8" o="root" g="admin" p="33188"/><f n="kprop.8" o="root" g="admin" p="33188"/><f n="kpropd.8" o="root" g="admin" p="33188"/><f n="kproplog.8" o="root" g="admin" p="33188"/><f n="krb5kdc.8" o="root" g="admin" p="33188"/><f n="sserver.8" o="root" g="admin" p="33188"/></f></f></f><f n="var" o="root" g="admin" p="16877"><f n="krb5kdc" o="root" g="admin" p="16877"/></f></f></f><mod>name</mod></f></pkg-contents>
\ No newline at end of file
diff --git a/mac-client-installer/Moonshot Client Software.pmdoc/01krb.xml b/mac-client-installer/Moonshot Client Software.pmdoc/01krb.xml
deleted file mode 100644 (file)
index 5152aef..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="F6084A5E-8184-47F2-91F0-494AF1D4F93A"><config><identifier>ja.net.moonshotClientSoftware.mech_eap.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installTo>/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installSizeKB</mod><mod>installTo</mod><mod>postInstall</mod><mod>hashDigest</mod><mod>filePrefix</mod><mod>requireAuthorization</mod><mod>identifier</mod><mod>version</mod><mod>parent</mod></config><contents><file-list>01krb-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra><packagePath>/Users/pete/installerbuild/Moonshot Client Software.pkg</packagePath><title>krb</title><file-prefix>krb.pkg</file-prefix></extra><additionalPkgInfoXML><pkg-info><payload installKBytes="3740" numberOfFiles="151"/></pkg-info></additionalPkgInfoXML></pkgref>
\ No newline at end of file
diff --git a/mac-client-installer/Moonshot Client Software.pmdoc/02sasl-contents.xml b/mac-client-installer/Moonshot Client Software.pmdoc/02sasl-contents.xml
deleted file mode 100644 (file)
index 4c061df..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="PackageRoot" o="root" g="admin" p="16893" pt="." m="true" t="bom"><f n="Library" o="root" g="admin" p="17405"><f n="Frameworks" o="root" g="admin" p="16893"><f n="SASL2.framework" o="pete" g="admin" p="16877"><f n="Headers" o="pete" g="wheel" p="41453"/><f n="Resources" o="pete" g="wheel" p="41453"/><f n="SASL2" o="pete" g="wheel" p="41453"/><f n="Versions" o="pete" g="admin" p="16877"><f n="A" o="pete" g="admin" p="16877"><f n="Headers" o="pete" g="admin" p="16893"><f n="hmac-md5.h" o="pete" g="admin" p="33204"/><f n="md5.h" o="pete" g="admin" p="33204"/><f n="md5global.h" o="pete" g="admin" p="33204"/><f n="prop.h" o="pete" g="admin" p="33204"/><f n="sasl.h" o="pete" g="admin" p="33204"/><f n="saslplug.h" o="pete" g="admin" p="33204"/><f n="saslutil.h" o="pete" g="admin" p="33204"/></f><f n="Resources" o="pete" g="admin" p="16893"><f n="Info.plist" o="pete" g="admin" p="33204"/></f><f n="SASL2" o="pete" g="wheel" p="41453"/></f><f n="Current" o="pete" g="wheel" p="41453"/></f></f></f></f><f n="usr" o="root" g="wheel" p="16877"><f n="lib" o="root" g="wheel" p="16877"><f n="sasl2" o="pete" g="wheel" p="41453"/></f><f n="local" o="root" g="admin" p="16893"><f n="include" o="pete" g="admin" p="16877"><f n="sasl" o="pete" g="admin" p="16893"><f n="hmac-md5.h" o="pete" g="admin" p="33204"/><f n="md5.h" o="pete" g="admin" p="33204"/><f n="md5global.h" o="pete" g="admin" p="33204"/><f n="prop.h" o="pete" g="admin" p="33204"/><f n="sasl.h" o="pete" g="admin" p="33204"/><f n="saslplug.h" o="pete" g="admin" p="33204"/><f n="saslutil.h" o="pete" g="admin" p="33204"/></f></f><f n="lib" o="pete" g="admin" p="16877"><f n="libsasl2.2.0.23.dylib" o="pete" g="wheel" p="41453"/><f n="libsasl2.2.dylib" o="pete" g="admin" p="33277" c="true"/><f n="libsasl2.dylib" o="pete" g="wheel" p="41453"/><f n="libsasl2.la" o="pete" g="admin" p="33277"/><f n="sasl2" o="pete" g="admin" p="16893"><f n="libanonymous.2.0.23.so" o="pete" g="wheel" p="41453"/><f n="libanonymous.2.so" o="pete" g="admin" p="33277" c="true"/><f n="libanonymous.la" o="pete" g="admin" p="33277"/><f n="libanonymous.so" o="pete" g="wheel" p="41453"/><f n="libcrammd5.2.0.23.so" o="pete" g="wheel" p="41453"/><f n="libcrammd5.2.so" o="pete" g="admin" p="33277" c="true"/><f n="libcrammd5.la" o="pete" g="admin" p="33277"/><f n="libcrammd5.so" o="pete" g="wheel" p="41453"/><f n="libdigestmd5.2.0.23.so" o="pete" g="wheel" p="41453"/><f n="libdigestmd5.2.so" o="pete" g="admin" p="33277" c="true"/><f n="libdigestmd5.la" o="pete" g="admin" p="33277"/><f n="libdigestmd5.so" o="pete" g="wheel" p="41453"/><f n="libgs2.2.0.23.so" o="pete" g="wheel" p="41453"/><f n="libgs2.2.so" o="pete" g="admin" p="33277" c="true"/><f n="libgs2.la" o="pete" g="admin" p="33277"/><f n="libgs2.so" o="pete" g="wheel" p="41453"/><f n="libgssapiv2.2.0.23.so" o="pete" g="wheel" p="41453"/><f n="libgssapiv2.2.so" o="pete" g="admin" p="33277" c="true"/><f n="libgssapiv2.la" o="pete" g="admin" p="33277"/><f n="libgssapiv2.so" o="pete" g="wheel" p="41453"/><f n="libotp.2.0.23.so" o="pete" g="wheel" p="41453"/><f n="libotp.2.so" o="pete" g="admin" p="33277" c="true"/><f n="libotp.la" o="pete" g="admin" p="33277"/><f n="libotp.so" o="pete" g="wheel" p="41453"/><f n="libplain.2.0.23.so" o="pete" g="wheel" p="41453"/><f n="libplain.2.so" o="pete" g="admin" p="33277" c="true"/><f n="libplain.la" o="pete" g="admin" p="33277"/><f n="libplain.so" o="pete" g="wheel" p="41453"/><f n="libsasldb.2.0.23.so" o="pete" g="wheel" p="41453"/><f n="libsasldb.2.so" o="pete" g="admin" p="33277" c="true"/><f n="libsasldb.la" o="pete" g="admin" p="33277"/><f n="libsasldb.so" o="pete" g="wheel" p="41453"/></f><f n="x" o="pete" g="wheel" p="41453"/></f><f n="sbin" o="root" g="admin" p="16877"><f n="pluginviewer" o="root" g="admin" p="33277" c="true"/><f n="saslauthd" o="root" g="admin" p="33277" c="true"/><f n="sasldblistusers2" o="root" g="admin" p="33277" c="true"/><f n="saslpasswd2" o="root" g="admin" p="33277" c="true"/><f n="testsaslauthd" o="root" g="admin" p="33277" c="true"/></f><f n="share" o="pete" g="admin" p="16877"><f n="man" o="pete" g="admin" p="16877"><f n="man3" o="pete" g="admin" p="16877"><f n="sasl.3" o="pete" g="admin" p="33204"/><f n="sasl_authorize_t.3" o="pete" g="admin" p="33204"/><f n="sasl_auxprop.3" o="pete" g="admin" p="33204"/><f n="sasl_auxprop_getctx.3" o="pete" g="admin" p="33204"/><f n="sasl_auxprop_request.3" o="pete" g="admin" p="33204"/><f n="sasl_callbacks.3" o="pete" g="admin" p="33204"/><f n="sasl_canon_user_t.3" o="pete" g="admin" p="33204"/><f n="sasl_chalprompt_t.3" o="pete" g="admin" p="33204"/><f n="sasl_checkapop.3" o="pete" g="admin" p="33204"/><f n="sasl_checkpass.3" o="pete" g="admin" p="33204"/><f n="sasl_client_init.3" o="pete" g="admin" p="33204"/><f n="sasl_client_new.3" o="pete" g="admin" p="33204"/><f n="sasl_client_start.3" o="pete" g="admin" p="33204"/><f n="sasl_client_step.3" o="pete" g="admin" p="33204"/><f n="sasl_decode.3" o="pete" g="admin" p="33204"/><f n="sasl_dispose.3" o="pete" g="admin" p="33204"/><f n="sasl_done.3" o="pete" g="admin" p="33204"/><f n="sasl_encode.3" o="pete" g="admin" p="33204"/><f n="sasl_encodev.3" o="pete" g="admin" p="33204"/><f n="sasl_errdetail.3" o="pete" g="admin" p="33204"/><f n="sasl_errors.3" o="pete" g="admin" p="33204"/><f n="sasl_errstring.3" o="pete" g="admin" p="33204"/><f n="sasl_getconfpath_t.3" o="pete" g="admin" p="33204"/><f n="sasl_getopt_t.3" o="pete" g="admin" p="33204"/><f n="sasl_getpath_t.3" o="pete" g="admin" p="33204"/><f n="sasl_getprop.3" o="pete" g="admin" p="33204"/><f n="sasl_getrealm_t.3" o="pete" g="admin" p="33204"/><f n="sasl_getsecret_t.3" o="pete" g="admin" p="33204"/><f n="sasl_getsimple_t.3" o="pete" g="admin" p="33204"/><f n="sasl_global_listmech.3" o="pete" g="admin" p="33204"/><f n="sasl_idle.3" o="pete" g="admin" p="33204"/><f n="sasl_listmech.3" o="pete" g="admin" p="33204"/><f n="sasl_log_t.3" o="pete" g="admin" p="33204"/><f n="sasl_server_init.3" o="pete" g="admin" p="33204"/><f n="sasl_server_new.3" o="pete" g="admin" p="33204"/><f n="sasl_server_start.3" o="pete" g="admin" p="33204"/><f n="sasl_server_step.3" o="pete" g="admin" p="33204"/><f n="sasl_server_userdb_checkpass_t.3" o="pete" g="admin" p="33204"/><f n="sasl_server_userdb_setpass_t.3" o="pete" g="admin" p="33204"/><f n="sasl_setpass.3" o="pete" g="admin" p="33204"/><f n="sasl_setprop.3" o="pete" g="admin" p="33204"/><f n="sasl_user_exists.3" o="pete" g="admin" p="33204"/><f n="sasl_verifyfile_t.3" o="pete" g="admin" p="33204"/></f><f n="man8" o="root" g="admin" p="16877"><f n="pluginviewer.8" o="root" g="admin" p="33204"/><f n="saslauthd.8" o="root" g="admin" p="33204"/><f n="sasldblistusers2.8" o="root" g="admin" p="33204"/><f n="saslpasswd2.8" o="root" g="admin" p="33204"/></f></f></f></f></f><mod>name</mod></f></pkg-contents>
\ No newline at end of file
diff --git a/mac-client-installer/Moonshot Client Software.pmdoc/02sasl.xml b/mac-client-installer/Moonshot Client Software.pmdoc/02sasl.xml
deleted file mode 100644 (file)
index a8ae642..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="032139BC-6A2D-44A9-9290-8DCBCD5BAF73"><config><identifier>ja.net.moonshotClientSoftware.cyrusSasl.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installTo>/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installSizeKB</mod><mod>installTo</mod><mod>postInstall</mod><mod>hashDigest</mod><mod>filePrefix</mod><mod>requireAuthorization</mod><mod>identifier</mod><mod>version</mod><mod>parent</mod></config><contents><file-list>02sasl-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra><packagePath>/Users/pete/installerbuild/Moonshot Client Software.pkg</packagePath><title>sasl</title><file-prefix>sasl.pkg</file-prefix></extra><additionalPkgInfoXML><pkg-info><payload installKBytes="1056" numberOfFiles="130"/></pkg-info></additionalPkgInfoXML></pkgref>
\ No newline at end of file
index a0ef5b6..9fd4c5f 100644 (file)
@@ -1 +1 @@
-<pkmkdoc spec="1.12"><properties><title>Moonshot Client Software</title><organization>ja.net</organization><userSees ui="both"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="Kerberos with Moonshot GSS EAP Mechanism " id="choiceGssEap" starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/</customLoc><pkgref id="ja.net.moonshotClientSoftware.mech_eap.pkg"/></choice><choice title="Cyrus SASL" id="choiceCyrusSasl" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="ja.net.moonshotClientSoftware.cyrusSasl.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"/><flags/><item type="flat-pkgref">01krb.xml</item><item type="flat-pkgref">02sasl.xml</item><mod>properties.customizeOption</mod></pkmkdoc>
\ No newline at end of file
+<pkmkdoc spec="1.12"><properties><title>Moonshot Client Software</title><build>/Users/pete/moonshot/mac-client-installer/Moonshot Client Software.pkg</build><organization>ja.net</organization><userSees ui="both"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="moonshot-ui" id="choice11" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="ja.net.moonshotClientSoftware.moonshot-ui.pkg"/></choice><choice title="moonshot-libs" id="choice16" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="ja.net.moonshotClientSoftware.moonshot-ui-1.pkg"/></choice><choice title="Cyrus SASL Framework" id="choice18" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="ja.net.moonshotClientSoftware.Library.pkg"/></choice><choice title="Cyrus SASL  local lib" id="choice21" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="ja.net.moonshotClientSoftware.sasl.pkg"/></choice><choice title="Cyrus SASL  usr lib" id="choice22" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="ja.net.moonshotClientSoftware.usr.pkg"/></choice><choice title="Kerberos with Moonshot" id="choice23" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="ja.net.moonshotClientSoftware.usr-1.pkg"/></choice><choice title="Moonshot GSS EAP Mechanism" id="choice24" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="ja.net.moonshotClientSoftware.usr-2.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"/><flags/><item type="file">01moonshot.xml</item><item type="file">02moonshot.xml</item><item type="file">03library.xml</item><item type="file">04sasl.xml</item><item type="file">05usr.xml</item><item type="file">06usr.xml</item><item type="file">07usr.xml</item><mod>properties.customizeOption</mod></pkmkdoc>
\ No newline at end of file
index e2a62bb..c710d1e 100644 (file)
@@ -45,7 +45,7 @@ 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
 
-$ ./configure --prefix $HOME/moonshot/mac-client-installer/sasl --with-gss_impl=mit
+$ ./configure --prefix=/usr/local --with-gss_impl=mit
 $ exit 
 choose [1] Rerun phase build
 *** Error during phase build of cyrus-sasl: ########## Error running make   *** [1/1]
index 5783b4a..3622402 100755 (executable)
@@ -6,25 +6,49 @@
 #  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
+# build moonshot in jhbuild shell
+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
+# build cyrus-sasl using jhbuild
+jhbuild build cyrus-sasl
 
-#jhbuild build moonshot-ui
+# build moonshot-ui using jhbuild
+jhbuild build moonshot-ui
 
-#cd ~/gtk/source/moonshot-ui/ &&  jhbuild run make app-bundle && jhbuild run make installer
+# make moonshot-ui app bundle in jhbuild shell
+cd ~/gtk/source/moonshot-ui/ &&  jhbuild run make app-bundle 
+pwd
 
-hdiutil create -size 2m -fs HFS+ -volname "Moonshot Client Software" temp.dmg 
+cd ~/moonshot/mac-client-installer
+pwd
+# fix up the cyrus-sasl links
+mkdir -p sasl/usr/lib
+cd sasl/usr/lib && ln -fs   ../local/lib/sasl2 
+cd ~/moonshot/mac-client-installer
+pwd
 
-hdiutil attach temp.dmg 
+# Ensure the permissions are correct for the files to be installed
+sudo chown -R root:admin sasl krb moonshot moonshot-ui
+sudo chmod -R g+w sasl krb moonshot moonshot-ui
+
+# create the installer package
+/Developer/usr/bin/packagemaker --doc Moonshot\ Client\ Software.pmdoc \
+--version 0.1 --filter "/.DS_Store"  --root-volume-only \
+--domain system --verbose --no-relocate -l "/" --target 10.5 \
+--id ja.net.moonshotClientSoftware  --out Moonshot\ Client\ Software.pkg
 
+# create and mount a disk image
+hdiutil create -size 20m -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/ 
+# TODO we need some readmes for the Mac instalatiom
+#cp -R resources/*  /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
index 225ade3..d8455f3 100644 (file)
@@ -17,7 +17,7 @@
         </dependencies>
     </metamodule>
 
-    <autotools id="moonshot-ui" autogenargs="--prefix $HOME/moonshot/mac-client-installer/moonshot-ui --libdir '/Users/pete/gtk/inst/lib'" >
+    <autotools id="moonshot-ui" autogenargs="--prefix $HOME/moonshot/mac-client-installer/moonshot-ui --libdir $HOME/moonshot/mac-client-installer/moonshot-ui/lib" >
  <!--       makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/moonshot-ui"-->
         <branch 
             repo="moonshot.janet.git" module="moonshot-ui.git">
@@ -53,7 +53,7 @@
         </dependencies>
     </tarball>
 
-    <autotools id="cyrus-sasl" autogenargs="--prefix $HOME/moonshot/mac-client-installer/sasl --with-gss_impl=mit"
+    <autotools id="cyrus-sasl" autogenargs="--prefix / --with-gss_impl=mit  --libdir /usr/local"
         makeinstallargs="install DESTDIR=$HOME/moonshot/mac-client-installer/sasl">
         <branch 
             repo="moonshot.janet.git" module="cyrus-sasl.git">
index 5360806..c0096a7 100755 (executable)
@@ -18,8 +18,7 @@ scriptversion=2009-10-06.20; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a