Merge branch 'marc2021.2' of magit1.mpie.de:damask/DAMASK into marc2021.2

This commit is contained in:
Franz Roters 2021-07-13 16:55:35 +02:00
commit 2e19b4995b
47 changed files with 6 additions and 6 deletions

4
.gitattributes vendored
View File

@ -12,9 +12,9 @@
*.pbz2 binary *.pbz2 binary
# ignore files from MSC.Marc in language statistics # ignore files from MSC.Marc in language statistics
installation/MarcMentat/** linguist-vendored install/MarcMentat/** linguist-vendored
src/Marc/include/* linguist-vendored src/Marc/include/* linguist-vendored
installation/MarcMentat/apply_DAMASK_modifications.py linguist-vendored=false install/MarcMentat/apply_DAMASK_modifications.py linguist-vendored=false
# ignore reference files for tests in language statistics # ignore reference files for tests in language statistics
python/tests/reference/** linguist-vendored python/tests/reference/** linguist-vendored

View File

@ -37,7 +37,7 @@ msc_version = args.msc_version
print('adapting Marc tools...\n') print('adapting Marc tools...\n')
src = damask_root/f'installation/mods_MarcMentat/{msc_version}/Marc_tools' src = damask_root/f'install/MarcMentat/{msc_version}/Marc_tools'
dst = msc_root/f'marc{msc_version}/tools' dst = msc_root/f'marc{msc_version}/tools'
for in_file in glob.glob(str(src/'*damask*')) + [str(src/'include_linux64')]: for in_file in glob.glob(str(src/'*damask*')) + [str(src/'include_linux64')]:
copy_and_replace(in_file,dst,args.msc_root,args.editor) copy_and_replace(in_file,dst,args.msc_root,args.editor)
@ -45,12 +45,12 @@ for in_file in glob.glob(str(src/'*damask*')) + [str(src/'include_linux64')]:
print('adapting Mentat scripts and menus...\n') print('adapting Mentat scripts and menus...\n')
src = damask_root/f'installation/mods_MarcMentat/{msc_version}/Mentat_bin' src = damask_root/f'install/MarcMentat/{msc_version}/Mentat_bin'
dst = msc_root/f'mentat{msc_version}/bin' dst = msc_root/f'mentat{msc_version}/bin'
for in_file in glob.glob(str(src/'*[!.original]')): for in_file in glob.glob(str(src/'*[!.original]')):
copy_and_replace(in_file,dst,args.msc_root,args.editor) copy_and_replace(in_file,dst,args.msc_root,args.editor)
src = damask_root/f'installation/mods_MarcMentat/{msc_version}/Mentat_menus' src = damask_root/f'install/MarcMentat/{msc_version}/Mentat_menus'
dst = msc_root/f'mentat{msc_version}/menus' dst = msc_root/f'mentat{msc_version}/menus'
for in_file in glob.glob(str(src/'job_run.ms')): for in_file in glob.glob(str(src/'job_run.ms')):
copy_and_replace(in_file,dst,args.msc_root,args.editor) copy_and_replace(in_file,dst,args.msc_root,args.editor)
@ -60,7 +60,7 @@ print('compiling Mentat menu binaries...')
executable = msc_root/f'mentat{msc_version}/bin/mentat' executable = msc_root/f'mentat{msc_version}/bin/mentat'
menu_file = msc_root/f'mentat{msc_version}/menus/linux64/main.msb' menu_file = msc_root/f'mentat{msc_version}/menus/linux64/main.msb'
os.system(f'xvfb-run {executable} -compile {menu_file}') os.system(f'xvfb-run -a {executable} -compile {menu_file}')
print('setting file access rights...\n') print('setting file access rights...\n')