Ticket #4861: svn_check.patch

File svn_check.patch, 1.8 KB (added by lordhoto, 14 years ago)

Patch against trunk.

  • Makefile.common 

    diff --git a/Makefile.common b/Makefile.common
index 83c6da2..8755e2e 100644
    a b VER_EXTRA = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c2-)  
    169169# Get Subversion's working copy information
    170170######################################################################
    171171
     172ifeq "$(HAVE_SVN)" "1"
    172173ifeq ($(shell LANG=C svn stat $(srcdir) 2>&1 | grep "is not a working copy"),)
    173174SVNROOT := $(srcdir)
    174175ifeq ($(origin SVNREV), undefined)
    … … endif  
    184185ifneq ($(origin VER_SVNREV), undefined)
    185186CXXFLAGS+= -DSCUMMVM_SVN_REVISION=\"$(VER_SVNREV)\"
    186187endif
     188endif
    187189
    188190
    189191######################################################################
    … … DISTDIR := dist  
    205207VERFILE := $(DISTDIR)/$(DISTNAME)/base/internal_version.h
    206208
    207209$(VERFILE): $(srcdir)/base/internal_version.h
     210ifeq "$(HAVE_SVN)" "1"
    208211        @$(RM_REC) $(DISTDIR)
    209212        @$(MKDIR) $(DISTDIR)
    210213        svn export $(SVNROOT) $(DISTDIR)/$(DISTNAME)
    … … ifneq ($(origin VER_SVNREV), undefined)  
    214217                "s/^#define SCUMMVM_SVN_REVISION$$/#define SCUMMVM_SVN_REVISION \"$(VER_SVNREV)\"/g" \
    215218                > $(VERFILE)
    216219endif
     220else
     221        @echo "No SVN client installed. Cannot export repository."
     222        @exit 1
     223endif
    217224
    218225$(DISTDIR)/$(DISTNAME).tar.gz: $(VERFILE)
    219226        cd $(DISTDIR); tar zcf $(DISTNAME).tar.gz $(DISTNAME)

  • configure 

    diff --git a/configure b/configure
index 7bfeed4..c43ea3b 100755
    a b add_to_config_h_if_yes $_nasm '#define USE_NASM'  
    21982198add_to_config_mk_if_yes $_nasm 'USE_NASM = 1'
    21992199
    22002200#
     2201# Check whether svn is installed
     2202#
     2203
     2204echocheck svn
     2205if SVN_PATH=`which svn` ; then
     2206        echo $SVN_PATH
     2207        _svn=yes
     2208else
     2209        echo "not found"
     2210        _svn=no
     2211fi
     2212
     2213add_to_config_mk_if_yes $_svn 'HAVE_SVN = 1'
     2214
     2215#
    22012216# Enable vkeybd / keymapper
    22022217#
    22032218if test "$_vkeybd" = yes ; then