Changeset 4736

Timestamp:

Jan 7, 2021 3:53:49 PM (3 years ago)

Author:

toby

Message:

more install work

Files:

• install/bootstrap.py (modified) (5 diffs)
• install/g2complete/build.sh.template (modified) (1 diff)
• install/g2complete/post-link.sh (modified) (1 diff)
• install/g2complete/src/bootstrap.py (modified) (5 diffs)
• install/g2full/g2postinstall.sh (modified) (1 diff)
• trunk/makeLinux.py (modified) (1 diff)
• trunk/makeMacApp.py (modified) (3 diffs)

install/bootstrap.py

@@ -11 +11 @@
 skipInstallChecks = False  # if set to True, continue installation even if current Python lacks packages and
                            # skips platform-dependent installation steps
+                           #--> True: -noinstall or -binary=
 skipDownloadSteps = False  # if False, svn is used to download GSAS-II files and binaries 
+                           #--> True: -nonet
 skipProxy = False          # if False then the script creates a prompt asking for proxy info
+                           #--> True: -nonet or -noproxy or -binary=
 showWXerror = False        # if True, errors are shown in wxPython windows (used on Windows only)
+                           #--> True: -noinstall or -binary= (both on windows)
 help = False               # if True, a help message is shown
+                           #--> True: -help
 allBinaries = False        # if True, causes all binaries to be installed
-binaryVersion=None         # if specified, gives a specific numpy version to use (such as 1.18)
+                           #--> True: -allbinaries or -server
+numpyVersion=None          # if specified, gives a specific numpy version to use (such as 1.18)
                            # for selecting a set of binaries to use
-numpyVersion=None
+                           #--> Set by: -binary=
 
 for a in sys.argv[1:]:
@@ -581 +587 @@
 elif numpyVersion:
     binaryVersion = GSASIIpath.GetBinaryPrefix()+'_n'+numpyVersion
+    print('Load binaries from '+binaryVersion)
     if not GSASIIpath.svnSwitchDir('bindist','',g2home+ 'Binaries/'+binaryVersion,None,True):
         msg = 'Binary load failed with '+binaryVersion+'. Subversion problem? Please seek help'
         BailOut(msg)
 else:
+    print('Load binaries matching current python/numpy')
     GSASIIpath.DownloadG2Binaries(g2home)
         
@@ -649 +657 @@
             exec(source_file.read())
 
+#===========================================================================
+# on Windows, make a batch file with Python and GSAS-II location hard-coded
 if skipInstallChecks:
     pass
-#===========================================================================
-# on Windows, make a batch file with Python and GSAS-II location hard-coded
 elif sys.platform.startswith('win') and os.path.exists(
     os.path.join(path2GSAS2,"makeBat.py")):
@@ -659 +667 @@
 # on a Mac, make an applescript 
 elif sys.platform.startswith('darwin') and os.path.exists(
-    os.path.join(path2GSAS2,"makeMacApp.py")):
+         os.path.join(path2GSAS2,"makeMacApp.py")):
     sys.argv = [os.path.join(path2GSAS2,"makeMacApp.py")]
     print(u'running '+sys.argv[0])
@@ -666 +674 @@
 # On linux, make desktop icon
 elif sys.platform.startswith('linux') and os.path.exists(
-    os.path.join(path2GSAS2,"makeLinux.py")):
+         os.path.join(path2GSAS2,"makeLinux.py")):
     sys.argv = [os.path.join(path2GSAS2,"makeLinux.py")]
     print(u'running '+sys.argv[0])

install/g2complete/build.sh.template

@@ -8 +8 @@
 mkdir -p $PREFIX/GSASII
 cp $RECIPE_DIR/src/bootstrap.py $PREFIX/GSASII
-python $PREFIX/GSASII/bootstrap.py --binary=**npversion** > $PREFIX/conda_G2build_log.txt
+python $PREFIX/GSASII/bootstrap.py --binary=**npversion** > $PREFIX/GSASII/conda_G2build_log.txt 2>&1

install/g2complete/post-link.sh

@@ -1 +1 @@
 #!/bin/bash
-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 "Complete complete installation GSAS-II from APS subversion server" > $PREFIX/GSASII/conda_inst.log
+# Note: for g2complete create scripts to access bootstrap & start are moved to g2postinstall.sh (g2full)
 #
 # "install" the GSAS-II package (create shortcuts, byte-compile...)
 #
-$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > /tmp/bootstrap1.log 2>> $PREFIX/GSASII/conda_inst.log 2>&1
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet >> $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/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 "GSAS-II bootstrap completed" > $PREFIX/.messages.txt
+$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall >> $PREFIX/GSASII/conda_inst.log 2>&1
+cp $PREFIX/GSASII/conda_inst.log $PREFIX/.messages.txt
+echo "GSAS-II bootstrap completed" >> $PREFIX/.messages.txt

install/g2complete/src/bootstrap.py

@@ -11 +11 @@
 skipInstallChecks = False  # if set to True, continue installation even if current Python lacks packages and
                            # skips platform-dependent installation steps
+                           #--> True: -noinstall or -binary=
 skipDownloadSteps = False  # if False, svn is used to download GSAS-II files and binaries 
+                           #--> True: -nonet
 skipProxy = False          # if False then the script creates a prompt asking for proxy info
+                           #--> True: -nonet or -noproxy or -binary=
 showWXerror = False        # if True, errors are shown in wxPython windows (used on Windows only)
+                           #--> True: -noinstall or -binary= (both on windows)
 help = False               # if True, a help message is shown
+                           #--> True: -help
 allBinaries = False        # if True, causes all binaries to be installed
-binaryVersion=None         # if specified, gives a specific numpy version to use (such as 1.18)
+                           #--> True: -allbinaries or -server
+numpyVersion=None          # if specified, gives a specific numpy version to use (such as 1.18)
                            # for selecting a set of binaries to use
-numpyVersion=None
+                           #--> Set by: -binary=
 
 for a in sys.argv[1:]:
@@ -581 +587 @@
 elif numpyVersion:
     binaryVersion = GSASIIpath.GetBinaryPrefix()+'_n'+numpyVersion
+    print('Load binaries from '+binaryVersion)
     if not GSASIIpath.svnSwitchDir('bindist','',g2home+ 'Binaries/'+binaryVersion,None,True):
         msg = 'Binary load failed with '+binaryVersion+'. Subversion problem? Please seek help'
         BailOut(msg)
 else:
+    print('Load binaries matching current python/numpy')
     GSASIIpath.DownloadG2Binaries(g2home)
         
@@ -649 +657 @@
             exec(source_file.read())
 
+#===========================================================================
+# on Windows, make a batch file with Python and GSAS-II location hard-coded
 if skipInstallChecks:
     pass
-#===========================================================================
-# on Windows, make a batch file with Python and GSAS-II location hard-coded
 elif sys.platform.startswith('win') and os.path.exists(
     os.path.join(path2GSAS2,"makeBat.py")):
@@ -659 +667 @@
 # on a Mac, make an applescript 
 elif sys.platform.startswith('darwin') and os.path.exists(
-    os.path.join(path2GSAS2,"makeMacApp.py")):
+         os.path.join(path2GSAS2,"makeMacApp.py")):
     sys.argv = [os.path.join(path2GSAS2,"makeMacApp.py")]
     print(u'running '+sys.argv[0])
@@ -666 +674 @@
 # On linux, make desktop icon
 elif sys.platform.startswith('linux') and os.path.exists(
-    os.path.join(path2GSAS2,"makeLinux.py")):
+         os.path.join(path2GSAS2,"makeLinux.py")):
     sys.argv = [os.path.join(path2GSAS2,"makeLinux.py")]
     print(u'running '+sys.argv[0])

install/g2full/g2postinstall.sh

@@ -21 +21 @@
 fi
 # in case constructor changed the binary files
-svn revert $PREFIX/GSASII/bindist/*
+$PREFIX/bin/svn revert $PREFIX/GSASII/bindist/*
+#create the GSAS-II app or Desktop icon (note that scripts run only on correct platform)
+$PREFIX/bin/python $PREFIX/GSASII/makeMacApp.py
+$PREFIX/bin/python $PREFIX/GSASII/makeLinux.py

trunk/makeLinux.py

@@ -30 +30 @@
     print("\n\tUsage: python "+sys.argv[0]+" [<GSAS-II script>]\n")
     sys.exit()
-if __name__ == '__main__':
+
+if __name__ == '__main__' and sys.platform.startswith('linux'):
     # find the main GSAS-II script if not on command line
     if len(sys.argv) == 1:

trunk/makeMacApp.py

@@ -7 +7 @@
 created in the directory where the GSAS-II script (.../GSASII/GSASII.py) 
 is located. A softlink to Python is created inside that app bundle, 
-but the softlink name is GSAS-II so that GSAS-II shows up as the name 
-of the app rather than  Python in the menu bar, etc. A soft link named 
+but the softlink name is GSAS-II so that "GSAS-II" shows up as the name 
+of the app in the menu bar, etc. rather than "Python". A soft link named 
 GSAS-II.py, referencing the GSASII.py script, is created so that some file 
 menu items also are labeled with GSAS-II (but not the right capitalization, 
@@ -15 +15 @@
 This has been tested with several versions of Python interpreters 
 from Anaconda and does not require pythonw (Python.app). It tests to 
-make sure that a wx python script will run inside Python and if not, 
+make sure that a wxpython script will run inside the app but if not, 
 it searches for a pythonw image and tries that. 
 
@@ -51 +51 @@
 '''
 
-if __name__ == '__main__':
+if __name__ == '__main__' and sys.platform == "darwin":
     project="GSAS-II"