Commit 7c36294a authored by Justin Mitchell's avatar Justin Mitchell
Browse files

Crude attempt to fix the build to work with git, this probably needs 

improving with a tag and proper version numbers later.
parent 2d52ab08

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ ifdef TMPDIR 
# A temp dir exists so svn export and palm off the invocation to the exported makefile

export:

	rm -rf $(TMPDIR)/$(MWVERSION)

	svn export . $(TMPDIR)/$(MWVERSION)

	git checkout-index -a -f --prefix=$(TMPDIR)/$(MWVERSION)/

	# Store the svn rev so we don't need to use svnversion or sed any more

	echo $(VERSION_TWEAK) > $(TMPDIR)/$(MWVERSION)/mw.rev

Makefile.common

+2 −2
Original line number Diff line number Diff line 
SVNVER = $(shell ( svnversion -c . 2>/dev/null | sed 's/Unversioned directory/exported/' || echo 0:0 ) | cut -d : -f 2)

SVNVER = $(shell git describe --always )



VERSION_MAJOR = 2

VERSION_MINOR = 17
@@ -9,7 +9,7 @@ ifeq ($(SVNVER),exported) 
VERSION_TWEAK = $(shell cat $(SRCROOT)/mw.rev)

else

ifeq ($(SVNVER),0)

$(warning failed to run svnversion, is it installed? VERSION_TWEAK will be set to 0)

$(warning failed to get git revision. VERSION_TWEAK will be set to 0)

endif

VERSION_TWEAK = $(SVNVER)

endif

src/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ test: 
	mkdir -p "$(TESTDIR)"

	cd "$(TESTDIR)" && mkdir -p mw run/mw log/mw lib/mw

	for d in $(INSTALLFILES); do \

		svn export --force ../$$d "$(TESTDIR)/mw/$$d"; \

		cp -a ../$$d $(TESTDIR)/mw/ ; \

	done

	$(MAKE) libdir="$(TESTDIR)" localstatedir="$(TESTDIR)" all