From 3ff1bebd9da386c9bccdad2f8cf8ca39e7ecf6ee Mon Sep 17 00:00:00 2001 From: Suter Andreas Date: Fri, 26 Feb 2016 08:30:50 +0100 Subject: [PATCH] centralize XML startup files --- src/external/libPhotoMeissner/classes/Makefile.am | 2 +- src/external/libSpinValve/classes/Makefile.am | 13 ++++++++++++- .../libSpinValve/classes/PStartupHandler_SV.cpp | 6 ++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/external/libPhotoMeissner/classes/Makefile.am b/src/external/libPhotoMeissner/classes/Makefile.am index db00e9ae..759aafcf 100644 --- a/src/external/libPhotoMeissner/classes/Makefile.am +++ b/src/external/libPhotoMeissner/classes/Makefile.am @@ -28,7 +28,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = ../include/*Dict.cpp ../include/*Dict.h *~ core +CLEANFILES = ../classes/*Dict* ../include/*Dict.* *~ core %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ diff --git a/src/external/libSpinValve/classes/Makefile.am b/src/external/libSpinValve/classes/Makefile.am index a9a58527..544d7c39 100644 --- a/src/external/libSpinValve/classes/Makefile.am +++ b/src/external/libSpinValve/classes/Makefile.am @@ -28,7 +28,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = ../include/*Dict.cpp ../include/*Dict.h *~ core +CLEANFILES = ../classes/*Dict.* ../include/*Dict.* *~ core %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @@ -59,3 +59,14 @@ install-exec-hook: uninstall-hook: rm -f $(libdir)/libPSpinValve.so endif + +# define default xml install +xmldir = $(HOME)/.musrfit/external +xml_DATA = ../test/spinValve_startup.xml + +instal-xml_DATA: $(xml_DATA) + $(INSTALL_DATA) '$(xml_DATA)' '$(xmldir)' + +uninstal-xml_DATA: $(xml_DATA) + $(RM) '$(xml_DATA)' '$(xmldir)' + diff --git a/src/external/libSpinValve/classes/PStartupHandler_SV.cpp b/src/external/libSpinValve/classes/PStartupHandler_SV.cpp index 9252f5a1..b13bdd4a 100644 --- a/src/external/libSpinValve/classes/PStartupHandler_SV.cpp +++ b/src/external/libSpinValve/classes/PStartupHandler_SV.cpp @@ -52,6 +52,7 @@ PStartupHandler_SV::PStartupHandler_SV() // get default path (for the moment only linux like) char startup_path_name[128]; + char *home_path=0; // check if the startup file is found in the current directory strcpy(startup_path_name, "./spinValve_startup.xml"); @@ -59,8 +60,9 @@ PStartupHandler_SV::PStartupHandler_SV() fStartupFileFound = true; fStartupFilePath = TString(startup_path_name); } else { // startup file is not found in the current directory - cout << endl << ">> PStartupHandler_SV(): **WARNING** Couldn't find skewedLorentzian_startup.xml in the current directory, will try default one." << endl; - strncpy(startup_path_name, "/home/nemu/analysis/musrfit/src/external/libSpinValve/test/spinValve_startup.xml", sizeof(startup_path_name)); + cout << endl << ">> PStartupHandler_SV(): **WARNING** Couldn't find spinValve_startup.xml in the current directory, will try default one." << endl; + home_path = getenv("HOME"); + snprintf(startup_path_name, sizeof(startup_path_name), "%s/.musrfit/external/spinValve_startup.xml", home_path); if (StartupFileExists(startup_path_name)) { fStartupFileFound = true; fStartupFilePath = TString(startup_path_name);