Changeset 11587

Timestamp:

03/01/12 14:25:16 (13 years ago)

Author:

Eric.Larour

Message:

Better packager, dumping into the user home directory

Location:

issm/trunk-jpl/packagers/macosx

Files:

• ISSM.app (deleted)
• ISSM.appscript (modified) (1 diff)
• ISSM.pmdoc/01issm-contents.xml (modified) (1 diff)
• ISSM.pmdoc/01issm.xml (modified) (1 diff)
• ISSM.pmdoc/02bin-contents.xml (added)
• ISSM.pmdoc/02bin.xml (added)
• ISSM.pmdoc/02matlabissm-contents.xml (deleted)
• ISSM.pmdoc/02matlabissm.xml (deleted)
• ISSM.pmdoc/03startup-contents.xml (deleted)
• ISSM.pmdoc/03startup.xml (deleted)
• ISSM.pmdoc/03test-contents.xml (added)
• ISSM.pmdoc/03test.xml (added)
• ISSM.pmdoc/04bin-contents.xml (deleted)
• ISSM.pmdoc/04bin.xml (deleted)
• ISSM.pmdoc/05test-contents.xml (deleted)
• ISSM.pmdoc/05test.xml (deleted)
• ISSM.pmdoc/index.xml (modified) (1 diff)
• matlabissm (modified) (1 diff)
• package.sh (modified) (1 diff)
• package_incomplete.sh (added)
• startup.m (modified) (1 diff)

issm/trunk-jpl/packagers/macosx/ISSM.appscript

@@ -1 @@
-do shell script "open /Library/ISSM/bin/matlabissm"
+do shell script "open ~/ISSM/bin/matlabissm"

issm/trunk-jpl/packagers/macosx/ISSM.pmdoc/01issm-contents.xml

@@ -1 @@
-<pkg-contents spec="1.12"><f n="ISSM.app" o="larour" g="staff" p="16877" pt="/Users/larour/issm-uci/trunk-jpl/packagers/macosx/ISSM.app" m="false" t="file"><f n=".svn" o="larour" g="staff" p="16877"><f n="entries" o="larour" g="staff" p="33060"/><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/><f n="tmp" o="larour" g="staff" p="16877"><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/></f></f><f n="Contents" o="larour" g="staff" p="16877"><f n=".svn" o="larour" g="staff" p="16877"><f n="entries" o="larour" g="staff" p="33060"/><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"><f n="Info.plist.svn-base" o="larour" g="staff" p="33060"/><f n="PkgInfo.svn-base" o="larour" g="staff" p="33060"/></f><f n="tmp" o="larour" g="staff" p="16877"><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/></f></f><f n="Info.plist" o="larour" g="staff" p="33188"/><f n="MacOS" o="larour" g="staff" p="16877"><f n=".svn" o="larour" g="staff" p="16877"><f n="entries" o="larour" g="staff" p="33060"/><f n="prop-base" o="larour" g="staff" p="16877"><f n="applet.svn-base" o="larour" g="staff" p="33060"/></f><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"><f n="applet.svn-base" o="larour" g="staff" p="33060"/></f><f n="tmp" o="larour" g="staff" p="16877"><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/></f></f><f n="applet" o="larour" g="staff" p="33261"/></f><f n="PkgInfo" o="larour" g="staff" p="33188"/><f n="Resources" o="larour" g="staff" p="16877"><f n=".svn" o="larour" g="staff" p="16877"><f n="entries" o="larour" g="staff" p="33060"/><f n="prop-base" o="larour" g="staff" p="16877"><f n="applet.icns.svn-base" o="larour" g="staff" p="33060"/><f n="applet.rsrc.svn-base" o="larour" g="staff" p="33060"/></f><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"><f n="applet.icns.svn-base" o="larour" g="staff" p="33060"/><f n="applet.rsrc.svn-base" o="larour" g="staff" p="33060"/></f><f n="tmp" o="larour" g="staff" p="16877"><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/></f></f><f n="applet.icns" o="larour" g="staff" p="33188"/><f n="applet.rsrc" o="larour" g="staff" p="33188"/><f n="description.rtfd" o="larour" g="staff" p="16877"><f n=".svn" o="larour" g="staff" p="16877"><f n="entries" o="larour" g="staff" p="33060"/><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"><f n="TXT.rtf.svn-base" o="larour" g="staff" p="33060"/></f><f n="tmp" o="larour" g="staff" p="16877"><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/></f></f><f n="TXT.rtf" o="larour" g="staff" p="33188"/></f><f n="Scripts" o="larour" g="staff" p="16877"><f n=".svn" o="larour" g="staff" p="16877"><f n="entries" o="larour" g="staff" p="33060"/><f n="prop-base" o="larour" g="staff" p="16877"><f n="main.scpt.svn-base" o="larour" g="staff" p="33060"/></f><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"><f n="main.scpt.svn-base" o="larour" g="staff" p="33060"/></f><f n="tmp" o="larour" g="staff" p="16877"><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/></f></f><f n="main.scpt" o="larour" g="staff" p="33188"/></f></f></f></f></pkg-contents>
+<pkg-contents spec="1.12"><f n="ISSM.app" o="larour" g="staff" p="16877" pt="/Users/larour/issm-uci/trunk-jpl/packagers/macosx/ISSM.app" m="false" t="file"><f n=".svn" o="larour" g="staff" p="16877"><f n="all-wcprops" o="larour" g="staff" p="33060"/><f n="entries" o="larour" g="staff" p="33060"/><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/><f n="tmp" o="larour" g="staff" p="16877"><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/></f></f><f n="Contents" o="larour" g="staff" p="16877"><f n=".svn" o="larour" g="staff" p="16877"><f n="all-wcprops" o="larour" g="staff" p="33060"/><f n="entries" o="larour" g="staff" p="33060"/><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"><f n="Info.plist.svn-base" o="larour" g="staff" p="33060"/><f n="PkgInfo.svn-base" o="larour" g="staff" p="33060"/></f><f n="tmp" o="larour" g="staff" p="16877"><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/></f></f><f n="Info.plist" o="larour" g="staff" p="33188"/><f n="MacOS" o="larour" g="staff" p="16877"><f n=".svn" o="larour" g="staff" p="16877"><f n="all-wcprops" o="larour" g="staff" p="33060"/><f n="entries" o="larour" g="staff" p="33060"/><f n="prop-base" o="larour" g="staff" p="16877"><f n="applet.svn-base" o="larour" g="staff" p="33060"/></f><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"><f n="applet.svn-base" o="larour" g="staff" p="33060"/></f><f n="tmp" o="larour" g="staff" p="16877"><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/></f></f><f n="applet" o="larour" g="staff" p="33261"/></f><f n="PkgInfo" o="larour" g="staff" p="33188"/><f n="Resources" o="larour" g="staff" p="16877"><f n=".svn" o="larour" g="staff" p="16877"><f n="all-wcprops" o="larour" g="staff" p="33060"/><f n="entries" o="larour" g="staff" p="33060"/><f n="prop-base" o="larour" g="staff" p="16877"><f n="applet.icns.svn-base" o="larour" g="staff" p="33060"/><f n="applet.rsrc.svn-base" o="larour" g="staff" p="33060"/></f><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"><f n="applet.icns.svn-base" o="larour" g="staff" p="33060"/><f n="applet.rsrc.svn-base" o="larour" g="staff" p="33060"/></f><f n="tmp" o="larour" g="staff" p="16877"><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/></f></f><f n="applet.icns" o="larour" g="staff" p="33188"/><f n="applet.rsrc" o="larour" g="staff" p="33188"/><f n="description.rtfd" o="larour" g="staff" p="16877"><f n=".svn" o="larour" g="staff" p="16877"><f n="all-wcprops" o="larour" g="staff" p="33060"/><f n="entries" o="larour" g="staff" p="33060"/><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"><f n="TXT.rtf.svn-base" o="larour" g="staff" p="33060"/></f><f n="tmp" o="larour" g="staff" p="16877"><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/></f></f><f n="TXT.rtf" o="larour" g="staff" p="33188"/></f><f n="Scripts" o="larour" g="staff" p="16877"><f n=".svn" o="larour" g="staff" p="16877"><f n="all-wcprops" o="larour" g="staff" p="33060"/><f n="entries" o="larour" g="staff" p="33060"/><f n="prop-base" o="larour" g="staff" p="16877"><f n="main.scpt.svn-base" o="larour" g="staff" p="33060"/></f><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"><f n="main.scpt.svn-base" o="larour" g="staff" p="33060"/></f><f n="tmp" o="larour" g="staff" p="16877"><f n="prop-base" o="larour" g="staff" p="16877"/><f n="props" o="larour" g="staff" p="16877"/><f n="text-base" o="larour" g="staff" p="16877"/></f></f><f n="main.scpt" o="larour" g="staff" p="33188"/></f></f></f></f></pkg-contents>

issm/trunk-jpl/packagers/macosx/ISSM.pmdoc/01issm.xml

@@ -1 @@
-<pkgref spec="1.12" uuid="280C4FF1-FB54-447F-B616-1EB3C56397F9"><config><identifier>ISSM.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom mod="true" includeRoot="true">/Users/larour/issm-uci/trunk-jpl/packagers/macosx/ISSM.app</installFrom><installTo>/Applications</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>relocatable</mod><mod>installFrom.path</mod><mod>identifier</mod><mod>parent</mod><mod>includeRoot</mod><mod>requireAuthorization</mod></config><contents><file-list>01issm-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="280C4FF1-FB54-447F-B616-1EB3C56397F9"><config><identifier>ISSM.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom mod="true" includeRoot="true">/Users/larour/issm-uci/trunk-jpl/packagers/macosx/ISSM.app</installFrom><installTo mod="true">/ISSM/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>relocatable</mod><mod>installFrom.path</mod><mod>identifier</mod><mod>parent</mod><mod>includeRoot</mod><mod>requireAuthorization</mod><mod>installTo.path</mod></config><contents><file-list>01issm-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

issm/trunk-jpl/packagers/macosx/ISSM.pmdoc/index.xml

@@ -1 @@
-<pkmkdoc spec="1.12"><properties><title>ISSM</title><build>/Users/larour/issm-uci/trunk-jpl/packagers/macosx/ISSM.pkg</build><organization>http://issm.jpl.nasa.gov</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Ice Sheet System Model</description><contents><choice title="ISSM" id="choice3" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="ISSM.pkg"/></choice><choice title="matlabissm" id="choice4" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="ISSM.matlabissm.pkg"/></choice><choice title="startup" id="choice5" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="ISSM.startup.pkg"/></choice><choice title="bin" id="choice6" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="issm.bin.pkg"/></choice><choice title="test" id="choice16" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="issm.test.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"/></resources><flags/><item type="file">01issm.xml</item><item type="file">02matlabissm.xml</item><item type="file">03startup.xml</item><item type="file">04bin.xml</item><item type="file">05test.xml</item><mod>properties.title</mod><mod>properties.userDomain</mod><mod>description</mod><mod>properties.anywhereDomain</mod></pkmkdoc>
+<pkmkdoc spec="1.12"><properties><title>ISSM</title><build>/Users/larour/issm-uci/trunk-jpl/packagers/macosx/ISSM.pkg</build><organization>http://issm.jpl.nasa.gov</organization><userSees ui="both"/><min-target os="3"/><domain user="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Ice Sheet System Model</description><contents><choice title="ISSM" id="choice3" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="ISSM.pkg"/></choice><choice title="bin" id="choice6" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="issm.bin.pkg"/></choice><choice title="test" id="choice16" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="issm.test.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"/></resources><flags/><item type="file">01issm.xml</item><item type="file">02bin.xml</item><item type="file">03test.xml</item><mod>properties.title</mod><mod>properties.userDomain</mod><mod>description</mod><mod>properties.anywhereDomain</mod></pkmkdoc>

issm/trunk-jpl/packagers/macosx/matlabissm

@@ -1 +1 @@
 #/bin/bash
-matlab -r "addpath /Library/ISSM/bin/; startup; cd /Library/ISSM/test;"
+matlab -r "name=getenv('USER'); issm=['/Users/' name '/ISSM']; cd(issm); cd bin; startup; cd ../;"

issm/trunk-jpl/packagers/macosx/package.sh

@@ -2 +2 @@
 
 #Package using the Package Maker from OSX, driven by command line.
-rm -rf ISSM-MacOSX.pkg
+sudo sh -c "rm -rf ISSM-MacOSX.pkg bin test"
+
+#We need to copy all the relevant files and set the permissions, as PackageMaker 
+#is not good at that. 
+cp -Rf $ISSM_TIER/bin ./
+cp -Rf $ISSM_TIER/test ./
+cp matlabissm startup.m ./bin
+
+#Now change group and ownership: 
+sudo sh -c "chown -R root ./bin && chgrp -R admin ./bin"
+sudo sh -c "chown -R root ./test && chgrp -R admin ./test"
 
 PackageMaker -d ISSM.pmdoc -o ISSM-MacOSX.pkg
+
+#cleanup
+sudo sh -c "rm -rf ./bin && rm -rf ./test"

issm/trunk-jpl/packagers/macosx/startup.m

@@ -24 +24 @@
 %ISSM path
 addpath(pwd); %add current path first
-addpath([pwd '\bin']);
 
 %Check on any warning messages that might indicate that the paths were not correct.