Changeset 5412

Timestamp:

Nov 27, 2022 1:55:13 PM (6 months ago)

Author:

toby

Message:

build changes for win/conda-forge

Location:

install

Files:

• g2complete/bld.bat.template (modified) (1 diff)
• g2complete/meta.yaml.template (modified) (1 diff)
• g2full/construct.yaml.template (modified) (1 diff)

install/g2complete/bld.bat.template

@@ -1 @@
-REM This gets run during Build of gsas2complete to put all G2 files into .exe
+REM|  This gets run during Build of gsas2complete to put all G2 files into .exe
+REM| 
+REM|  pulls bootstrap.py & svn from GSASII repository and then uses the
+REM|  bootstrap to pull in the current GSAS-II distribution into the build
+REM|  directory
+REM|
+
 if not exist "%PREFIX%\GSASII" (
     mkdir "%PREFIX%\GSASII"
     if errorlevel 1 exit 1
  )
-copy %RECIPE_DIR%\src\bootstrap.py %PREFIX%\GSASII\
+REM copy %RECIPE_DIR%\src\bootstrap.py %PREFIX%\GSASII\
+svn export https://subversion.xray.aps.anl.gov/pyGSAS/install/bootstrap.py %PREFIX%\GSASII
+if errorlevel 1 exit 1
+REM mkdir %PREFIX%\GSASII\SVN
+REM copy C:\Users\IEUser\SVN\*.* %PREFIX%\GSASII\SVN
+svn export https://subversion.xray.aps.anl.gov/pyGSAS/install/svn/anaconda_win64 %PREFIX%\GSASII\SVN
 if errorlevel 1 exit 1
 REM Install files now

install/g2complete/meta.yaml.template

@@ -18 +18 @@
     - scipy
     - pillow
+    - requests
     - pyopengl
-    - svn
+    - svn                                  [not win]
     - hdf5
     - h5py
     - imageio
     - pywin32                              [win]
-    - python.app=2                         [osx]
+    - python.app                           [osx]

install/g2full/construct.yaml.template

@@ -4 +4 @@
 
 channels:
-  - https://conda.anaconda.org/anaconda
-#  - https://conda.anaconda.org/conda-forge
-#  - https://repo.continuum.io/pkgs/main
+  - https://conda.anaconda.org/conda-forge
   
 specs: