ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use a list instead of a string to store the names of installed packages

Browse Source
This commit is contained in:
Axel Kohlmeyer
2018-06-20 17:57:17 -04:00
parent 9f3fae1c47
commit 9f3cb83fb3
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile
View File

@ -153,10 +153,10 @@ help:
lmpinstalledpkgs.h: $(SRC) $(INC) lmpinstalledpkgs.h: $(SRC) $(INC)
@echo 'Gathering installed package information (may take a little while)' @echo 'Gathering installed package information (may take a little while)'
@echo 'static const char lammps_installed_packages[] = " "' > lmpinstalledpkgs.tmp @echo 'static const char * lammps_installed_packages[] = {' > lmpinstalledpkgs.tmp
@for p in $(PACKAGEUC) $(PACKUSERUC); do info=$$($(SHELL) Package.sh $$p installed); \ @for p in $(PACKAGEUC) $(PACKUSERUC); do info=$$($(SHELL) Package.sh $$p installed); \
[ -n "$$info" ] && echo "\"$$info\"" | sed -e 's/".*package/"/' >> lmpinstalledpkgs.tmp || :; done [ -n "$$info" ] && echo "\"$$info\"" | sed -e 's/".*package \(.*\)"/"\1",/' >> lmpinstalledpkgs.tmp || :; done
@echo ';' >> lmpinstalledpkgs.tmp @echo ' NULL };' >> lmpinstalledpkgs.tmp
@if [ -f lmpinstalledpkgs.h ]; \ @if [ -f lmpinstalledpkgs.h ]; \
then test "`diff --brief lmpinstalledpkgs.tmp lmpinstalledpkgs.h`" != "" && \ then test "`diff --brief lmpinstalledpkgs.tmp lmpinstalledpkgs.h`" != "" && \
mv lmpinstalledpkgs.tmp lmpinstalledpkgs.h || rm lmpinstalledpkgs.tmp ; \ mv lmpinstalledpkgs.tmp lmpinstalledpkgs.h || rm lmpinstalledpkgs.tmp ; \

17
src/lammps.cpp
View File

@ -826,7 +826,7 @@ void LAMMPS::help()
print_config(fp); print_config(fp);
fprintf(fp,"List of style options included in this LAMMPS executable\n\n"); fprintf(fp,"List of individual style options included in this LAMMPS executable\n\n");
int pos = 80; int pos = 80;
fprintf(fp,"* Atom styles:\n"); fprintf(fp,"* Atom styles:\n");
@ -1060,6 +1060,19 @@ static const char lammps_config_options[]
void LAMMPS::print_config(FILE *fp) void LAMMPS::print_config(FILE *fp)
{ {
const char *pkg;
int ncword, ncline = 0;
fputs(lammps_config_options,fp); fputs(lammps_config_options,fp);
fprintf(fp,"Installed packages:%s\n\n",lammps_installed_packages); fputs("Installed packages:\n\n",fp);
for (int i = 0; NULL != (pkg = lammps_installed_packages[i]); ++i) {
ncword = strlen(pkg);
if (ncline + ncword > 78) {
ncline = 0;
fputs("\n",fp);
}
fprintf(fp,"%s ",pkg);
ncline += ncword + 1;
}
fputs("\n\n",fp);
} }