mirror of
https://github.com/alanorth/cgspace-notes.git
synced 2024-11-05 14:53:02 +01:00
171 lines
4.8 KiB
HTML
171 lines
4.8 KiB
HTML
<!DOCTYPE html>
|
||
<html lang="en-us">
|
||
<head prefix="og: http://ogp.me/ns#">
|
||
<meta charset="utf-8" />
|
||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1" />
|
||
<meta property="og:title" content=" August, 2016 · CGSpace Notes" />
|
||
|
||
<meta property="og:site_name" content="CGSpace Notes" />
|
||
<meta property="og:url" content="/cgspace-notes/2016-08/" />
|
||
|
||
|
||
<meta property="og:type" content="article" />
|
||
|
||
<meta property="og:article:published_time" content="2016-08-01T15:53:00+03:00" />
|
||
|
||
<meta property="og:article:tag" content="notes" />
|
||
|
||
|
||
|
||
<title>
|
||
August, 2016 · CGSpace Notes
|
||
</title>
|
||
|
||
<link rel="stylesheet" href="/cgspace-notes/css/bootstrap.min.css" />
|
||
<link rel="stylesheet" href="/cgspace-notes/css/main.css" />
|
||
<link rel="stylesheet" href="/cgspace-notes/css/font-awesome.min.css" />
|
||
<link rel="stylesheet" href="/cgspace-notes/css/github.css" />
|
||
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400" type="text/css">
|
||
<link rel="shortcut icon" href="/cgspace-notes/images/favicon.ico" />
|
||
<link rel="apple-touch-icon" href="/cgspace-notes/images/apple-touch-icon.png" />
|
||
|
||
</head>
|
||
<body>
|
||
<header class="global-header" style="background-image:url(../images/bg.jpg )">
|
||
<section class="header-text">
|
||
<h1><a href="/cgspace-notes/">CGSpace Notes</a></h1>
|
||
|
||
<div class="sns-links hidden-print">
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
</div>
|
||
|
||
|
||
<a href="/cgspace-notes/" class="btn-header btn-back hidden-xs">
|
||
<i class="fa fa-angle-left" aria-hidden="true"></i>
|
||
Home
|
||
</a>
|
||
|
||
|
||
</section>
|
||
</header>
|
||
<main class="container">
|
||
|
||
|
||
<article>
|
||
<header>
|
||
<h1 class="text-primary">August, 2016</h1>
|
||
<div class="post-meta clearfix">
|
||
<div class="post-date pull-left">
|
||
Posted on
|
||
<time datetime="2016-08-01T15:53:00+03:00">
|
||
Aug 1, 2016
|
||
</time>
|
||
</div>
|
||
<div class="pull-right">
|
||
|
||
<span class="post-tag small"><a href="/cgspace-notes//tags/notes">#notes</a></span>
|
||
|
||
</div>
|
||
</div>
|
||
</header>
|
||
<section>
|
||
|
||
|
||
<h2 id="2016-08-01:e34bd801c7748b7746ad4364bbdb5eb5">2016-08-01</h2>
|
||
|
||
<ul>
|
||
<li>Add updated distribution license from Sisay (<a href="https://github.com/ilri/DSpace/issues/259">#259</a>)</li>
|
||
<li>Play with upgrading Mirage 2 dependencies in <code>bower.json</code> because most are several versions of out date</li>
|
||
<li>Bootstrap is at 3.3.0 but upstream is at 3.3.7, and upgrading to anything beyond 3.3.1 breaks glyphicons and probably more</li>
|
||
<li>bower stuff is a dead end, waste of time, too many issues</li>
|
||
<li>Anything after Bootstrap 3.3.1 makes glyphicons disappear (HTTP 404 trying to access from incorrect path of <code>fonts</code>)</li>
|
||
<li>Start working on DSpace 5.1 → 5.5 port:</li>
|
||
</ul>
|
||
|
||
<pre><code>$ git checkout -b 55new 5_x-prod
|
||
$ git reset --hard ilri/5_x-prod
|
||
$ git rebase -i dspace-5.5
|
||
</code></pre>
|
||
|
||
<ul>
|
||
<li>Lots of conflicts that don’t make sense (ie, shouldn’t conflict!)</li>
|
||
<li>This file in particular conflicts almost 10 times: <code>dspace/modules/xmlui-mirage2/src/main/webapp/themes/CGIAR/styles/_style.scss</code></li>
|
||
<li>Checking out a clean branch at 5.5 and cherry-picking our commits works where that file would normally have a conflict</li>
|
||
<li>Seems to be related to merge commits</li>
|
||
<li><code>git rebase --preserve-merges</code> doesn’t seem to help</li>
|
||
<li>Eventually I just turned on git rerere and solved the conflicts and completed the 403 commit rebase</li>
|
||
<li>The 5.5 code now builds but doesn’t run (white page in Tomcat)</li>
|
||
</ul>
|
||
|
||
<h2 id="2016-08-02:e34bd801c7748b7746ad4364bbdb5eb5">2016-08-02</h2>
|
||
|
||
<ul>
|
||
<li>Ask Atmire for help with DSpace 5.5 issue</li>
|
||
<li>Vanilla DSpace 5.5 deploys and runs fine</li>
|
||
<li>Playing with DSpace in Ubuntu 16.04 and Tomcat 7</li>
|
||
<li>Everything is still fucked up, even vanilla DSpace 5.5</li>
|
||
</ul>
|
||
|
||
</section>
|
||
<footer>
|
||
|
||
<section class="author-info row">
|
||
<div class="author-avatar col-md-2">
|
||
|
||
</div>
|
||
<div class="author-meta col-md-6">
|
||
|
||
<h1 class="author-name text-primary">Alan Orth</h1>
|
||
|
||
|
||
</div>
|
||
|
||
</section>
|
||
<ul class="pager">
|
||
|
||
<li class="previous"><a href="/cgspace-notes/2016-07/"><span aria-hidden="true">←</span> Older</a></li>
|
||
|
||
|
||
<li class="next disabled"><a href="#">Newer <span aria-hidden="true">→</span></a></li>
|
||
|
||
</ul>
|
||
</footer>
|
||
</article>
|
||
|
||
</main>
|
||
<footer class="container global-footer">
|
||
<div class="copyright-note pull-left">
|
||
|
||
</div>
|
||
<div class="sns-links hidden-print">
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
</div>
|
||
|
||
</footer>
|
||
|
||
<script src="/cgspace-notes/js/highlight.pack.js"></script>
|
||
<script>
|
||
hljs.initHighlightingOnLoad();
|
||
</script>
|
||
|
||
|
||
</body>
|
||
</html>
|
||
|