Changeset 5421

Timestamp:

Dec 8, 2022 4:53:03 PM (6 months ago)

Author:

toby

Message:

work on mac build

Location:

install

Files:

• build_scripts/MacOS64.sh (added)
• build_scripts/win64.bat (modified) (2 diffs)
• g2complete/build.sh.template (modified) (1 diff)
• g2complete/meta.yaml.template (modified) (1 diff)
• g2full/g2postinstall.bat.template (modified) (1 diff)
• g2full/g2postinstall.sh.template (modified) (2 diffs)
• svn/homebrew_MacOS (added)
• svn/homebrew_MacOS/lib (added)
• svn/homebrew_MacOS/lib/libcrypto.1.1.dylib (added)
• svn/homebrew_MacOS/lib/libintl.8.dylib (added)
• svn/homebrew_MacOS/lib/liblz4.1.9.4.dylib (added)
• svn/homebrew_MacOS/lib/liblz4.1.dylib (added)
• svn/homebrew_MacOS/lib/libserf-1.1.3.0.dylib (added)
• svn/homebrew_MacOS/lib/libserf-1.dylib (added)
• svn/homebrew_MacOS/lib/libssl.1.1.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_client-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_delta-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_diff-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_fs-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_fs_fs-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_fs_util-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_fs_x-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_ra-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_ra_local-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_ra_serf-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_ra_svn-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_repos-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_subr-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libsvn_wc-1.0.dylib (added)
• svn/homebrew_MacOS/lib/libutf8proc.2.dylib (added)
• svn/homebrew_MacOS/macRelink.py (added)

install/build_scripts/win64.bat

@@ -68 +68 @@
 call conda list -f m2w64-gcc-fortran | findstr /B /C:# /V >> Build.notes.txt
 
-REM====== upload to svn server
+REM====== upload binaries to svn server
 cd ..
 dir
@@ -104 +104 @@
 call constructor g2full
 if ERRORLEVEL 1 exit 1
+REM make copy of current version as "latest"
 for /f "usebackq" %%i in ( `dir gsas2full*.exe /b` ) do copy %%i gsas2full-Latest-Windows-x86_64.exe
 for /f "usebackq" %%i in ( `dir gsas2full*.exe /b` ) do scp %%i svnpgsas@s11bmbcda.xray.aps.anl.gov:/home/joule/SVN/subversion/pyGSAS/downloads

install/g2complete/build.sh.template

@@ -8 +8 @@
 mkdir -p $PREFIX/GSASII
 cp $RECIPE_DIR/src/bootstrap.py $PREFIX/GSASII
-python $PREFIX/GSASII/bootstrap.py --binary=**npversion**,**pyversion** > $PREFIX/GSASII/conda_G2build_out.log 2>&1
+if [[ $OSTYPE == 'darwin'* ]]; then
+  echo 'macOS: creating svn directory'
+  svn export https://subversion.xray.aps.anl.gov/pyGSAS/install/svn/homebrew_MacOS $PREFIX/SVN > $PREFIX/GSASII/conda_G2build_out.log 2>&1
+fi
+python $PREFIX/GSASII/bootstrap.py --binary=**npversion**,**pyversion** >> $PREFIX/GSASII/conda_G2build_out.log 2>&1

install/g2complete/meta.yaml.template

@@ -20 +20 @@
     - conda
     - requests
-    - subversion                           [not win]
+    - subversion                           [linux]
     - hdf5
     - h5py

install/g2full/g2postinstall.bat.template

@@ -7 +7 @@
 echo python %PREFIX%\GSASII\bootstrap.py >> "%PREFIX%\start_G2_bootstrap.bat"
 REM constructor fixups: missing empty directories & changed binary files =======
-mkdir $PREFIX/GSASII/.svn/tmp
+mkdir %PREFIX%\GSASII\.svn\tmp
 %PREFIX%\GSASII\SVN\svn.exe revert -R %PREFIX%\GSASII\bindist
 

install/g2full/g2postinstall.sh.template

@@ -6 +6 @@
 echo "$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py" >> $PREFIX/start_G2_bootstrap.sh
 # constructor fixups: missing empty directories & changed binary files ======================
-mkdir -p $PREFIX/GSASII/.svn/tmp
+if [[ (! -d $PREFIX/GSASII/.svn/tmp) ]]
+then
+    mkdir -p $PREFIX/GSASII/.svn/tmp
+fi
 $PREFIX/bin/svn revert $PREFIX/GSASII/bindist/*
 #
@@ -13 +16 @@
 # try to update to latest GSAS-II version (will fail if no network)
 #$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall >> $PREFIX/GSASII/conda_inst.log 2>&1
-$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall
+ $PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --noinstall
 # finish installation
 #$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet > $PREFIX/GSASII/conda_inst.log 2>&1
-$PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet
+ $PREFIX/bin/python $PREFIX/GSASII/bootstrap.py --nonet
 # create shortcut to start GSAS-II     =======================================================
 echo "# Commands to start GSAS-II" > $PREFIX/start_GSASII.sh