Commit afc85345 authored by Frank Siegert's avatar Frank Siegert
Browse files

Fixes in the build system for creation of release tarball.

parent e2bff1c9
......@@ -37,4 +37,24 @@ pkginclude_HEADERS = \
VA_F_F.H
INCLUDES = @HADRONSINCS@ @ATOOLSINCS@ @MODELINCS@ @HELICITIESINCS@
EXTRA_DIST = @SVNINCLUDE@
EXTRA_DIST = @SVNINCLUDE@ \
VA_B_B3_HO.C \
VA_B_B3_ST.C \
VA_B_B_HO.C \
VA_B_B_ST.C \
VA_P_P_ISGW.C \
VA_P_P_ISGW2.C \
VA_P_P_HQET.C \
VA_P_P_HQET2.C \
VA_P_P_PoleFit.C \
VA_P_P_Polynomial.C \
VA_P_P_BallZwicky.C \
VA_P_T_ISGW.C \
VA_P_T_ISGW2.C \
VA_P_V_ISGW.C \
VA_P_V_ISGW2.C \
VA_P_V_HQET.C \
VA_P_V_HQET2.C \
VA_P_V_SumRules3.C \
VA_P_V_PoleFit.C \
VA_P_V_hepph0007169.C
......@@ -239,8 +239,9 @@ void Hadrons::DiceUncorrelatedKinematics(
}
value = hdc->Differential(&moms.front(),anti);
if(value/max>1.05 && max>1e-30) {
msg_Info()<<METHOD<<"("<<hdc->ChannelName()<<") warning:"<<endl
<<" d\\Gamma(x)="<<value<<" > max(d\\Gamma)="<<max<<std::endl;
msg_Tracking()<<METHOD<<"("<<hdc->ChannelName()<<") warning:"<<endl
<<" d\\Gamma(x)="<<value<<" > max(d\\Gamma)="<<max
<<std::endl;
rvalue.IncRetryMethod(METHOD);
break;
}
......
......@@ -52,4 +52,18 @@ uninstall-local:
rm -rf "$(pkgdatadir)/Decaydata"; \
if test "$$(ls -A $(pkgdatadir))" = ""; then \
rm -rf "$(pkgdatadir)"; \
fi;
\ No newline at end of file
fi;
dist-hook:
for i in Decaydata/*; do \
if test -d $$i; then \
mkdir -p $(distdir)/$$i; \
for j in $$i/*.dat; do \
cp $$j $(distdir)/$$i/; \
done; \
if test -d $$i/PhaseSpaceFunctions; then \
cp -rf $$i/PhaseSpaceFunctions $(distdir)/$$i/; \
fi; \
fi; \
done; \
cp Decaydata/*.dat $(distdir)/Decaydata/;
......@@ -11,8 +11,7 @@ print_help() {
echo " --total rebuild 'Makefile.in's' and 'configure's' before 'make dist'" && \
echo " --copt define option for 'configure'" && \
echo " --exclude-svn exclude .svn directories (only necessary when they exist)" && \
echo " --release prepare for release in copied tree: svn update, module renaming, --total" && \
echo " Warning: This may use much disk space, because it makes a copy of the file tree." && \
echo " --release create tarball for release" && \
echo " -h display this help and exit" && \
echo
}
......@@ -61,16 +60,6 @@ echo "*************************************"
if [ "$RELEASE" = "TRUE" ]; then
SUBSUBV=$(echo $VERSION | cut -d "." -f 3)
if test -d "../makedist"; then
echo "Directory ../makedist already exists. Please remove and retry."
exit 1;
fi
mkdir ../makedist;
echo -e " copying file tree to temporary directory ../makedist (this might take a while)"
cp -rp $(pwd) ../makedist/;
cd ../makedist/$(basename $(pwd));
if test -x "$(which svn)" && test ! "$(svn status -q)" = ""; then
echo "The copy of your version has local modifications:"
svn status -q
......@@ -88,37 +77,13 @@ if [ "$RELEASE" = "TRUE" ]; then
CONTINUE="c"
fi
done
fi
svn update
# ## rename modules in working copy
# echo -e " renaming modules in working copy";
# MODULES=*".0";
# for I in $MODULES; do
# mv $I $I"."$SUBSUBV
# done;
# MFS=`find . -name Makefile.am`
# for I in $MFS; do
# sed -e 's/-0.0/-0.0.'$SUBSUBV'/g' < $I > $I.new
# sed -e 's/-1.0/-1.0.'$SUBSUBV'/g' < $I.new > $I.new2
# sed -e 's/-2.0/-2.0.'$SUBSUBV'/g' < $I.new2 > $I.new
# mv $I.new $I
# rm $I.new2
# done
# MFS="TOOLS/makeinstall configure.in acinclude.m4"
# for I in $MFS; do
# sed -e 's/-0.0/-0.0.'$SUBSUBV'/g' < $I > $I.new
# sed -e 's/-1.0/-1.0.'$SUBSUBV'/g' < $I.new > $I
# sed -e 's/-2.0/-2.0.'$SUBSUBV'/g' < $I > $I.new
# mv $I.new $I
# done;
chmod 755 TOOLS/makeinstall;
if test -x "$(which svn)"; then
svn update;
fi
fi
if [ "$TOTAL" = "TRUE" ]; then
cp INSTALL INSTALL.Sherpa;
autoreconf -fi
mv INSTALL.Sherpa INSTALL;
autoreconf -i
fi
if [ "$CONFIGURE" = "TRUE" ]; then
./configure $ECOPT;
......@@ -149,16 +114,9 @@ if [ "$RELEASE" = "TRUE" ]; then
cd ..;
fi
## remove ATOOLS/Org/CXXFLAGS.H
rm SHERPA-MC-$VERSION/*/*/CXXFLAGS.H
## tar it
tar -czhf "$DISTDIR.tar.gz" SHERPA-MC-$VERSION/;
rm -rf SHERPA-MC-$VERSION/;
if [ "$RELEASE" = "TRUE" ]; then
mv "$DISTDIR.tar.gz" ../../;
cd ../..;
rm -rf makedist;
fi
echo -e "\nwrote distribution to '$DISTDIR".tar.gz"'\n"
exit 0
......
......@@ -78,13 +78,11 @@ AC_OUTPUT(ATOOLS/Math/Makefile \
HADRONS++/ME_Library/Makefile \
HADRONS++/Current_Library/Makefile \
HADRONS++/PS_Library/Makefile \
HADRONS++/Run/Makefile \
HADRONS++/Makefile \
PHOTONS++/Main/Makefile \
PHOTONS++/Tools/Makefile \
PHOTONS++/PhaseSpace/Makefile \
PHOTONS++/MEs/Makefile \
PHOTONS++/Run/Makefile \
PHOTONS++/Makefile \
ANALYSIS/Makefile \
ANALYSIS/Tools/Makefile \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment