Skip to content

Commit ea16a0d

Browse files
committed
Merge pull request #17 from dymk/develop
Merge develop branch with new Temple API
2 parents aa0d317 + d5250fa commit ea16a0d

22 files changed

+621
-727
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ideas.txt
2+
dub.selections.json
13
*.sublime-project
24
*.sublime-workspace
35
__test*

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ before_install:
55
install:
66
- sudo wget http://netcologne.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list
77
- sudo apt-get update && sudo apt-get -y --allow-unauthenticated install --reinstall d-apt-keyring && sudo apt-get update
8-
- sudo apt-get install dub
9-
- if [[ "$DC" == "dmd" ]]; then sudo apt-get install dmd-bin; fi;
8+
- if [[ "$DC" == "dmd" ]]; then ./.travis_scripts/install_dmd.sh; fi;
109
- if [[ "$DC" == "ldmd2" ]]; then ./.travis_scripts/install_ldmd2.sh; fi;
10+
- sudo apt-get install dub
1111
- $DC | head -3
1212
- pwd
1313

.travis_scripts/install_dmd.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3-
wget http://downloads.dlang.org/releases/2013/dmd_2.064.2-0_amd64.deb
3+
set -e
4+
5+
wget http://downloads.dlang.org/releases/2014/dmd_2.066.1-0_amd64.deb
46
sudo apt-get install gcc-multilib
5-
sudo dpkg -i dmd_2.064.2-0_amd64.deb
7+
sudo dpkg -i dmd_2.066.1-0_amd64.deb

.travis_scripts/install_ldmd2.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
#!/bin/bash
22

3-
wget --no-check-certificate https://github.com/ldc-developers/ldc/releases/download/v0.13.0-alpha1/ldc2-0.13.0-alpha1-linux-x86_64.tar.gz
4-
tar -xzf ldc2-0.13.0-alpha1-linux-x86_64.tar.gz
5-
sudo ln -s `pwd`/ldc2-0.13.0-linux-x86_64/bin/ldmd2 /usr/bin/ldmd2
3+
set -e
4+
5+
sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
6+
sudo apt-get update
7+
sudo apt-get install g++-4.9
8+
sudo apt-get install libstdc++6
9+
10+
wget --no-check-certificate https://github.com/ldc-developers/ldc/releases/download/v0.15.0-alpha1/ldc2-0.15.0-alpha1-linux-x86_64.tar.gz
11+
tar -xzf ldc2-0.15.0-alpha1-linux-x86_64.tar.gz
12+
sudo ln -s `pwd`/ldc2-0.15.0-alpha1-linux-x86_64/bin/ldmd2 /usr/bin/ldmd2

0 commit comments

Comments
 (0)