Changeset 4740

Timestamp:

Jan 7, 2021 5:22:35 PM (3 years ago)

Author:

toby

Message:

more install work

Files:

• install/g2complete/post-link.sh (modified) (1 diff)
• install/g2full/g2postinstall.sh (modified) (2 diffs)
• trunk/GSASIIpath.py (modified) (1 diff)

install/g2complete/post-link.sh

@@ -1 +1 @@
 #!/bin/bash
-echo "Complete complete installation GSAS-II from APS subversion server" > $PREFIX/GSASII/conda_inst.log
-# Note: for g2complete create scripts to access bootstrap & start are moved to g2postinstall.sh (g2full)
-#
-# "install" the GSAS-II package (create shortcuts, byte-compile...)
-#
-$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet >> $PREFIX/GSASII/conda_inst.log 2>&1
-# Now try to update to latest GSAS-II version (will fail if no network)
-$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall >> $PREFIX/GSASII/conda_inst.log 2>&1
-cp $PREFIX/GSASII/conda_inst.log $PREFIX/.messages.txt
-echo "GSAS-II bootstrap completed" >> $PREFIX/.messages.txt
+# this could contain commands that are run when gsas2complete is installed by g2full.
+# I am using g2postinstall.sh in g2full for these tasks.

install/g2full/g2postinstall.sh

@@ -5 +5 @@
 echo "source $PREFIX/bin/activate" >> $PREFIX/start_G2_bootstrap.sh
 echo "$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py" >> $PREFIX/start_G2_bootstrap.sh
+# in case constructor changed the binary files
+$PREFIX/bin/svn revert $PREFIX/GSASII/bindist/*
 #
 # "install" the GSAS-II package (create shortcuts, byte-compile...)
 #
-#$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > /tmp/bootstrap1.log 2>> $PREFIX/GSASII/conda_inst.log 2>&1
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > $PREFIX/GSASII/conda_inst.log 2>&1
 # Now try to update to latest GSAS-II version (will fail if no network)
-#$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall > /tmp/bootstrap2.log 2>> $PREFIX/GSASII/conda_inst.log 2>&1
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall >> $PREFIX/GSASII/conda_inst.log 2>&1
+#
 # create start script
 echo "# Commands to start GSAS-II" > $PREFIX/start_GSASII.sh
@@ -20 +23 @@
    echo "$PREFIX/bin/python $PREFIX/GSASII/GSASII.py" >> $PREFIX/start_GSASII.sh
 fi
-# in case constructor changed the binary files
-$PREFIX/bin/svn revert $PREFIX/GSASII/bindist/*
 #create the GSAS-II app or Desktop icon (note that scripts run only on correct platform)
-$PREFIX/bin/python $PREFIX/GSASII/makeMacApp.py
-$PREFIX/bin/python $PREFIX/GSASII/makeLinux.py
+#$PREFIX/bin/python $PREFIX/GSASII/makeMacApp.py
+#$PREFIX/bin/python $PREFIX/GSASII/makeLinux.py
+echo "GSAS-II bootstrap completed" >> $PREFIX/.messages.txt

trunk/GSASIIpath.py

@@ -31 +31 @@
 import glob
 import subprocess
-import numpy as np
+try:
+    import numpy as np
+except ImportError:
+    print("skipping numpy in GSASIIpath")
 g2home = 'https://subversion.xray.aps.anl.gov/pyGSAS'
 'Define the location of the GSAS-II subversion repository'