Changeset 4740


Ignore:
Timestamp:
Jan 7, 2021 5:22:35 PM (9 months ago)
Author:
toby
Message:

more install work

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • install/g2complete/post-link.sh

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

    r4736 r4740  
    55echo "source $PREFIX/bin/activate" >> $PREFIX/start_G2_bootstrap.sh
    66echo "$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py" >> $PREFIX/start_G2_bootstrap.sh
     7# in case constructor changed the binary files
     8$PREFIX/bin/svn revert $PREFIX/GSASII/bindist/*
    79#
    810# "install" the GSAS-II package (create shortcuts, byte-compile...)
    911#
    10 #$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > /tmp/bootstrap1.log 2>> $PREFIX/GSASII/conda_inst.log 2>&1
     12$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > $PREFIX/GSASII/conda_inst.log 2>&1
    1113# Now try to update to latest GSAS-II version (will fail if no network)
    12 #$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall > /tmp/bootstrap2.log 2>> $PREFIX/GSASII/conda_inst.log 2>&1
     14$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall >> $PREFIX/GSASII/conda_inst.log 2>&1
     15#
    1316# create start script
    1417echo "# Commands to start GSAS-II" > $PREFIX/start_GSASII.sh
     
    2023   echo "$PREFIX/bin/python $PREFIX/GSASII/GSASII.py" >> $PREFIX/start_GSASII.sh
    2124fi
    22 # in case constructor changed the binary files
    23 $PREFIX/bin/svn revert $PREFIX/GSASII/bindist/*
    2425#create the GSAS-II app or Desktop icon (note that scripts run only on correct platform)
    25 $PREFIX/bin/python $PREFIX/GSASII/makeMacApp.py
    26 $PREFIX/bin/python $PREFIX/GSASII/makeLinux.py
     26#$PREFIX/bin/python $PREFIX/GSASII/makeMacApp.py
     27#$PREFIX/bin/python $PREFIX/GSASII/makeLinux.py
     28echo "GSAS-II bootstrap completed" >> $PREFIX/.messages.txt
  • trunk/GSASIIpath.py

    r4732 r4740  
    3131import glob
    3232import subprocess
    33 import numpy as np
     33try:
     34    import numpy as np
     35except ImportError:
     36    print("skipping numpy in GSASIIpath")
    3437g2home = 'https://subversion.xray.aps.anl.gov/pyGSAS'
    3538'Define the location of the GSAS-II subversion repository'
Note: See TracChangeset for help on using the changeset viewer.