Page MenuHomeHEPForge
Files F7879045

No OneTemporary
Actions

View Options

diff --git a/doc/Makefile.am b/doc/Makefile.am
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,106 +1,104 @@
dist_noinst_SCRIPTS = mk-analysis-html mk-analysis-latex
LATEXSUBSOURCES = preamble.tex intro.tex gettingstarted.tex writinganalyses.tex agilerunmc.tex acknowledgements.tex
DOCSOURCES = compare-histos.txt slip.eps thinker.eps cone.eps bend.eps \
h-physrev3.bst hepnames.sty JHEP3.cls JHEP.bst make-plots.txt rivet-manual.tex \
$(LATEXSUBSOURCES) heppennames.sty hepnicenames.sty hepparticles.sty maybemath.sty \
hepunits.sty underscore.sty microtype.sty
EXTRA_DIST = $(DOCSOURCES)
DOCS =
if ENABLE_PDFMANUAL
if ENABLE_PYEXT
DOCS += analyses.html
analyses.html: $(top_srcdir)/src/Analyses mk-analysis-html
LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(LD_LIBRARY_PATH) \
- DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(DYLD_LIBRARY_PATH) \
PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \
$(PYTHON) mk-analysis-html
endif
if WITH_PDFLATEX
DOCS += rivet-manual.pdf
EXTRA_DIST += refs.bib
if ENABLE_PYEXT
analyses.bib analyses.tex: $(top_srcdir)/src/Analyses $(top_srcdir)/data/plotinfo $(top_srcdir)/data/anainfo mk-analysis-latex
LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(LD_LIBRARY_PATH) \
- DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(DYLD_LIBRARY_PATH) \
PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \
$(PYTHON) mk-analysis-latex
else
analyses.bib analyses.tex:
> analyses.tex
> analyses.bib
endif
LATEX = pdflatex --interaction=batchmode
RERUN = "(There were undefined references|Rerun to get (cross-references|the bars) right)"
RERUNBIB = "No file.*\.bbl|Citation.*undefined"
MAKEIDX = "^[^%]*\\makeindex"
rivet-manual.pdf : rivet-manual.tex $(LATEXSUBSOURCES) analyses.tex refs.bib analyses.bib
$(LATEX) $<; true
egrep -c $(RERUNBIB) rivet-manual.log && (bibtex rivet-manual && cp rivet-manual.toc rivet-manual.toc.bak && $(LATEX) $<); true
for i in `seq 5`; do if egrep $(RERUN) rivet-manual.log; then echo "LaTeX re-run $i"; cp rivet-manual.toc rivet-manual.toc.bak; $(LATEX) $<; else break; fi; done; true
if cmp -s rivet-manual.toc rivet-manual.toc.bak; then true; else $(LATEX) $<; true; fi
rm -f rivet-manual.toc.bak; true
paper.pdf : paper.tex $(LATEXSUBSOURCES) analyses.tex refs.bib analyses.bib
$(LATEX) $<; true
egrep -c $(RERUNBIB) paper.log && (bibtex paper && cp paper.toc paper.toc.bak && $(LATEX) $<); true
for i in `seq 5`; do if egrep $(RERUN) paper.log; then echo "LaTeX re-run $i"; cp paper.toc paper.toc.bak; $(LATEX) $<; else break; fi; done; true
if cmp -s paper.toc paper.toc.bak; then true; else $(LATEX) $<; true; fi
rm -f paper.toc.bak; true
endif
endif
if WITH_ASCIIDOC
DOCS += compare-histos.html make-plots.html
EXTRA_DIST += compare-histos.html make-plots.html
compare-histos.html: compare-histos.txt
asciidoc -a toc compare-histos.txt
make-plots.html: make-plots.txt
asciidoc -a toc make-plots.txt
endif
################
.PHONY = all doc upload arxivtar
doc: $(DOCS)
@true
RSH=rsync
DEST=login.hepforge.org:rivet/public_html/
upload: $(DOCS)
$(RSH) $? $(DEST)
arxivtar: $(DOCSOURCES) rivet-manual.bbl
for i in *.png; do convert $$i $${i/.png/.eps}; done
tar czf rivet-manual.tar.gz \
rivet-manual.tex $(LATEXSUBSOURCES) analyses.tex refs.bib analyses.bib rivetversion.sty rivet-manual.bbl \
hepnames.sty hepnicenames.sty hepparticles.sty heppennames.sty hepunits.sty maybemath.sty microtype.sty underscore.sty \
bend.eps cone.eps thinker.eps slip.eps \
h-physrev3.bst JHEP3.cls JHEP.bst
mostlyclean-local:
rm -rf *.aux *.log *.toc
clean-local:
rm -rf $(DOCS)
## Install!
pkgdata_DATA = $(DOCS)
diff --git a/doc/diffanas b/doc/diffanas
old mode 100755
new mode 100644
diff --git a/m4/osx.m4 b/m4/osx.m4
--- a/m4/osx.m4
+++ b/m4/osx.m4
@@ -1,17 +1,14 @@
#AC_CEDAR_OSX()
#----------------------------------------
AC_DEFUN([AC_CEDAR_OSX], [
- LIBPATHVARNAME="LD_LIBRARY_PATH"
AC_CHECK_TOOL(SWVERS, sw_vers)
if test x$SWVERS != x; then
PROD_NAME=$($SWVERS -productName | cut -f 2 -d:)
fi
AM_CONDITIONAL(WITH_OSX, [test "$PROD_NAME" = "Mac OS X"])
if test "$PROD_NAME" = "Mac OS X"; then
MACOSX_DEPLOYMENT_TARGET=$($SWVERS -productVersion | cut -f 1,2 -d.)
AC_MSG_NOTICE([MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET])
AM_CXXFLAGS="$AM_CXXFLAGS -Dunix"
- LIBPATHVARNAME="DYLD_LIBRARY_PATH"
fi
- AC_SUBST(LIBPATHVARNAME)
])
diff --git a/rivetenv.csh.in b/rivetenv.csh.in
--- a/rivetenv.csh.in
+++ b/rivetenv.csh.in
@@ -1,55 +1,55 @@
## These variables need to exist
set prefix=@prefix@
set exec_prefix=@exec_prefix@
set datarootdir=@datarootdir@
## Try to automatically work out the YODA Python path
set YODA_PYTHONPATH="@YODA_PYTHONPATH@"
test -n "$YODA_PYTHONPATH" || (which yoda-config > /dev/null) && set YODA_PYTHONPATH="`yoda-config --pythonpath`"
test -n "$YODA_PYTHONPATH" || echo "yoda-config could not be found: you may need to manually set paths to libYODA and the yoda Python package" 1>&2
setenv PATH "$exec_prefix/bin:@YODABINPATH@:$PATH"
-if ($?@LIBPATHVARNAME@) then
-setenv @LIBPATHVARNAME@ "@libdir@:@YODALIBPATH@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@GSLLIBPATH@:$@LIBPATHVARNAME@"
+if ($?LD_LIBRARY_PATH) then
+setenv LD_LIBRARY_PATH "@libdir@:@YODALIBPATH@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@GSLLIBPATH@:$LD_LIBRARY_PATH"
else
-setenv @LIBPATHVARNAME@ "@libdir@:@YODALIBPATH@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@GSLLIBPATH@"
+setenv LD_LIBRARY_PATH "@libdir@:@YODALIBPATH@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@GSLLIBPATH@"
endif
if ($?PYTHONPATH) then
setenv PYTHONPATH "@RIVET_PYTHONPATH@:${YODA_PYTHONPATH}:$PYTHONPATH"
else
setenv PYTHONPATH "@RIVET_PYTHONPATH@:$YODA_PYTHONPATH"
endif
if ($?TEXMFHOME) then
setenv TEXMFHOME "@datadir@/Rivet/texmf:$TEXMFHOME"
else
setenv TEXMFHOME "@datadir@/Rivet/texmf"
endif
if ($?HOMETEXMF) then
setenv HOMETEXMF "@datadir@/Rivet/texmf:$HOMETEXMF"
else
setenv HOMETEXMF "@datadir@/Rivet/texmf"
endif
if ($?TEXMFCNF) then
setenv TEXMFCNF "@datadir@/Rivet/texmf/cnf:$TEXMFCNF"
else
setenv TEXMFCNF "@datadir@/Rivet/texmf/cnf:"
endif
if ($?TEXINPUTS) then
setenv TEXINPUTS "@datadir@/Rivet/texmf/tex:$TEXINPUTS"
else
setenv TEXINPUTS "@datadir@/Rivet/texmf/tex:"
endif
if ($?LATEXINPUTS) then
setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex:$LATEXINPUTS"
else
setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex:"
endif
unset YODA_PYTHONPATH
diff --git a/rivetenv.sh.in b/rivetenv.sh.in
--- a/rivetenv.sh.in
+++ b/rivetenv.sh.in
@@ -1,25 +1,25 @@
## These variables need to exist
prefix=@prefix@
exec_prefix=@exec_prefix@
datarootdir=@datarootdir@
## Try to automatically work out the YODA Python path
YODA_PYTHONPATH="@YODA_PYTHONPATH@"
test -n "$YODA_PYTHONPATH" || { (which yoda-config > /dev/null) && YODA_PYTHONPATH=`yoda-config --pythonpath`; }
test -n "$YODA_PYTHONPATH" || echo "yoda-config could not be found: you may need to manually set paths to libYODA and the yoda Python package" 1>&2
export PATH="$exec_prefix/bin:@YODABINPATH@:$PATH"
-export @LIBPATHVARNAME@="@libdir@:@YODALIBPATH@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@GSLLIBPATH@:$@LIBPATHVARNAME@"
+export LD_LIBRARY_PATH="@libdir@:@YODALIBPATH@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@GSLLIBPATH@:$LD_LIBRARY_PATH"
export PYTHONPATH="@RIVET_PYTHONPATH@:$YODA_PYTHONPATH:$PYTHONPATH"
export TEXMFHOME="@datadir@/Rivet/texmf:$TEXMFHOME"
export HOMETEXMF="@datadir@/Rivet/texmf:$HOMETEXMF"
export TEXMFCNF="@datadir@/Rivet/texmf/cnf:$TEXMFCNF"
export TEXINPUTS="@datadir@/Rivet/texmf/tex:$TEXINPUTS"
export LATEXINPUTS="@datadir@/Rivet/texmf/tex:$LATEXINPUTS"
if (complete &> /dev/null); then
test -e "@datadir@/Rivet/rivet-completion" && source "@datadir@/Rivet/rivet-completion"
fi
unset YODA_PYTHONPATH
diff --git a/test/Makefile.am b/test/Makefile.am
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,34 +1,33 @@
check_PROGRAMS = testMath testMatVec testBoost testCmp testApi testNaN
AM_LDFLAGS = -L$(top_srcdir)/src -L$(prefix)/lib $(BOOST_LDFLAGS) $(YAMLCPP_LDFLAGS) -L$(YODALIBPATH)
LIBS = -lm $(GSL_LDFLAGS) -lYODA
testBoost_SOURCES = testBoost.cc
testMath_SOURCES = testMath.cc
testMatVec_SOURCES = testMatVec.cc
testCmp_SOURCES = testCmp.cc
testCmp_LDADD = $(top_builddir)/src/libRivet.la $(HEPMCLDFLAGS) $(YODALDFLAGS) $(HEPMCLDLIBS) $(YODALDLIBS)
testApi_SOURCES = testApi.cc
testApi_LDADD = $(top_builddir)/src/libRivet.la $(HEPMCLDFLAGS) $(YODALDFLAGS) $(HEPMCLDLIBS) $(YODALDLIBS)
testNaN_SOURCES = testNaN.cc
testNaN_LDADD = $(top_builddir)/src/libRivet.la $(HEPMCLDFLAGS) $(YODALDFLAGS) $(HEPMCLDLIBS) $(YODALDLIBS)
TESTS_ENVIRONMENT = \
RIVET_REF_PATH=$(top_srcdir)/data/refdata \
RIVET_INFO_PATH=$(top_srcdir)/data/anainfo \
RIVET_ANALYSIS_PATH=$(top_builddir)/src/Analyses/.libs \
LD_LIBRARY_PATH=$(top_builddir)/src:$(top_builddir)/src/.libs:$(HEPMCLIBPATH):$(YODALIBPATH):$(FASTJETLIBPATH):$(YAML_CPPLIBPATH):$(LD_LIBRARY_PATH) \
- DYLD_LIBRARY_PATH=$(top_builddir)/src:$(top_builddir)/src/.libs:$(HEPMCLIBPATH):$(YODALIBPATH):$(FASTJETLIBPATH):$(YAML_CPPLIBPATH):$(DYLD_LIBRARY_PATH) \
PYTHON_BUILD_DIR=$(top_builddir)/pyext/build \
PATH=$(top_builddir)/bin:$(top_srcdir)/bin:$(PATH) \
RIVET_TESTS_SRC=$(srcdir)
TESTS = testMath testMatVec testBoost testCmp testApi testNaN
if ENABLE_ANALYSES
TESTS += testCmdLine.sh
endif
EXTRA_DIST = testApi.hepmc testCmdLine.sh
CLEANFILES = out.aida log a.out fifo.hepmc file2.hepmc out.yoda NaN.aida Rivet.yoda

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 19, 7:22 PM (1 d, 7 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3796637
Default Alt Text
(9 KB)

Event Timeline