<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<div class='content'>
<h3>Justin Mitchell pushed to branch master at <a href="https://projects.sucs.org/arthur/mw">Justin Mitchell / mw</a></h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://projects.sucs.org/arthur/mw/commit/7c36294a103163c6ec15a9f9e7123b8ac99a5ee6">7c36294a</a></strong>
<div>
<span>by Justin Mitchell</span>
<i>at 2015-10-06T10:42:17Z</i>
</div>
<pre class='commit-message'>Crude attempt to fix the build to work with git, this probably needs
improving with a tag and proper version numbers later.</pre>
</li>
</ul>
<h4>3 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
Makefile
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
Makefile.common
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
src/Makefile
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://projects.sucs.org/arthur/mw/commit/7c36294a103163c6ec15a9f9e7123b8ac99a5ee6#diff-0'>
<strong>
Makefile
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/Makefile
</span><span style="color: #000000;background-color: #ddffdd">+++ b/Makefile
</span><span style="color: #aaaaaa">@@ -34,7 +34,7 @@ ifdef TMPDIR
</span> # 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)
<span style="color: #000000;background-color: #ddffdd">+ git checkout-index -a -f --prefix=$(TMPDIR)/$(MWVERSION)/
</span> # Store the svn rev so we don't need to use svnversion or sed any more
echo $(VERSION_TWEAK) > $(TMPDIR)/$(MWVERSION)/mw.rev
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://projects.sucs.org/arthur/mw/commit/7c36294a103163c6ec15a9f9e7123b8ac99a5ee6#diff-1'>
<strong>
Makefile.common
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/Makefile.common
</span><span style="color: #000000;background-color: #ddffdd">+++ b/Makefile.common
</span><span style="color: #aaaaaa">@@ -1,4 +1,4 @@
</span>-SVNVER = $(shell ( svnversion -c . 2>/dev/null | sed 's/Unversioned directory/exported/' || echo 0:0 ) | cut -d : -f 2)
<span style="color: #000000;background-color: #ddffdd">+SVNVER = $(shell git describe --always )
</span>
VERSION_MAJOR = 2
VERSION_MINOR = 17
<span style="color: #aaaaaa">@@ -9,7 +9,7 @@ ifeq ($(SVNVER),exported)
</span> 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)
<span style="color: #000000;background-color: #ddffdd">+$(warning failed to get git revision. VERSION_TWEAK will be set to 0)
</span> endif
VERSION_TWEAK = $(SVNVER)
endif
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://projects.sucs.org/arthur/mw/commit/7c36294a103163c6ec15a9f9e7123b8ac99a5ee6#diff-2'>
<strong>
src/Makefile
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/src/Makefile
</span><span style="color: #000000;background-color: #ddffdd">+++ b/src/Makefile
</span><span style="color: #aaaaaa">@@ -44,7 +44,7 @@ test:
</span> 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"; \
<span style="color: #000000;background-color: #ddffdd">+ cp -a ../$$d $(TESTDIR)/mw/ ; \
</span> done
$(MAKE) libdir="$(TESTDIR)" localstatedir="$(TESTDIR)" all
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://projects.sucs.org/arthur/mw/commit/7c36294a103163c6ec15a9f9e7123b8ac99a5ee6">View it on GitLab</a>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://projects.sucs.org/arthur/mw/commit/7c36294a103163c6ec15a9f9e7123b8ac99a5ee6"}}</script>
</p>
</div>
</body>
</html>