Changeset 4364


Ignore:
Timestamp:
May 22, 2014 2:48:27 PM (10 years ago)
Author:
ldelgass
Message:

Fix for exported source package build: svnversion will return "Unversioned
directory" when run on an exported source tree, but the space causes a compiler
error. Replace this string with 'unknown'. A better fix would be to capture
the svn revision at the time the tree is exported. See nanohub ticket
#265649 for a report of the problem on Mac OS X (that was with clang, but I
verified it occurs with gcc on Linux as well).

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.in

    r4146 r4364  
    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

  • trunk/configure

    r4213 r4364  
    72967296
    72977297
    7298 SVN_VERSION=`svnversion $srcdir`
     7298SVN_VERSION=`svnversion $srcdir | sed 's/Unversioned directory/unknown/'`
    72997299
    73007300make_command=""

  • trunk/configure.in

    r4212 r4364  
    107107SC_CONFIG_CFLAGS
    108108
    109 SVN_VERSION=`svnversion $srcdir`
     109SVN_VERSION=`svnversion $srcdir | sed 's/Unversioned directory/unknown/'`
    110110
    111111make_command=""

  • trunk/lang/tcl/src/Makefile.in

    r4146 r4364  
    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)\"

  • trunk/packages/vizservers/geovis/Makefile.in

    r4349 r4364  
    2929MKDIR_P         = @MKDIR_P@
    3030
    31 SVN_VERSION     = $(shell svnversion $(srcdir))
     31SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    3232STATSDIR        = @STATSDIR@
    3333
    … …  
    109109                Trace.cpp \
    110110                ScaleBar.cpp \
     111                SingleWindow.cpp \
    111112                Stats.cpp
    112113

  • trunk/packages/vizservers/nanoscale/Makefile.in

    r4111 r4364  
    3131LD_RUN_PATH     = $(libdir)
    3232LOGDIR          = @LOGDIR@
    33 SVN_VERSION     = $(shell svnversion $(srcdir))
     33SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    3434
    3535DEFINES         = -DSERVERSFILE=\"$(libdir)/renderservers.tcl\" \

  • trunk/packages/vizservers/nanovis/Makefile.in

    r4068 r4364  
    103103LD_RUN_PATH     = $(VTK_LIB_DIR):$(libdir):@LD_RPATH@
    104104
    105 SVN_VERSION     = $(shell svnversion $(srcdir))
     105SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    106106STATSDIR        = @STATSDIR@
    107107

  • trunk/packages/vizservers/pymolproxy/Makefile.in

    r4108 r4364  
    2828VPATH =         $(srcdir)
    2929
    30 SVN_VERSION     = $(shell svnversion $(srcdir))
     30SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    3131STATSDIR        = @STATSDIR@
    3232LOGDIR          = @LOGDIR@

  • trunk/packages/vizservers/vtkvis/Makefile.in

    r4242 r4364  
    3232MKDIR_P         = @MKDIR_P@
    3333
    34 SVN_VERSION     = $(shell svnversion $(srcdir))
     34SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
    3535STATSDIR        = @STATSDIR@
    3636

  • trunk/src/core/Makefile.in

    r4118 r4364  
    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.