add version for binaries to meson build; show binary version on startup; create meson install commands

Author: briantoby

.gitignore

@@ -28,8 +28,10 @@ __pycache__
 
 # from Spyder
 .spyproject
+
 # GSAS binaries
 GSASII/bindist
+GSASII/bin
 
 # Local dev env files
 .vscode

GSASII/GSASIIpath.py

@@ -1154,9 +1154,20 @@ def TestSPG():
     '''Test if pyspg.[so,.pyd] can be run from a location in the existing path
     Do not modify the path if not.
     '''
+    def showVersion():
+        try:
+            f = os.path.join(os.path.dirname(pyspg.__file__),'GSASIIversion.txt')
+            with open(f,'r') as fp:
+                version = fp.readline().strip()
+                vnum = fp.readline().strip()
+            print(f'  Binary ver: {vnum}, {version}')
+        except:
+            if GetConfigValue('debug'): 
+                print('  Binaries:   undated')
     try:
         from . import pyspg
         pyspg
+        showVersion()
         return True
     except ImportError:
         pass
@@ -1172,6 +1183,7 @@ def TestSPG():
         print(f'Module pyspg in {pyspg.__file__} could not be run\nerror msg: {err}')
         print(70*'=')
         return False
+    showVersion()
     return True
 
 def pathhack_TestSPG(fpth):

sources/.gitignore

@@ -1,3 +1,3 @@
-
 *module.c
-*-f2pywrappers.f
+*-f2pywrappers.f
+GSASIIversion.txt

sources/install.bat

@@ -0,0 +1,6 @@
+set OUTDIR=%USERPROFILE%\.GSASII\bin
+copy /y "%MESON_BUILD_ROOT%\sources\"*.so ${OUTDIR}\
+copy /y "%MESON_BUILD_ROOT%\sources\"*/*.so ${OUTDIR}\
+copy /y "%MESON_BUILD_ROOT%\sources\"LATTIC ${OUTDIR}\
+copy /y "%MESON_BUILD_ROOT%\sources\"convcell ${OUTDIR}\
+copy /y "%MESON_BUILD_ROOT%\sources\"GSAS*.txt ${OUTDIR}\

sources/install.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+OUTDIR=~/.GSASII/bin
+mkdir -p ${OUTDIR}
+cp -v "${MESON_BUILD_ROOT}/sources/"*.so ${OUTDIR}/
+cp -v "${MESON_BUILD_ROOT}/sources/"*/*.so ${OUTDIR}/
+cp -v "${MESON_BUILD_ROOT}/sources/"LATTIC ${OUTDIR}/
+cp -v "${MESON_BUILD_ROOT}/sources/"convcell ${OUTDIR}/
+cp -v "${MESON_BUILD_ROOT}/sources/"GSAS*.txt ${OUTDIR}/

sources/meson.build

@@ -203,3 +203,17 @@ executable('convcell', files('convcell.f'), install:true)
 #executable('LATTIC', files('LATTIC.f'), link_with:NISTlatsubs_lib, install:true)
 executable('LATTIC', files('LATTIC.f','NISTlatsubs/BLOCKDATA1.f'), link_with:NISTlatsubs_lib, install:true)
 subdir('k_vec_cython')
+
+# create text file with version info
+r = run_command(py, 'tagbinaries.py', check:true)
+
+if host_machine.system() == 'windows'
+   install = files('install.bat')
+   sysinstall = files('sysinstall.bat')
+else
+   install = files('install.sh')
+   sysinstall = files('sysinstall.sh')
+endif 
+
+r = run_target('local-install', command: install)
+r = run_target('system-install', command: sysinstall)

sources/sysinstall.bat

@@ -0,0 +1,6 @@
+set OUTDIR=%MESON_SOURCE_ROOT%\GSASII\bin
+copy /y "%MESON_BUILD_ROOT%\sources\"*.so ${OUTDIR}\
+copy /y "%MESON_BUILD_ROOT%\sources\"*/*.so ${OUTDIR}\
+copy /y "%MESON_BUILD_ROOT%\sources\"LATTIC ${OUTDIR}\
+copy /y "%MESON_BUILD_ROOT%\sources\"convcell ${OUTDIR}\
+copy /y "%MESON_BUILD_ROOT%\sources\"GSAS*.txt ${OUTDIR}\

sources/sysinstall.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+OUTDIR=${MESON_SOURCE_ROOT}/GSASII/bin
+mkdir -p ${OUTDIR}
+cp -v "${MESON_BUILD_ROOT}/sources/"*.so ${OUTDIR}/
+cp -v "${MESON_BUILD_ROOT}/sources/"*/*.so ${OUTDIR}/
+cp -v "${MESON_BUILD_ROOT}/sources/"LATTIC ${OUTDIR}/
+cp -v "${MESON_BUILD_ROOT}/sources/"convcell ${OUTDIR}/
+cp -v "${MESON_BUILD_ROOT}/sources/"GSAS*.txt ${OUTDIR}/

sources/tagbinaries.py

@@ -0,0 +1,43 @@
+# this routine is intended to be run from inside meson and creates a
+# file named GSASIIversion.txt with that information
+import sys
+import os
+import shutil
+import subprocess
+import datetime
+source = os.environ.get('MESON_SOURCE_ROOT',
+                    os.path.dirname(os.path.dirname(__file__)))
+build = os.environ.get('MESON_BUILD_ROOT',
+                    os.path.dirname(os.path.dirname(__file__)))
+
+if shutil.which('git'):
+    out = subprocess.run(['git','tag','-l','--sort=-authordate','v*'],
+                             stdout=subprocess.PIPE,cwd=source)
+    version = out.stdout.decode('latin-1').split('\n')[0].strip()
+    out = subprocess.run(['git','tag','-l','--sort=-authordate','[0-9]*'],
+                             stdout=subprocess.PIPE,cwd=source)
+    number = out.stdout.decode('latin-1').split('\n')[0].strip()
+    out = subprocess.run(['git','log','HEAD','-1'],
+                             stdout=subprocess.PIPE,cwd=source)
+    githash = out.stdout.decode('latin-1').split('commit')[1].split('\n')[0].strip()
+    how = 'git'
+else:
+    how = 'git_verinfo'
+    try:
+        sys.path.insert(0,source)
+        from GSASII import git_verinfo
+        number = '?'
+        githash = git_verinfo.git_version
+        version = git_verinfo.git_versiontag
+        for item in git_verinfo.git_tags+git_verinfo.git_prevtags:
+            if item.isnumeric():
+                number = item
+                break
+    except:
+        sys.exit()
+outfile = os.path.join(build,'sources','GSASIIversion.txt')
+with open(outfile,'w') as fp:
+    fp.write(f"{version}\n{number}\ncommit {githash}\n")
+    fp.write(f"#created by {__file__} on {datetime.datetime.now()} from {how}\n")
+    fp.close()
+print(outfile)