Skip to content

Commit 079e108

Browse files
authored
Ubuntu 18.04 (bionic) (#95)
* Updating supported Ubuntu to 18.04 (bionic). * Update README and comments to point to the new supported Ubuntu version.
1 parent 233b93f commit 079e108

File tree

3 files changed

+22
-25
lines changed

3 files changed

+22
-25
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ matrix:
22
include:
33
- os: linux
44
language: c
5-
dist: trusty
5+
dist: bionic
66
sudo: required
77
- os: osx
88
language: objective-c

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Inc.
3939
These are the instructions for installing Nu on a Macintosh or Linux system.
4040
Linux builds require several additional dependencies. The included
4141
[ubuntu.sh](ubuntu.sh) script can be used to install these dependencies on
42-
a system running Ubuntu 14.04 (and possibly other versions). Installation
42+
a system running Ubuntu 18.04 (and possibly other versions). Installation
4343
instructions for some other UNIX-based operating systems (Debian, OpenSolaris,
4444
and FreeBSD) are in [notes/OBSOLETE](notes/OBSOLETE) and will probably not
4545
work without modifications. Macintosh and Ubuntu builds are verified with
@@ -103,9 +103,6 @@ Apple iPhone.
103103
* [notes/TODO](https://github.com/timburks/nu/blob/master/notes/TODO) contains some open issues that I'd like to address in Nu.
104104
* The [examples](https://github.com/timburks/nu/tree/master/examples) directory contains several fun and interesting examples.
105105

106-
TextMate users can drag and drop share/Nu.tmbundle onto the TextMate
107-
application icon to add Nu-specific features to TextMate.
108-
109106
## Author
110107

111108
Tim Burks (tim@radtastical.com)<br/>

ubuntu.sh

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# with Apple's modern Objective-C runtime. This new runtime
99
# allows Nu to be ported to Linux+GNUstep without difficulty.
1010
#
11-
# Tested with ubuntu-14.04
11+
# Tested with ubuntu-18.04
1212
# Other Ubuntu and Debian installations may also work well.
1313
#
1414
# Thanks to Tobias Lensing for pointing the way.
@@ -37,45 +37,45 @@ sudo apt-get install libfreetype6-dev -y
3737
sudo apt-get install libcairo2-dev -y
3838
sudo apt-get install libxt-dev -y
3939
sudo apt-get install libgl1-mesa-dev -y
40-
sudo apt-get remove libdispatch-dev -y
4140
sudo apt-get install gdb -y
41+
sudo apt-get install cmake -y
42+
sudo apt-get install llvm -y
43+
sudo apt-get install libc++-dev -y
44+
sudo apt-get install libxslt1-dev -y
45+
sudo apt-get install libgnutls28-dev -y
46+
sudo apt-get install libdispatch-dev -y
4247

4348
mkdir -p /tmp/SETUP
4449
cd /tmp/SETUP
4550

46-
#
47-
# A few modifications were needed to fix problems with
48-
# libobjc2 and gnustep-base. To maintain stability, we
49-
# work with a fork on github.
50-
#
51-
git clone https://github.com/nulang/gnustep-libobjc2.git
52-
git clone https://github.com/nulang/gnustep-make.git
53-
git clone https://github.com/nulang/gnustep-base.git
51+
git clone https://github.com/programming-nu/gnustep-libobjc2.git
52+
git clone https://github.com/programming-nu/tools-make.git
53+
git clone https://github.com/programming-nu/libs-base.git
5454

5555
echo Installing libobjc2
5656
export CC=clang
57+
export CXX=clang++
5758
cd gnustep-libobjc2
58-
make clean
59-
make
59+
mkdir Build
60+
cd Build
61+
cmake ..
6062
sudo make install
6163
cd /tmp/SETUP
6264

63-
echo Installing gnustep-make
64-
cd gnustep-make
65-
./configure
65+
echo Installing gnustep make
66+
cd tools-make
67+
./configure --with-library-combo=ng-gnu-gnu CC=clang CXX=clang++
6668
make clean
6769
make
6870
sudo make install
6971
cd /tmp/SETUP
7072

71-
echo Installing gnustep-base
72-
cd gnustep-base
73-
./configure
73+
echo Installing gnustep base
74+
cd libs-base
75+
./configure CC=clang CXX=clang++
7476
make clean
7577
make
7678
sudo make install
7779
cd /tmp/SETUP
7880

79-
sudo apt-get install libdispatch-dev -y
80-
8181
echo Pre-install script finished successfully. You may now build Nu.

0 commit comments

Comments
 (0)