Changeset 4715

Timestamp:

Jan 5, 2021 6:20:34 AM (3 years ago)

Author:

toby

Message:

install: add postinstall for g2full & cleanup

Location:

install

Files:

• g2complete/bld.bat (deleted)
• g2complete/build.sh (deleted)
• g2complete/post-link.sh (modified) (2 diffs)
• g2conda (deleted)
• g2conda-py27 (deleted)
• g2full/construct.yaml.template (modified) (1 diff)
• g2full/g2postinstall.bat (added)
• g2full/g2postinstall.sh (added)

install/g2complete/post-link.sh

@@ -2 +2 @@
 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
+#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...)
@@ -12 +12 @@
 $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
+#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
+echo "GSAS-II bootstrap completed" > $PREFIX/.messages.txt

install/g2full/construct.yaml.template

@@ -33 +33 @@
 #  - sip                              [not osx]
 
+post_install: g2postinstall.sh           [unix]
+post_install: g2postinstall.bat           [win]
+
 license_file: EULA.txt