merging VampirTrace-5.4.5 into the main branch
This commit was SVN r18030.
Этот коммит содержится в:
Matthias Jurenz
родитель
a33831c1f8
Коммит
879fdc4feb
@ -206,3 +206,8 @@
|
||||
- renamed configure's option '--with[out]-mpi-io' to
|
||||
'[enable/disable]-mpi-io' for more consistent
|
||||
|
||||
5.4.5
|
||||
- updated version of internal OTF to 1.3.10 (see extlib/otf/ChangeLog)
|
||||
- added configure option '--[enable|disable]-binaries' to control
|
||||
building of binaries (useful for multi-lib installations)
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
major=5
|
||||
minor=4
|
||||
release=4
|
||||
release=5
|
||||
|
||||
# greek is used for alpha or beta release tags. If it is non-empty,
|
||||
# it will be appended to the version number. It does not have to be
|
||||
|
||||
@ -1214,7 +1214,10 @@ dnl check for MPI I/O support
|
||||
|
||||
AS_IF([test "$have_mpio" = "yes"],
|
||||
[AC_DEFINE([HAVE_MPIO], [1], [Define to 1 if MPI supports file access.])])
|
||||
])
|
||||
])
|
||||
|
||||
|
||||
AS_IF([test "$mpi_error" = "yes"], [MPICC=$CC])
|
||||
|
||||
AS_IF([test x"$PMPILIB" = x"$MPILIB"], [PMPILIB=])
|
||||
|
||||
@ -1358,6 +1361,10 @@ AC_DEFUN([ACVT_OTF],
|
||||
|
||||
otf_conf_cmd="$otf_srcdir/configure"
|
||||
otf_conf_args=
|
||||
AS_IF([test x"$enable_binaries" != "xyes"],
|
||||
[
|
||||
otf_conf_args="$otf_conf_args --disable-binaries"
|
||||
])
|
||||
AS_IF([test x"$cross_compiling" = "xyes"],
|
||||
[
|
||||
AS_IF([test ! -z $build], [otf_conf_args="$otf_conf_args --build=$build"])
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.60)
|
||||
AC_INIT(VampirTrace, 5.4.4, service@vampir.eu)
|
||||
AM_INIT_AUTOMAKE(VampirTrace, 5.4.4)
|
||||
AC_INIT(VampirTrace, 5.4.5, service@vampir.eu)
|
||||
AM_INIT_AUTOMAKE(VampirTrace, 5.4.5)
|
||||
AC_CONFIG_SRCDIR(config.h.in)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
@ -108,6 +108,13 @@ See \`config.log' for more details.])])
|
||||
CPPFLAGS_FOR_BUILD=$CPPFLAGS; LDFLAGS_FOR_BUILD=$LDFLAGS; LIBS_FOR_BUILD=$LIBS
|
||||
])
|
||||
|
||||
# Do we want to build and install binaries
|
||||
AC_ARG_ENABLE(binaries,
|
||||
AC_HELP_STRING([--enable-binaries],
|
||||
[build and install binaries, default: enabled]),
|
||||
[enable_binaries="$enableval"], [enable_binaries="yes"])
|
||||
AM_CONDITIONAL(AMBUILDBINARIES, test x"$enable_binaries" = "xyes")
|
||||
|
||||
# Check for programs
|
||||
AC_ARG_VAR(AR, [archiver command]) #AC_PROG_AR ?
|
||||
AC_CHECK_PROGS(AR, ar, AR=ar)
|
||||
|
||||
@ -204,3 +204,7 @@
|
||||
- install a symbolic link 'otfdecompress' which is a synonym for
|
||||
'otfcompress -d'
|
||||
|
||||
1.3.10
|
||||
- added configure option '--[enable|disable]-binaries' to control
|
||||
building of binaries (useful for multi-lib installations)
|
||||
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
AC_INIT(OTF, 1.3.9, andreas.knuepfer@tu-dresden.de )
|
||||
AC_INIT(OTF, 1.3.10, andreas.knuepfer@tu-dresden.de )
|
||||
AC_CANONICAL_SYSTEM
|
||||
AM_INIT_AUTOMAKE(OTF, 1.3.9)
|
||||
AM_INIT_AUTOMAKE(OTF, 1.3.10)
|
||||
AC_CONFIG_SRCDIR([config.h.in])
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
@ -17,16 +17,25 @@ AC_PROG_LIBTOOL
|
||||
|
||||
# Own stuff
|
||||
|
||||
# Do we want to build and install binaries?
|
||||
AC_ARG_ENABLE(binaries,
|
||||
AC_HELP_STRING([--enable-binaries],
|
||||
[build and install binaries, default: enabled]),
|
||||
[enable_binaries="$enableval"], [enable_binaries="yes"])
|
||||
AM_CONDITIONAL(AMBUILDBINARIES, test x"$enable_binaries" = "xyes")
|
||||
|
||||
# Checks for VTF3.
|
||||
CHECK_VTF3
|
||||
if test x"$force_vtf3" = "xyes" -a x"$vtf3_error" = "xyes"; then exit 1; fi
|
||||
AM_CONDITIONAL(AMHAVEVTF3, test x"$have_vtf3" = xyes)
|
||||
|
||||
# Checks for zlib compression.
|
||||
CHECK_ZLIB
|
||||
if test x"$force_zlib" = "xyes" -a x"$zlib_error" = "xyes"; then exit 1; fi
|
||||
AM_CONDITIONAL(AMHAVEZLIB, test x"$have_zlib" = xyes)
|
||||
AM_CONDITIONAL(AMDEPZLIB, test x"$have_zlib" = xyes -a x"$enable_shared" = xyes)
|
||||
|
||||
#checking for swig and python-dev
|
||||
# Checks for swig and python-dev.
|
||||
SWIG_PYTHON
|
||||
AM_CONDITIONAL(AMHAVEPYTHONSWIG, [test "$pythonexists" = yes -a "$swigexists" = yes] )
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
#define OTF_VERSION_MAYOR 1
|
||||
#define OTF_VERSION_MINOR 3
|
||||
#define OTF_VERSION_SUB 9
|
||||
#define OTF_VERSION_SUB 10
|
||||
#define OTF_VERSION_STRING "jellyfish"
|
||||
|
||||
/* version history:
|
||||
|
||||
@ -2,8 +2,10 @@ INCLUDES = \
|
||||
-I$(top_builddir)/otflib -I$(top_srcdir)/otflib \
|
||||
$(VTF3_INCLUDE_LINE)
|
||||
|
||||
if AMBUILDBINARIES
|
||||
bin_PROGRAMS = \
|
||||
otf2vtf
|
||||
endif
|
||||
|
||||
otf2vtf_LDADD = $(top_builddir)/otflib/libotf.la $(VTF3_LIB_LINE)
|
||||
if ! AMDEPZLIB
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
INCLUDES = -I$(top_builddir)/otflib -I$(top_srcdir)/otflib
|
||||
|
||||
if AMBUILDBINARIES
|
||||
bin_PROGRAMS = \
|
||||
otfaux
|
||||
endif
|
||||
|
||||
otfaux_LDADD = $(top_builddir)/otflib/libotf.la
|
||||
if ! AMDEPZLIB
|
||||
|
||||
@ -2,8 +2,13 @@ INCLUDES = \
|
||||
-I$(top_builddir)/otflib -I$(top_srcdir)/otflib \
|
||||
$(ZLIB_INCLUDE_LINE)
|
||||
|
||||
bin_PROGRAMS = \
|
||||
otfcompress
|
||||
if AMBUILDBINARIES
|
||||
bin_PROGRAMS = otfcompress
|
||||
|
||||
install-exec-hook:
|
||||
(cd $(DESTDIR)$(bindir); rm -f otfdecompress; \
|
||||
$(LN_S) otfcompress$(EXEEXT) otfdecompress$(EXEEXT))
|
||||
endif
|
||||
|
||||
otfcompress_LDADD = $(top_builddir)/otflib/libotf.la
|
||||
if ! AMDEPZLIB
|
||||
@ -17,7 +22,3 @@ otfcompress_SOURCES = \
|
||||
EXTRA_DIST = \
|
||||
otfcompress_vs05.vcproj
|
||||
|
||||
install-exec-hook:
|
||||
(cd $(DESTDIR)$(bindir); rm -f otfdecompress; \
|
||||
$(LN_S) otfcompress$(EXEEXT) otfdecompress$(EXEEXT))
|
||||
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
INCLUDES = -I$(top_builddir)/otflib -I$(top_srcdir)/otflib
|
||||
|
||||
if AMBUILDBINARIES
|
||||
bin_PROGRAMS = \
|
||||
otfconfig
|
||||
endif
|
||||
|
||||
otfconfig_LDADD = $(top_builddir)/otflib/libotf.la
|
||||
if ! AMDEPZLIB
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
INCLUDES = -I$(top_builddir)/otflib -I$(top_srcdir)/otflib
|
||||
|
||||
if AMBUILDBINARIES
|
||||
noinst_PROGRAMS = \
|
||||
otfdump
|
||||
endif
|
||||
|
||||
otfdump_LDADD = $(top_builddir)/otflib/libotf.la
|
||||
if ! AMDEPZLIB
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
INCLUDES = -I$(top_builddir)/otflib -I$(top_srcdir)/otflib
|
||||
|
||||
if AMBUILDBINARIES
|
||||
bin_PROGRAMS = \
|
||||
otfmerge
|
||||
endif
|
||||
|
||||
otfmerge_LDADD = $(top_builddir)/otflib/libotf.la
|
||||
if ! AMDEPZLIB
|
||||
|
||||
@ -2,8 +2,10 @@ INCLUDES = \
|
||||
-I$(top_builddir)/otflib -I$(top_srcdir)/otflib \
|
||||
$(VTF3_INCLUDE_LINE)
|
||||
|
||||
if AMBUILDBINARIES
|
||||
bin_PROGRAMS = \
|
||||
vtf2otf
|
||||
endif
|
||||
|
||||
vtf2otf_LDADD = $(top_builddir)/otflib/libotf.la $(VTF3_LIB_LINE)
|
||||
if ! AMDEPZLIB
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
AUTOMAKE_OPTIONS = -Wno-gnu
|
||||
|
||||
if AMBUILDBINARIES
|
||||
|
||||
if AMHAVECC
|
||||
WRAP_CC = vtcc
|
||||
else
|
||||
@ -24,6 +26,8 @@ else
|
||||
WRAP_FC =
|
||||
endif
|
||||
|
||||
endif # AMBUILDBINARIES
|
||||
|
||||
vtdata_DATA = \
|
||||
vtcc-wrapper-data.txt \
|
||||
vtcxx-wrapper-data.txt \
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
AUTOMAKE_OPTIONS = -Wno-gnu
|
||||
|
||||
if AMBUILDBINARIES
|
||||
bin_PROGRAMS = opari
|
||||
endif
|
||||
|
||||
include_HEADERS = \
|
||||
../lib/opari_omp.h \
|
||||
|
||||
@ -2,7 +2,9 @@ if AMBUILDDYNATTLIB
|
||||
SUBDIRS = dynattlib
|
||||
endif
|
||||
|
||||
if AMBUILDBINARIES
|
||||
bin_PROGRAMS = vtdyn
|
||||
endif
|
||||
|
||||
INCLUDES = $(DYNIINCDIR)
|
||||
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
if AMBUILDBINARIES
|
||||
bin_PROGRAMS = vtfilter
|
||||
endif
|
||||
|
||||
if AMEXTERNOTF
|
||||
OTFINCLUDE = $(OTFINCDIR)
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
if AMBUILDBINARIES
|
||||
bin_PROGRAMS = vtunify
|
||||
endif
|
||||
|
||||
if AMEXTERNOTF
|
||||
OTFINCLUDE = $(OTFINCDIR)
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user