Changeset 2370

Timestamp:

Jul 12, 2016 3:15:53 PM (7 years ago)

Author:

toby

Message:

work on windows installation with constructor 1.3.0

Location:

install

Files:

• g2conda/construct.yaml (modified) (1 diff)
• g2conda/g2install.bat (added)
• g2pkg/post-link.bat (modified) (1 diff)
• windows_notes.txt (modified) (2 diffs)

install/g2conda/construct.yaml

@@ -29 +29 @@
   - pyqt
 
+post_install: g2install.bat           [win]
+
 license_file: EULA.txt
 

install/g2pkg/post-link.bat

@@ -1 @@
-REM at present this does not get run in constructor, so it is a place-holder
-echo "Preparing to install GSAS-II from APS subversion server"
-mkdir %PREFIX%\GSASII
-copy %PREFIX%\Scripts\gsas2-install.py %PREFIX%\GSASII\bootstrap.py
-REM SET "install=%HOMEPATH%\Desktop\install-gsas2.bat"
-REM echo "%PREFIX%\python.exe" "%PREFIX%\GSASII\bootstrap.py"  > %install%
-REM echo pause >> %install%
-REM set "python=%PREFIX%\python.exe"
-REM set "script=%PREFIX%\GSASII\bootstrap.py"
-REM %python% %script%
+echo "Install GSAS-II from APS subversion server (v. 2016/7/11)"
+rem echo a error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
+mkdir "%PREFIX%\GSASII"
+rem echo b error level is %ERRORLEVEL%  >> "%PREFIX%\install-out.txt"
+copy "%PREFIX%\Scripts\gsas2-install.py" "%PREFIX%\GSASII\bootstrap.py"
+rem echo c error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
+set "python=%PREFIX%\python.exe"
+set "script=%PREFIX%\GSASII\bootstrap.py"
+rem echo d error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
+"%python%" "%script%"
+rem echo e error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
 pause
-
+rem echo f error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
+set errorlevel=0
+rem echo g error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"
 exit 0
+rem echo h error level is %ERRORLEVEL% >> "%PREFIX%\install-out.txt"

install/windows_notes.txt

@@ -7 +7 @@
 conda update anaconda-client
 
-cd Z:\software\G2\install\all
+cd /d Z:\software\G2\install\all
 conda build g2pkg
 
@@ -16 +16 @@
 use this command to build the conda dist
 conda update constructor
-cd Z:\software\G2\install\all
+cd /d Z:\software\G2\install\all
 constructor g2conda
 
 Note that downloads are to C:\Users\toby.TOBY-VM\.conda\constructor\win-64
-
+rm /Volumes/C/Users/toby.TOBY-VM/.conda//constructor/win-64/g2load-0.1.7-0.tar.bz2