Changeset 4501


Ignore:
Timestamp:
Jul 14, 2014 6:36:23 PM (6 years ago)
Author:
ldelgass
Message:

merge r4364 from trunk

Location:
branches/1.3
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4364
  • branches/1.3/Makefile.in

    r4149 r4501  
    2222pkg_path        := $(shell dirname $(prefix))
    2323pkg_name        := $(shell basename $(prefix))
    24 SVN_VERSION     := $(shell svnversion $(srcdir))
     24SVN_VERSION     := $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    2525
    2626rappture_binary_tarfile = rappture-$(os)-$(machine)-$(build_date).tar.gz
  • branches/1.3/configure

    r4225 r4501  
    72917291
    72927292
    7293 SVN_VERSION=`svnversion $srcdir`
     7293SVN_VERSION=`svnversion $srcdir | sed 's/Unversioned directory/unknown/'`
    72947294
    72957295make_command=""
  • branches/1.3/configure.in

    r4225 r4501  
    107107SC_CONFIG_CFLAGS
    108108
    109 SVN_VERSION=`svnversion $srcdir`
     109SVN_VERSION=`svnversion $srcdir | sed 's/Unversioned directory/unknown/'`
    110110
    111111make_command=""
  • branches/1.3/lang/tcl/src/Makefile.in

    r3739 r4501  
    4040  -I$(includedir)
    4141RAPPTURE_VERSION = @PACKAGE_VERSION@
    42 SVN_VERSION     := $(shell svnversion $(srcdir))
     42SVN_VERSION     := $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    4343DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" \
    4444                  -DRAPPTURE_VERSION=\"$(RAPPTURE_VERSION)\"
  • branches/1.3/packages/vizservers/nanoscale/Makefile.in

    r2557 r4501  
    3030TCL_INC_SPEC    = @TCL_INC_SPEC@
    3131LD_RUN_PATH     = $(libdir)
     32LOGDIR          = @LOGDIR@
     33SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    3234
    33 DEFINES         = -DSERVERSFILE=\"$(libdir)/renderservers.tcl\"
     35DEFINES         = -DSERVERSFILE=\"$(libdir)/renderservers.tcl\" \
     36                -DSVN_VERSION=\"$(SVN_VERSION)\" \
     37                -DLOGDIR=\"$(LOGDIR)\"
    3438INCLUDES        = -I. $(TCL_INC_SPEC)
    3539LIBS            = $(TCL_LIB_SPEC) \
  • branches/1.3/packages/vizservers/pymolproxy/Makefile.in

    r3403 r4501  
    2929VPATH =         $(srcdir)
    3030
    31 SVN_VERSION     = $(shell svnversion $(srcdir))
     31SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    3232STATSDIR        = @STATSDIR@
    3333
  • branches/1.3/packages/vizservers/vtkvis/Makefile.in

    r4239 r4501  
    3131MKDIR_P         = @MKDIR_P@
    3232
    33 SVN_VERSION     = $(shell svnversion $(srcdir))
     33SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    3434STATSDIR        = @STATSDIR@
    3535
  • branches/1.3/src/core/Makefile.in

    r3717 r4501  
    1313INSTALL         = @INSTALL@
    1414MKDIR_P         = @MKDIR_P@
    15 SVN_VERSION     := $(shell svnversion $(srcdir))
     15SVN_VERSION     := $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    1616RAPPTURE_VERSION = @PACKAGE_VERSION@
    1717CXX             = @CXX@
Note: See TracChangeset for help on using the changeset viewer.