Changeset 2315 for install

Timestamp:

Jun 10, 2016 6:16:17 PM (7 years ago)

Author:

toby

Message:

seems to work, but problem in updating install.bat

Location:

install

Files:

• bootstrap.py (modified) (1 diff)
• g2conda/construct.yaml (modified) (3 diffs)
• g2conda/gsas2-welcome.png (added)
• g2pkg/bld.bat (modified) (1 diff)
• g2pkg/bootstrap.py (deleted)
• g2pkg/meta.yaml (modified) (1 diff)
• g2pkg/post-link.bat (added)
• g2pkg/src (added)
• g2pkg/src/bootstrap.py (added)
• g2pkg/src/install.bat (added)
• windows_notes.txt (added)

install/bootstrap.py

@@ -11 +11 @@
     try:
         exec('import '+pkg)
-    except:
+    except ImportError:
         missing.append(pkg)
 # handle pyopenGl differently, because that we can install later

install/g2conda/construct.yaml

@@ -9 +9 @@
 
 packages:
-  - g2load-0.1.5-0
+  - g2load-0.1.6-0
 
 specs:
@@ -15 +15 @@
   - conda
   - numpy
-  - scipy
+  - scipy 0.14*
   - matplotlib
   - pillow
@@ -21 +21 @@
   - wxpython
   - svn
+  - hdf5
   - pywin32                              [win]
 
 exclude:
-  - qt                                 [not win]
-  - sip                                [not win]
+  - qt
+  - sip
   - pyqt
+#  - qt                                   [not win]
+#  - sip                                  [not win]
+#  - pyqt                                 [not win]
 
 license_file: EULA.txt
 
-welcome_image: gsas2.png
+welcome_image: gsas2-welcome.png
+icon_image: gsas2.png

install/g2pkg/bld.bat

@@ -1 @@
-"%PYTHON%" install.py
+mkdir %PREFIX%\Scripts
 if errorlevel 1 exit 1
+copy %RECIPE_DIR%\src\bootstrap.py %PREFIX%\Scripts\gsas2-install.py
+if errorlevel 1 exit 1
+copy %RECIPE_DIR%\src\install.bat %PREFIX%\Scripts\install-gsas2.bat
+if errorlevel 1 exit 1

install/g2pkg/meta.yaml

@@ -1 +1 @@
 package: 
   name: g2load
-  version: 0.1.5
+  version: 0.1.7
 
-#requirements:
-#  build:
-#    - python
+#source:
+#  path: ./src
 
 about: