LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

some adaptation to the new Makefiles

Browse Source
This commit is contained in:
nemu
2009-06-16 06:21:02 +00:00
parent d21be88ad6
commit 11f34a21f6
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -145,3 +145,5 @@ $(OBJS): %.o: %.cpp
install: all install: all
cp -fvp $(EXEC) $(INSTALLPATH) cp -fvp $(EXEC) $(INSTALLPATH)
cp -fvp musrfit_startup.xml $(INSTALLPATH) cp -fvp musrfit_startup.xml $(INSTALLPATH)
cp -fvp external/scripts/msr2data $(INSTALLPATH)
chmod 755 $(INSTALLPATH)/msr2data

12
src/musrgui/PAdmin.cpp
View File

@ -228,11 +228,17 @@ bool PAdminXMLParser::endDocument()
} }
if (fAdmin->getMsrDefaultFilePath().find('$') >= 0) { if (fAdmin->getMsrDefaultFilePath().find('$') >= 0) {
expandPath(fAdmin->getMsrDefaultFilePath()); str = expandPath(fAdmin->getMsrDefaultFilePath());
if (!str.isEmpty()) if (!str.isEmpty())
fAdmin->setMsrDefaultFilePath(str); fAdmin->setMsrDefaultFilePath(str);
} }
if (fAdmin->getTheoFuncPixmapPath().find('$') >=0) {
str = expandPath(fAdmin->getTheoFuncPixmapPath());
if (!str.isEmpty())
fAdmin->setTheoFuncPixmapPath(str);
}
return true; return true;
} }
@ -292,9 +298,9 @@ PAdmin::PAdmin()
QString fln = "./musrgui_startup.xml"; QString fln = "./musrgui_startup.xml";
if (!QFile::exists(fln)) { if (!QFile::exists(fln)) {
QString path = std::getenv("MUSRFITPATH"); QString path = std::getenv("MUSRFITPATH");
QString home = std::getenv("HOME"); QString rootsys = std::getenv("ROOTSYS");
if (path.isEmpty()) if (path.isEmpty())
path = home + "/analysis/bin"; path = rootsys + "/bin";
fln = path + "/musrgui_startup.xml"; fln = path + "/musrgui_startup.xml";
} }
if (QFile::exists(fln)) { // administration file present if (QFile::exists(fln)) { // administration file present

4
src/musrgui/musrgui_startup.xml
View File

@ -5,7 +5,7 @@
This is handling default setting parameters for the musrgui. This is handling default setting parameters for the musrgui.
</comment> </comment>
<general> <general>
<exec_path>$HOME/analysis/bin</exec_path> <exec_path>$ROOTSYS/bin</exec_path>
<default_save_path>./</default_save_path> <default_save_path>./</default_save_path>
<msr_default_file_path>$HOME/analysis/musrfit/src/musrgui</msr_default_file_path> <msr_default_file_path>$HOME/analysis/musrfit/src/musrgui</msr_default_file_path>
</general> </general>
@ -21,7 +21,7 @@
Starting with &gt;= Qt4.2 this will be linked automatically but until then ...; sorry ;-) Starting with &gt;= Qt4.2 this will be linked automatically but until then ...; sorry ;-)
</help_main> </help_main>
</help_section> </help_section>
<func_pixmap_path>/home/nemu/analysis/musrfit/src/musrgui/latex_images</func_pixmap_path> <func_pixmap_path>$HOME/analysis/musrfit/src/musrgui/latex_images</func_pixmap_path>
<theory_functions> <theory_functions>
<func> <func>
<name>asymmetry</name> <name>asymmetry</name>