diff options
author | Derrick Hendricks <derrick@nanorex.com> | 2008-08-01 20:54:00 +0000 |
---|---|---|
committer | Derrick Hendricks <derrick@nanorex.com> | 2008-08-01 20:54:00 +0000 |
commit | bf4bc0b716fdb07566fa45c74682a3a19d233fac (patch) | |
tree | aa5df6d26c56e0e45d96cf1b8b99cb8e8bedb575 | |
parent | 96dac77288d11358adf71401cb0138be06173c30 (diff) | |
download | nanoengineer-bf4bc0b716fdb07566fa45c74682a3a19d233fac.tar.gz nanoengineer-bf4bc0b716fdb07566fa45c74682a3a19d233fac.zip |
First checkin of buildMacSuite and the supporting files
-rw-r--r-- | packaging/Suite/MacOSX/NE1_Suite.pmdoc.tar.gz | bin | 0 -> 19472 bytes | |||
-rwxr-xr-x | packaging/Suite/MacOSX/post_GMX.sh | 18 | ||||
-rwxr-xr-x | packaging/Suite/MacOSX/post_NE1.sh | 11 | ||||
-rwxr-xr-x | packaging/Suite/MacOSX/post_QMX.sh | 15 | ||||
-rwxr-xr-x | packaging/Suite/MacOSX/post_all.sh | 7 | ||||
-rwxr-xr-x | packaging/Suite/MacOSX/post_pm.sh | 11 | ||||
-rwxr-xr-x | packaging/Suite/buildMacSuite.sh | 165 |
7 files changed, 227 insertions, 0 deletions
diff --git a/packaging/Suite/MacOSX/NE1_Suite.pmdoc.tar.gz b/packaging/Suite/MacOSX/NE1_Suite.pmdoc.tar.gz Binary files differnew file mode 100644 index 000000000..b55993fd9 --- /dev/null +++ b/packaging/Suite/MacOSX/NE1_Suite.pmdoc.tar.gz diff --git a/packaging/Suite/MacOSX/post_GMX.sh b/packaging/Suite/MacOSX/post_GMX.sh new file mode 100755 index 000000000..a35d11c99 --- /dev/null +++ b/packaging/Suite/MacOSX/post_GMX.sh @@ -0,0 +1,18 @@ +#!/bin/sh +OUTFIL=/tmp/NE1_suite_scriptvars_GMX +GMXSPATH=$0 +echo "GMXSPATH=$GMXSPATH" > $OUTFIL +GMXPPATH=$1 +echo "GMXPPATH=$GMXPPATH" >> $OUTFIL +GMXTARGETLOC=$2 +echo "GMXTARGETLOC=$GMXTARGETLOC" >> $OUTFIL +GMXTARGETVOL=$3 +echo "GMXTARGETVOL=$GMXTARGETVOL" >> $OUTFIL +#env | grep -v "^_" >> $OUTFIL +PMTARGETLOC=`grep PMTARGETLOC /tmp/NE1_suite_scriptvars_pm| cut -c 13-` +su $USER -c "$PMTARGETLOC/pref_modifier.app/Contents/MacOS/pref_modifier -K gromacs_enabled -V True >> /dev/null" +su $USER -c "$PMTARGETLOC/pref_modifier.app/Contents/MacOS/pref_modifier -K gromacs_path -V \"$GMXTARGETLOC/bin/mdrun\" >> /dev/null" +su $USER -c "$PMTARGETLOC/pref_modifier.app/Contents/MacOS/pref_modifier -K cpp_enabled -V True >> /dev/null" +su $USER -c "$PMTARGETLOC/pref_modifier.app/Contents/MacOS/pref_modifier -K cpp_path -V \"$GMXTARGETLOC/mcpp/bin/mcpp\" >> /dev/null" + + diff --git a/packaging/Suite/MacOSX/post_NE1.sh b/packaging/Suite/MacOSX/post_NE1.sh new file mode 100755 index 000000000..f28f2059a --- /dev/null +++ b/packaging/Suite/MacOSX/post_NE1.sh @@ -0,0 +1,11 @@ +#!/bin/sh +OUTFIL=/tmp/NE1_suite_scriptvars_NE1 +NESPATH=$0 +echo "NESPATH=$NESPATH" > $OUTFIL +NEPPATH=$1 +echo "NEPPATH=$NEPPATH" >> $OUTFIL +NETARGETLOC=$2 +echo "NETARGETLOC=$NETARGETLOC" >> $OUTFIL +NETARGETVOL=$3 +echo "NETARGETVOL=$NETARGETVOL" >> $OUTFIL +#env |grep -v "^_" >> $OUTFIL diff --git a/packaging/Suite/MacOSX/post_QMX.sh b/packaging/Suite/MacOSX/post_QMX.sh new file mode 100755 index 000000000..d3b23bcc6 --- /dev/null +++ b/packaging/Suite/MacOSX/post_QMX.sh @@ -0,0 +1,15 @@ +#!/bin/sh +OUTFIL=/tmp/NE1_suite_scriptvars_QMX +QMXSPATH=$0 +echo "QMXSPATH=$QMXSPATH" > $OUTFIL +QMXPPATH=$1 +echo "QMXPPATH=$QMXPPATH" >> $OUTFIL +QMXTARGETLOC=$2 +echo "QMXTARGETLOC=$QMXTARGETLOC" >> $OUTFIL +QMXTARGETVOL=$3 +echo "QMXTARGETVOL=$QMXTARGETVOL" >> $OUTFIL +#env | grep -v "^_" >> $OUTFIL +PMTARGETLOC=`grep PMTARGETLOC /tmp/NE1_suite_scriptvars_pm| cut -c 13-` +su $USER -c "$PMTARGETLOC/pref_modifier.app/Contents/MacOS/pref_modifier -K qutemol_enabled -V True >> /dev/null" +su $USER -c "$PMTARGETLOC/pref_modifier.app/Contents/MacOS/pref_modifier -K qutemol_path -V \"$QMXTARGETLOC/QuteMolX.app\" >> /dev/null" +rm /tmp/NE1_suite_scriptvars* diff --git a/packaging/Suite/MacOSX/post_all.sh b/packaging/Suite/MacOSX/post_all.sh new file mode 100755 index 000000000..e645be9f0 --- /dev/null +++ b/packaging/Suite/MacOSX/post_all.sh @@ -0,0 +1,7 @@ +#!/bin/sh +OUTFIL=/tmp/scriptvars_all +echo "SPATH=$0" > $OUTFIL +echo "PPATH=$1" >> $OUTFIL +echo "TARGETLOC=$2" >> $OUTFIL +echo "TARGETVOL=$3" >> $OUTFIL +env >> $OUTFIL diff --git a/packaging/Suite/MacOSX/post_pm.sh b/packaging/Suite/MacOSX/post_pm.sh new file mode 100755 index 000000000..ce4b80e87 --- /dev/null +++ b/packaging/Suite/MacOSX/post_pm.sh @@ -0,0 +1,11 @@ +#!/bin/sh +OUTFIL=/tmp/NE1_suite_scriptvars_pm +PMSPATH=$0 +echo "PMSPATH=$PMSPATH" > $OUTFIL +PMPPATH=$1 +echo "PMPPATH=$PMPPATH" >> $OUTFIL +PMTARGETLOC=$2 +echo "PMTARGETLOC=$PMTARGETLOC" >> $OUTFIL +PMTARGETVOL=$3 +echo "PMTARGETVOL=$PMTARGETVOL" >> $OUTFIL +env |grep -v "^_" >> $OUTFIL diff --git a/packaging/Suite/buildMacSuite.sh b/packaging/Suite/buildMacSuite.sh new file mode 100755 index 000000000..aff1a4a65 --- /dev/null +++ b/packaging/Suite/buildMacSuite.sh @@ -0,0 +1,165 @@ +#!/bin/sh -x + +# Usage: Run ./buildWinSuite.sh from the Suite directory in packaging. + + +# Set control variable to build packages if they are not build already +# This will probably be removed later as it was only added for testing +BUILD_IF_UNBUILT=1 + +# Set up path variables +PKNG_DIR=`pwd` +cd ../.. +TOP_LEVEL=`pwd` + + +# Set up version information +VERSION_NUM="1.1.1.2" +RC_NUMBER="0" +GROMACS_VERSION="3.3.3" +QUTEMOLX_VERSION="0.5.1" + +# Do a basic check for sanity in the build area. +if [ ! -e "$TOP_LEVEL/cad/src" ] +then + echo "The build directories are not valid" + exit 1 +fi + +# Check to see if the smaller packages are built + +# Start with Pref_Mod since it's easy to build +cd $TOP_LEVEL +# this check is to see if we've already run Pref_Mod for this tree +if [ ! -e ~/MacOSX_Installers/pref_modifier.pkg ] +then + if [ $BUILD_IF_UNBUILT -ne 0 ] + then +# All clear to do the build + cd packaging/Pref_Mod + ./buildMac.sh || exit 1 + else + echo "Build Pref_Mod before continuing" + exit 1 + fi +fi + + +# Build section for QuteMolX + +if [ ! -e ~/MacOSX_Installers/QuteMolX_$QUTEMOLX_VERSION.pkg ] +then + if [ $BUILD_IF_UNBUILT -ne 0 ] + then + cd $TOP_LEVEL/cad/plugins/QuteMol/packaging + ./buildMac.sh QUTEMOLX_VERSION + if [ "$?" != "0" ] + then + echo "Error in the QuteMolX build, investigate." + exit 1 + fi + fi +fi +# The build will normally handle this, but if the files used are pre-builds, +# the build does not store the readme and license. (Needed for Suite) +#cp $TOP_LEVEL/cad/plugins/QuteMol/packaging/Win32/License.txt /c/QMX_Install || exit 1 +#cp $TOP_LEVEL/cad/plugins/QuteMol/packaging/ReadMe.html /c/QMX_Install || exit 1 + +# End of build section for QuteMolX + +cd $TOP_LEVEL + +# Build section for GROMACS + +if [ ! -e ~/MacOSX_Installers/GROMACS_$GROMACS_VERSION.pkg ] +then + if [ $BUILD_IF_UNBUILT -ne 0 ] + then + cd $TOP_LEVEL/cad/plugins/GROMACS/gromacs-$GROMACS_VERSION/packaging + ./buildMac.sh $GROMACS_VERSION + if [ "$?" != "0" ] + then + echo "Error in the GROMACS build, investigate." + exit 1 + fi + fi +fi +# The build will normally handle this, but if the files used are pre-builds, +# the build does not store the readme and license. (Needed for Suite) +#cp $TOP_LEVEL/cad/plugins/GROMACS/gromacs-$GROMACS_VERSION/packaging/Win32/License.txt /c/GMX_Install +#cp $TOP_LEVEL/cad/plugins/GROMACS/gromacs-$GROMACS_VERSION/packaging/ReadMe.html /c/GMX_Install + +# End of GROMACS build section + +cd $TOP_LEVEL + +# Build section for NE1 + +#Check for an NE1 build +cd $TOP_LEVEL +if [ ! -e ~/MacOSX_Installers/NanoEngineer-1_v$VERSION_NUM.pkg ] +then + if [ $BUILD_IF_UNBUILT -ne 0 ] + then +# Set version information for NE1 + cat packaging/buildMac.sh | sed -e "s:^VERSION_NUM=.*:VERSION_NUM=\\\"$VERSION_NUM\\\":" | sed -e "s:^RC_NUMBER=.*:RC_NUMBER=\\\"$RC_NUMBER\\\":" > packaging/buildMac.sh.tmp + mv packaging/buildMac.sh.tmp packaging/buildMac.sh || exit 1 + cd packaging + export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3 -I/usr/local/include -I/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/include" + export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3 -I/usr/local/include -I/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/include" + export LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -isysroot /Developer/SDKs/MacOSX10.4u.sdk -L/usr/local/lib -L/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/lib" + export CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3 -I/usr/local/include -I/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/include" + export FFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3 -I/usr/local/include -I/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/include" + export MACOSX_DEPLOYMENT_TARGET=10.3 + chmod 755 ./buildMac.sh + ./buildMac.sh + if [ "$?" != "0" ] + then + echo "Error in the NE1 Build, investigate" + exit 1 + fi + else + echo "Build NE1 before continuing" + exit 1 + fi +fi + +cd $TOP_LEVEL + +# Made it this far, continue building the suite. Mod the suite installer files +cd $PKNG_DIR +cd MacOSX +sudo rm -rf metapackage +mkdir metapackage +mkdir metapackage/packages +mkdir metapackage/extras +if [ -e ~/MacOSX_Installers ] +then + cd metapackage/packages + sudo cp -R ~/MacOSX_Installers/NanoEngineer-1_v$VERSION_NUM.pkg . + sudo mv NanoEngineer-1_v$VERSION_NUM.pkg NanoEngineer-1.pkg + sudo cp -R ~/MacOSX_Installers/GROMACS_3.3.3.pkg . + sudo mv GROMACS_3.3.3.pkg GROMACS.pkg + sudo cp -R ~/MacOSX_Installers/QuteMolX_0.5.1.pkg . + sudo mv QuteMolX_0.5.1.pkg QuteMolX.pkg + sudo cp -R ~/MacOSX_Installers/pref_modifier.pkg . +else +# To be replaced later with something that searches for the pkg files + exit 1 +fi +cd $PKNG_DIR/MacOSX +sudo rm -rf NanoEngineer-1_Suite +sudo mkdir NanoEngineer-1_Suite +sudo rm -rf NE1_Suite.pmdoc +tar -xzvf NE1_Suite.pmdoc.tar.gz +sudo /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -o NanoEngineer-1_Suite/NanoEngineer-1_Suite_v$VERSION_NUM.mpkg -d NE1_Suite.pmdoc +sudo sync +sudo sudo hdiutil create -srcfolder NanoEngineer-1_Suite -fs HFS+ -format UDZO NanoEngineer-1_Suite_v$VERSION_NUM.dmg + +if [ -e ~/MacOSX_Installers ] +then + cd NanoEngineer-1_Suite + sudo cp -R NanoEngineer-1_Suite_V$VERSION_NUM.mpkg ~/MacOSX_Installers + cd .. + sudo cp NanoEngineer-1_Suite_v$VERSION_NUM.dmg ~/MacOSX_Installers +fi |