Changeset 888 for trunk


Ignore:
Timestamp:
Nov 25, 2009, 5:03:59 AM (12 years ago)
Author:
Peter Johansson
Message:

fixes #374

The problem was in the map year2rev that maps from a year to the last
revision of that year. We got that information from an SVNlog(ROOT)
object. When ROOT was yat/yat the problem (we've seen before)
occured. The problem is that if we follow the log of yat/yat we
realize it was created in 2005, so the map wouldn't cover for year
2004 and 2003. And there are many files, for example
yat/yat/Makefile.am, that were created in 2003 and 2004.

I could see two obvious solutions to the problem. Either call get the
log from repos_root_url or call NODE::log. The latter gives the union
of the logs of nodes in the directory (and below), which should be
sufficient. That, however, also implies that a log call is needed for
every file, which makes this slow in particular since ROOT often is
quite high the files structure. I therefore went with a log call to
repos_root_url, which is fast since it only involves one call to svn
server.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEWS

    r874 r888  
    44
    55Version 0.8 (released NOT YET)
     6  - new configure option --with-plplot
    67
    78  A complete list of closed tickets can be found here [[br]]
  • trunk/bin/Makefile.am

    r887 r888  
    2929
    3030LDADD = $(top_builddir)/lib/libsvndigest.a \
    31   $(top_builddir)/lib/yat/libyat.a $(SVN_LIBS) $(APR_LIBS)
     31  $(top_builddir)/lib/yat/libyat.a $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
    3232AM_LDFLAGS = $(APR_LDFLAGS) $(SVN_LDFLAGS) $(PLPLOT_LDFLAGS)
    3333
  • trunk/configure.ac

    r887 r888  
    168168plplot_found="yes"
    169169plplot_version=5.9
    170 AC_CHECK_HEADER([plplot/plstream.h],
    171                 [if $PKG_CONFIG --atleast-version=$plplot_version plplotd-c++; then
    172                   PLPLOT_LDFLAGS=`$PKG_CONFIG --libs plplotd-c++`
    173                   AC_SUBST([PLPLOT_LDFLAGS])
    174                 else
    175                   plplot_found="nolib"
    176                 fi],
    177                 [plplot_found="noheader"])
     170save_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
     171AC_ARG_WITH([plplot],
     172  [AS_HELP_STRING([--with-plplot=DIR],[prefix for plplot developer files])],
     173  [DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-plplot=$withval"
     174   PKG_CONFIG_PATH=${withval}/lib/pkgconfig${PATH_SEPARATOR}${PKG_CONFIG_PATH}
     175   export PKG_CONFIG_PATH
     176  ])
     177
     178# copy flags if pkg-config finds plplot
     179PKG_CHECK_EXISTS([plplotd-c++], [
     180  YAT_CPP_ADD_FLAG([PLPLOT_CPPFLAGS], [`$PKG_CONFIG plplotd-c++ --cflags`])
     181  YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
     182  PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`"
     183],[
     184  plplot_found=no-pkg-config
     185])
     186                 
     187AS_IF([test "x$plplot_found" = "xyes"], [
     188  save_CPPFLAGS=$CPPFLAGS
     189  CPPFLAGS="$PLPLOT_CPPFLAGS $CPPFLAGS"
     190  AC_CHECK_HEADER([plplot/plstream.h], [], [plplot_found="noheader"])
     191  CPPFLAGS=$save_CPPFLAGS
     192])
     193
     194AS_IF([test "x$plplot_found" = "xyes"], [
     195  AS_IF([$PKG_CONFIG --atleast-version=$plplot_version plplotd-c++], [
     196  ],[
     197    plplot_found="nolib"
     198  ])
     199])
     200# restore variable
     201export PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
     202AC_SUBST(PLPLOT_CPPFLAGS)
     203AC_SUBST(PLPLOT_LDFLAGS)
     204AC_SUBST(PLPLOT_LIBS)
    178205
    179206# checking if we build in a subversion WC
     
    281308  Version at least $plplot_version is required. Please upgrade PLplot.])
    282309  all_reqs_ok="false"
     310elif (test "$plplot_found" = "no-pkg-config") ; then
     311  AC_MSG_WARN([cannot find pkg-config])
     312  all_reqs_ok="false"
    283313fi
    284314
     
    310340    APR_CPPFLAGS:     $APR_CPPFLAGS
    311341    SVN_CPPFLAGS:     $SVN_CPPFLAGS
     342    PLPLOT_CPPFLAGS:  $PLPLOT_CPPFLAGS
    312343  C++ flags:
    313344    CXXFLAGS:         $CXXFLAGS
     
    322353    APR_LIBS          $APR_LIBS
    323354    SVN_LIBS          $SVN_LIBS
     355    PLPLOT_LIBS       $PLPLOT_LIBS
    324356+++++++++++++++++++++++++++++++++++++++++++++++]dnl
    325357)
  • trunk/test/Makefile.am

    r887 r888  
    3939  $(top_builddir)/lib/libsvndigest.a \
    4040  $(top_builddir)/lib/yat/libyat.a \
    41   $(SVN_LIBS) $(APR_LIBS)
     41  $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
    4242AM_LDFLAGS = $(SVNDIGEST_LDFLAGS) $(PLPLOT_LDFLAGS)
    4343
Note: See TracChangeset for help on using the changeset viewer.