Changeset 4704 for install

Timestamp:

Jan 3, 2021 2:28:15 PM (2 years ago)

Author:

toby

Message:

now work on g2complete

Location:

install

Files:

• g2complete/bld.bat (modified) (1 diff)
• g2complete/build.sh (modified) (1 diff)
• g2complete/meta.yaml.template (modified) (1 diff)
• g2complete/post-link.bat (modified) (2 diffs)
• g2complete/post-link.sh (modified) (1 diff)
• g2pkg/post-link.bat (modified) (1 diff)

install/g2complete/bld.bat

@@ -7 +7 @@
 if errorlevel 1 exit 1
 REM Install files now
-python %PREFIX%\GSASII\bootstrap.py --noproxy --noinstall
+python %PREFIX%\GSASII\bootstrap.py --noproxy --noinstall --binary=1.19
 if errorlevel 1 exit 1

install/g2complete/build.sh

@@ -1 +1 @@
 #!/bin/bash
 echo '==================== running build.sh ===================='
-echo '==================== env ===================='
-env
-echo '==================== which python ===================='
-which python
-python -c 'import sys; print(sys.version); import numpy; print(numpy.__version__)'
+#echo '==================== env ===================='
+#env
+#echo '==================== which python ===================='
+#which python
+#python -c 'import sys; print(sys.version); import numpy; print(numpy.__version__)'
 mkdir -p $PREFIX/GSASII
 cp $RECIPE_DIR/src/bootstrap.py $PREFIX/GSASII
-python $PREFIX/GSASII/bootstrap.py --binary=1.18 >> $PREFIX/conda_build_log.txt
+python $PREFIX/GSASII/bootstrap.py --binary=1.19 > $PREFIX/conda_G2build_log.txt

install/g2complete/meta.yaml.template

@@ -13 +13 @@
     - python>=3.7
     - conda
-    - numpy>=1.18
+    - numpy=1.19     # note hard coded in bld.bat and build.sh
     - scipy
-    - matplotlib=3.0
+    - matplotlib>=3.3
     - pillow
     - pyopengl

install/g2complete/post-link.bat

@@ -1 @@
-echo "Complete installation GSAS-II and update from APS subversion server if on network"
+echo "Complete installation GSAS-II and update from APS subversion server, if on network"
 set "python=%PREFIX%\python.exe"
 set "updatescript=%PREFIX%\GSASII\bootstrap.py"
+REM create bootstrap batch file
+echo REM Commands to run GSAS-II load/update process > "%CONDA_ROOT%\start_G2_bootstrap.bat"
+echo call %CONDA_ROOT%\Scripts\activate %CONDA_DEFAULT_ENV% >> "%CONDA_ROOT%\start_G2_bootstrap.bat"
+echo python %PREFIX%\GSASII\bootstrap.py >> "%CONDA_ROOT%\start_G2_bootstrap.bat"
 REM "install" the GSAS-II package (create shortcuts, byte-compile...)
 call "%PREFIX%\Scripts\Activate"
@@ -7 +11 @@
 REM Now try to update to latest GSAS-II version (will fail if no network)
 "%python%" "%updatescript%" --noinstall > "%PREFIX%\GSASII\UpdateLog.txt"
-pause
+REM# create start GSAS-II batch file
+echo REM Commands to run GSAS-II load/update process > "%CONDA_ROOT%\start_GSASII.bat"
+echo call %CONDA_ROOT%\Scripts\activate %CONDA_DEFAULT_ENV% >> "%CONDA_ROOT%\start_GSASII.bat"
+echo python %PREFIX%\GSASII\GSASII.py >> "%CONDA_ROOT%\start_GSASII.bat"
+REM pause
 set errorlevel=0
 exit 0

install/g2complete/post-link.sh

@@ -1 +1 @@
 #!/bin/bash
-echo "Complete installation GSAS-II and update from APS subversion server if on network"
-echo $PREFIX/bin/python
+echo "Complete installation GSAS-II and update from APS subversion server, if on network" > $PREFIX/GSASII/conda_inst.log
+# create bootstrap script
+echo "# Commands to run GSAS-II load/update process" > $CONDA_ROOT/start_G2_bootstrap.sh
+echo "source $CONDA_ROOT/bin/activate $CONDA_DEFAULT_ENV" >> $CONDA_ROOT/start_G2_bootstrap.sh
+echo "$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py" >> $CONDA_ROOT/start_G2_bootstrap.sh
+#
 # "install" the GSAS-II package (create shortcuts, byte-compile...)
-$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > /tmp/bootstrap1.log 2>> $PREFIX/.messages.txt
+#
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > /tmp/bootstrap1.log 2>> $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/.messages.txt
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall > /tmp/bootstrap2.log 2>> $PREFIX/GSASII/conda_inst.log 2>&1
+# create start script
+echo "# Commands to start GSAS-II" > $CONDA_ROOT/start_GSASII.sh
+echo "source $CONDA_ROOT/bin/activate $CONDA_DEFAULT_ENV" >> $CONDA_ROOT/start_GSASII.sh
+if [ -e $PREFIX/bin/pythonw ]
+then
+   echo "$PREFIX/bin/pythonw $PREFIX/GSASII/GSASII.py" >> $CONDA_ROOT/start_GSASII.sh
+else
+   echo "$PREFIX/bin/python $PREFIX/GSASII/GSASII.py" >> $CONDA_ROOT/start_GSASII.sh
+fi
+cp $PREFIX/GSASII/conda_inst.log $PREFIX/.messages.txt

install/g2pkg/post-link.bat

@@ -1 @@
-REM echo "Install GSAS-II from APS subversion server" %PREFIX%\.messages.txt
+REM echo "Install GSAS-II from APS subversion server" > %PREFIX%\.messages.txt
 mkdir "%PREFIX%\GSASII"
 REM# create bootstrap batch file