Changeset 4736 for trunk

Timestamp:

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

Author:

toby

Message:

more install work

Location:

trunk

Files:

• makeLinux.py (modified) (1 diff)
• makeMacApp.py (modified) (3 diffs)

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"