<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/d979a5a1dd4a7468dc30c38f6c7617babe55b1d3">d979a5a1</a></strong>
<div>
<span>by Justin Mitchell</span>
<i>at 2015-10-06T11:19:11Z</i>
</div>
<pre class='commit-message'>Fix the build for test to build the prereq of mozjs</pre>
</li>
</ul>
<h4>3 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
Makefile.common
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
mozjs17.0.0/Makefile
</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/d979a5a1dd4a7468dc30c38f6c7617babe55b1d3#diff-0'>
<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,3 +1,5 @@
</span><span style="color: #000000;background-color: #ddffdd">+SHELL = /bin/bash
+
</span> SVNVER = $(shell git describe --always )
VERSION_MAJOR = 2
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://projects.sucs.org/arthur/mw/commit/d979a5a1dd4a7468dc30c38f6c7617babe55b1d3#diff-1'>
<strong>
mozjs17.0.0/Makefile
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/mozjs17.0.0/Makefile
</span><span style="color: #000000;background-color: #ddffdd">+++ b/mozjs17.0.0/Makefile
</span><span style="color: #aaaaaa">@@ -11,6 +11,7 @@ INSTALLDIR=$(PWD)/mozjs
</span>
mozjs:
echo "INSTALLDIR = $(INSTALLDIR)"
<span style="color: #000000;background-color: #ddffdd">+ echo "PWD = $(PWD)"
</span> cd js/src/ ; ./configure --enable-thread --with-pthreads --prefix=/usr
make -C js/src/
/usr/bin/printenv
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://projects.sucs.org/arthur/mw/commit/d979a5a1dd4a7468dc30c38f6c7617babe55b1d3#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">@@ -2,13 +2,16 @@ SRCROOT = $(CURDIR)/..
</span> DEPTH=../
include ../Makefile.common
-build: libmw.a
<span style="color: #000000;background-color: #ddffdd">+build: ../mozjs libmw.a
</span> $(MAKE) -C server $@
$(MAKE) -C client $@
$(MAKE) -C webclient $@
$(MAKE) -C utils $@
ln -fs server/mwserv client/mw .
<span style="color: #000000;background-color: #ddffdd">+../mozjs:
+ pushd $(SRCROOT) && $(MAKE) -C mozjs17.0.0 && popd
+
</span> libmw.a: $(CODE:.c=.o)
ar rcs libmw.a $^
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://projects.sucs.org/arthur/mw/commit/d979a5a1dd4a7468dc30c38f6c7617babe55b1d3">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/d979a5a1dd4a7468dc30c38f6c7617babe55b1d3"}}</script>
</p>
</div>
</body>
</html>