Changeset 4261

Timestamp:

Jan 19, 2020 10:07:35 AM (4 years ago)

Author:

toby

Message:

Last(?) updates to mac/linux install

Location:

install/g2complete

Files:

• post-link.sh (modified) (1 diff)
• src/bootstrap.py (modified) (4 diffs)

install/g2complete/post-link.sh

@@ -3 +3 @@
 echo $PREFIX/bin/python
 # "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/.messages.txt
 # 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

install/g2complete/src/bootstrap.py

@@ -68 +68 @@
         dlg.Destroy()
     else:
-        print(msg,file=sys.stderr)
+        print("BOOTSTRAP WARNING: ",file=sys.stderr)
+        print(msg.replace('\n',' '),file=sys.stderr)
+        print(" Recreate this using command: {} {} {}".format(
+            os.path.abspath(sys.executable),
+            os.path.abspath(os.path.expanduser(__file__)),
+            ' '.join(sys.argv[1:]),
+        ),file=sys.stderr)
     sys.exit()
         
@@ -406 +412 @@
             if os.path.exists(os.path.join(path2GSAS2,"makeBat.py")):
                 msg += '\n\nGSAS-II failed to be updated. A likely reason is a network access'
-                msg += '\nproblem. If your web browser works, but the update did not.'
-                msg += '\nThe most common reason is you need to use a network proxy. Please'
+                msg += '\nproblem. If your web browser works, but the update did not,'
+                msg += '\nthe most common reason is you need to use a network proxy. Please'
                 msg += '\ncheck with a network administrator or use http://www.whatismyproxy.com/'
-            else:                
+            else:
+                # this will happen only with initial installs where all files
+                # are to be downloaded (not gsas2full or updates)
                 msg += '\n\n  *** GSAS-II failed to be installed. A likely reason is a network access'
                 msg += '\n  *** problem, most commonly because you need to use a network proxy. Please'
@@ -427 +435 @@
     print('Loading all binaries with command...')
     if not GSASIIpath.svnSwitchDir('AllBinaries','',g2home+ 'Binaries/',None,True):
-        msg = 'Binary load failed'
+        msg = 'Binary load failed. Subversion problem? Please seek help'
         BailOut(msg)
 else:
@@ -463 +471 @@
         msg += err
     #print('\nAttempting to open a web page on compiling GSAS-II...')
-    msg += '\n\nPlease see web page\nhttps://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII'
+    msg += '\n\nPlease see web page\nhttps://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/CompileGSASII if you wish to compile for yourself (usually not needed for windows and Mac, but sometimes required for Linux.)'
     BailOut(msg)
     #import webbrowser