Changeset 4700

Timestamp:

Jan 2, 2021 1:35:09 PM (3 years ago)

Author:

toby

Message:

testing w/gsas2pkg redo

Location:

install/g2pkg

Files:

• meta.yaml (modified) (1 diff)
• post-link.bat (modified) (1 diff)
• post-link.sh (modified) (1 diff)

install/g2pkg/meta.yaml

@@ -1 +1 @@
 package: 
   name: gsas2pkg
-  version: "2.0.0"
+  version: "2.1.0"
 
 source:

install/g2pkg/post-link.bat

@@ -1 @@
-echo "Install GSAS-II from APS subversion server (v. 2016/7/12)"
+REM echo "Install GSAS-II from APS subversion server" %PREFIX%\.messages.txt
 mkdir "%PREFIX%\GSASII"
+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 and run the bootstrap
 copy "%PREFIX%\Scripts\gsas2-install.py" "%PREFIX%\GSASII\bootstrap.py"
 set "python=%PREFIX%\python.exe"
 set "script=%PREFIX%\GSASII\bootstrap.py"
 "%python%" "%script%"
+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
 pause
 set errorlevel=0

install/g2pkg/post-link.sh

@@ -2 +2 @@
 mkdir -p $PREFIX/GSASII
 echo "Preparing to install GSAS-II from APS subversion server" > $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 and run the bootstrap
 cp $PREFIX/bin/gsas2-install.py $PREFIX/GSASII/bootstrap.py > $PREFIX/GSASII/conda_inst.log 2>&1
 echo $PREFIX/bin/python  >> $PREFIX/GSASII/conda_inst.log 2>&1
 $PREFIX/bin/python $PREFIX/GSASII/bootstrap.py >> $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