summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorDerrick Hendricks <derrick@nanorex.com>2008-08-06 17:03:21 +0000
committerDerrick Hendricks <derrick@nanorex.com>2008-08-06 17:03:21 +0000
commit9a9f4a31e0df1a517803a58faa5e5e3d91a5f8ed (patch)
tree90416b39e4c98dffc22d12c80d8b5b5d6035ca29 /packaging
parentc25355c8185a1e0cfbebb061591ea71d6fa05539 (diff)
downloadnanoengineer-theirix-9a9f4a31e0df1a517803a58faa5e5e3d91a5f8ed.tar.gz
nanoengineer-theirix-9a9f4a31e0df1a517803a58faa5e5e3d91a5f8ed.zip
misc. build changes.
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/Pref_Mod/buildMac.sh15
-rw-r--r--packaging/Pref_Mod/buildWin.sh9
-rw-r--r--packaging/Suite/MacOSX/NE1_Suite.pmdoc.tar.gzbin19631 -> 19640 bytes
-rwxr-xr-xpackaging/Suite/buildMacSuite.sh3
4 files changed, 22 insertions, 5 deletions
diff --git a/packaging/Pref_Mod/buildMac.sh b/packaging/Pref_Mod/buildMac.sh
index 4593384ff..2840a429c 100755
--- a/packaging/Pref_Mod/buildMac.sh
+++ b/packaging/Pref_Mod/buildMac.sh
@@ -1,4 +1,13 @@
-#!/bin/sh
+#!/bin/sh -x
+
+# The same checks for a stored version in ~/MacOSX_Installers/<something> are
+# not in Pref_Mod as they are for gromacs and qutemol. This is because
+# pref_modifier changes with every version number. Plus, it only adds about
+# two minutes to the build time. Also, this file uses the NE1_Build_Constants
+# for the version number. The NE1 and Suite Installers modify this, so if
+# this script is run manually, make sure to make the necessary changes.
+
+PREF_VERSION="0.0.1"
# set up a directory to store pre-built stuff
if [ ! -e ~/MacOSX_Installers ]
@@ -11,8 +20,8 @@ cp ../../cad/src/NE1_Build_Constants.py .
python setup_mac.py py2app --frameworks=/usr/local/BerkeleyDB.4.5/lib/libdb-4.5.dylib --packages=bsddb3
cp py2app-Info.plist dist/pref_modifier.app/Contents/Info.plist
cd dist
-tar cf ../pref_modifier.app_0.0.1.tar pref_modifier.app
-gzip -9 ../pref_modifier.app_0.0.1.tar
+tar cf ../pref_modifier.app_$PREF_VERSION.tar pref_modifier.app
+gzip -9 ../pref_modifier.app_$PREF_VERSION.tar
cd ..
sudo /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -o ./pref_modifier.pkg -r ./dist -v -f ./PrefMod_info.plist
diff --git a/packaging/Pref_Mod/buildWin.sh b/packaging/Pref_Mod/buildWin.sh
index c665f0adc..87740ab32 100644
--- a/packaging/Pref_Mod/buildWin.sh
+++ b/packaging/Pref_Mod/buildWin.sh
@@ -1,8 +1,13 @@
#!/bin/sh -x
+
# The same checks for a stored version in /c/<something> are not in Pref_Mod
# as they are for gromacs and qutemol. This is because pref_modifier changes
-# with every version number. Plus, it only adds to the build time be about
-# two minutes
+# with every version number. Plus, it only adds about two minutes to the build
+# time. Also, this file uses the NE1_Build_Constants for the version number.
+# The NE1 and Suite Installers modify this, so if this script is run manually,
+# Make sure to make the necessary changes.
+
+PREF_VERSION="0.0.1"
TOP_LEVEL=`pwd`
echo $TOP_LEVEL | grep "Pref_Mod"
diff --git a/packaging/Suite/MacOSX/NE1_Suite.pmdoc.tar.gz b/packaging/Suite/MacOSX/NE1_Suite.pmdoc.tar.gz
index 33d451ee6..f1b27cde2 100644
--- a/packaging/Suite/MacOSX/NE1_Suite.pmdoc.tar.gz
+++ b/packaging/Suite/MacOSX/NE1_Suite.pmdoc.tar.gz
Binary files differ
diff --git a/packaging/Suite/buildMacSuite.sh b/packaging/Suite/buildMacSuite.sh
index a86027684..efc970a6f 100755
--- a/packaging/Suite/buildMacSuite.sh
+++ b/packaging/Suite/buildMacSuite.sh
@@ -173,6 +173,9 @@ cd NE1_Suite.pmdoc
GROM_FILE=`ls *gromacs.xml`
cat $GROM_FILE | sed -e "s:/Applications/GROMACS:/Applications/GROMACS_$GROMACS_VERSION:" > $GROM_FILE.tmp
mv $GROM_FILE.tmp $GROM_FILE || exit 1
+QMX_FILE=`ls *qutemolx.xml`
+cat $QMX_FILE | sed -e "s:/Applications/Nanorex/QuteMolX:/Applications/Nanorex/QuteMolX $QUTEMOLX_VERSION:" > $QMX_FILE.tmp
+mv $QMX_FILE.tmp $QMX_FILE
cd ..
# create and populate the resources directory