Changeset 4704


Ignore:
Timestamp:
Jan 3, 2021 2:28:15 PM (10 months ago)
Author:
toby
Message:

now work on g2complete

Location:
install
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • install/g2complete/bld.bat

    r4230 r4704  
    77if errorlevel 1 exit 1
    88REM Install files now
    9 python %PREFIX%\GSASII\bootstrap.py --noproxy --noinstall
     9python %PREFIX%\GSASII\bootstrap.py --noproxy --noinstall --binary=1.19
    1010if errorlevel 1 exit 1
  • install/g2complete/build.sh

    r4445 r4704  
    11#!/bin/bash
    22echo '==================== running build.sh ===================='
    3 echo '==================== env ===================='
    4 env
    5 echo '==================== which python ===================='
    6 which python
    7 python -c 'import sys; print(sys.version); import numpy; print(numpy.__version__)'
     3#echo '==================== env ===================='
     4#env
     5#echo '==================== which python ===================='
     6#which python
     7#python -c 'import sys; print(sys.version); import numpy; print(numpy.__version__)'
    88mkdir -p $PREFIX/GSASII
    99cp $RECIPE_DIR/src/bootstrap.py $PREFIX/GSASII
    10 python $PREFIX/GSASII/bootstrap.py --binary=1.18 >> $PREFIX/conda_build_log.txt
     10python $PREFIX/GSASII/bootstrap.py --binary=1.19 > $PREFIX/conda_G2build_log.txt
  • install/g2complete/meta.yaml.template

    r4443 r4704  
    1313    - python>=3.7
    1414    - conda
    15     - numpy>=1.18
     15    - numpy=1.19     # note hard coded in bld.bat and build.sh
    1616    - scipy
    17     - matplotlib=3.0
     17    - matplotlib>=3.3
    1818    - pillow
    1919    - pyopengl
  • install/g2complete/post-link.bat

    r4233 r4704  
    1 echo "Complete installation GSAS-II and update from APS subversion server if on network"
     1echo "Complete installation GSAS-II and update from APS subversion server, if on network"
    22set "python=%PREFIX%\python.exe"
    33set "updatescript=%PREFIX%\GSASII\bootstrap.py"
     4REM create bootstrap batch file
     5echo REM Commands to run GSAS-II load/update process > "%CONDA_ROOT%\start_G2_bootstrap.bat"
     6echo call %CONDA_ROOT%\Scripts\activate %CONDA_DEFAULT_ENV% >> "%CONDA_ROOT%\start_G2_bootstrap.bat"
     7echo python %PREFIX%\GSASII\bootstrap.py >> "%CONDA_ROOT%\start_G2_bootstrap.bat"
    48REM "install" the GSAS-II package (create shortcuts, byte-compile...)
    59call "%PREFIX%\Scripts\Activate"
     
    711REM Now try to update to latest GSAS-II version (will fail if no network)
    812"%python%" "%updatescript%" --noinstall > "%PREFIX%\GSASII\UpdateLog.txt"
    9 pause
     13REM# create start GSAS-II batch file
     14echo REM Commands to run GSAS-II load/update process > "%CONDA_ROOT%\start_GSASII.bat"
     15echo call %CONDA_ROOT%\Scripts\activate %CONDA_DEFAULT_ENV% >> "%CONDA_ROOT%\start_GSASII.bat"
     16echo python %PREFIX%\GSASII\GSASII.py >> "%CONDA_ROOT%\start_GSASII.bat"
     17REM pause
    1018set errorlevel=0
    1119exit 0
  • install/g2complete/post-link.sh

    r4261 r4704  
    11#!/bin/bash
    2 echo "Complete installation GSAS-II and update from APS subversion server if on network"
    3 echo $PREFIX/bin/python
     2echo "Complete installation GSAS-II and update from APS subversion server, if on network" > $PREFIX/GSASII/conda_inst.log
     3# create bootstrap script
     4echo "# Commands to run GSAS-II load/update process" > $CONDA_ROOT/start_G2_bootstrap.sh
     5echo "source $CONDA_ROOT/bin/activate $CONDA_DEFAULT_ENV" >> $CONDA_ROOT/start_G2_bootstrap.sh
     6echo "$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py" >> $CONDA_ROOT/start_G2_bootstrap.sh
     7#
    48# "install" the GSAS-II package (create shortcuts, byte-compile...)
    5 $PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > /tmp/bootstrap1.log 2>> $PREFIX/.messages.txt
     9#
     10$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > /tmp/bootstrap1.log 2>> $PREFIX/GSASII/conda_inst.log 2>&1
    611# Now try to update to latest GSAS-II version (will fail if no network)
    7 $PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall > /tmp/bootstrap2.log 2>> $PREFIX/.messages.txt
     12$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall > /tmp/bootstrap2.log 2>> $PREFIX/GSASII/conda_inst.log 2>&1
     13# create start script
     14echo "# Commands to start GSAS-II" > $CONDA_ROOT/start_GSASII.sh
     15echo "source $CONDA_ROOT/bin/activate $CONDA_DEFAULT_ENV" >> $CONDA_ROOT/start_GSASII.sh
     16if [ -e $PREFIX/bin/pythonw ]
     17then
     18   echo "$PREFIX/bin/pythonw $PREFIX/GSASII/GSASII.py" >> $CONDA_ROOT/start_GSASII.sh
     19else
     20   echo "$PREFIX/bin/python $PREFIX/GSASII/GSASII.py" >> $CONDA_ROOT/start_GSASII.sh
     21fi
     22cp $PREFIX/GSASII/conda_inst.log $PREFIX/.messages.txt
  • install/g2pkg/post-link.bat

    r4703 r4704  
    1 REM echo "Install GSAS-II from APS subversion server" %PREFIX%\.messages.txt
     1REM echo "Install GSAS-II from APS subversion server" > %PREFIX%\.messages.txt
    22mkdir "%PREFIX%\GSASII"
    33REM# create bootstrap batch file
Note: See TracChangeset for help on using the changeset viewer.