Changeset 4696


Ignore:
Timestamp:
Jan 1, 2021 5:23:45 PM (9 months ago)
Author:
toby
Message:

gsas2pkg updated buggy on Linux

Location:
install/g2pkg
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • install/g2pkg/meta.yaml

    r4478 r4696  
    11package:
    22  name: gsas2pkg
    3   version: "1.1.0"  # remember to change in g2conda/construct.yaml to match this
     3  version: "2.0.0"
    44
    55source:
     
    1616    - python>=3.7
    1717    - conda
    18     - numpy>=1.18
     18    - numpy
    1919    - scipy
    20     - matplotlib=3.0
     20    - matplotlib>=3.3
    2121    - pillow
    2222    - pyopengl
     
    2828    - pywin32                              [win]
    2929    - python.app                           [osx]
    30 
  • install/g2pkg/post-link.sh

    r2171 r4696  
    11#!/bin/bash
    2 echo "Preparing to install GSAS-II from APS subversion server"
    3 mkdir $PREFIX/GSASII
    4 cp $PREFIX/bin/gsas2-install.py $PREFIX/GSASII/bootstrap.py
    5 echo $PREFIX/bin/python
    6 $PREFIX/bin/python $PREFIX/GSASII/bootstrap.py
     2mkdir -p $PREFIX/GSASII
     3echo "Preparing to install GSAS-II from APS subversion server" > $PREFIX/GSASII/conda_inst.log
     4cp $PREFIX/bin/gsas2-install.py $PREFIX/GSASII/bootstrap.py > $PREFIX/GSASII/conda_inst.log 2>&1
     5echo $PREFIX/bin/python  >> $PREFIX/GSASII/conda_inst.log 2>&1
     6$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py >> $PREFIX/GSASII/conda_inst.log 2>&1
     7echo "# Commands to start GSAS-II" > $CONDA_ROOT/start_GSASII.sh
     8echo "source $CONDA_ROOT/bin/activate $CONDA_DEFAULT_ENV" >> $CONDA_ROOT/start_GSASII.sh
     9if [ -e $PREFIX/bin/pythonw ]
     10then
     11   echo "$PREFIX/bin/pythonw $PREFIX/GSASII/GSASII.py" >> $CONDA_ROOT/start_GSASII.sh
     12else
     13   echo "$PREFIX/bin/python $PREFIX/GSASII/GSASII.py" >> $CONDA_ROOT/start_GSASII.sh
     14fi
Note: See TracChangeset for help on using the changeset viewer.