Skip to content

Commit f27c890

Browse files
author
Christopher Kirkland
committed
More explicit install instructions
Testing in Docker against Ubuntu 14.04/16.04, Fedora 24, and Centos 6/7.
1 parent 88276b9 commit f27c890

File tree

1 file changed

+28
-7
lines changed

1 file changed

+28
-7
lines changed

scripts/unixbench/dependencies.txt

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
### START - Dependency installation order ###
22
git-order = 50
3-
unixbench-order = 51
3+
gcc-order = 51
4+
perl-order = 52
5+
unixbench-order = 53
46
### END - Dependency installation order ###
57

68
### START - Dependency-specific installation method ###
@@ -10,21 +12,40 @@ unixbench-order = 51
1012
# git = git clone using above giturl
1113
# pip = python pip utility
1214
# man = "manual"
13-
git-install = man
14-
unixbench-install = man
15+
gcc-install = pm
16+
git-install = pm
17+
perl-install = pm
18+
unixbench-install = git
1519
### END - Dependency-specific installation method ###
1620

1721
### START - Tests ###
22+
git-configure = gcc -v
1823
git-configure = git --version
19-
unixbench-configure = ls -la 3RDPARTYDIR/byte-unixbench/UnixBench/Run
24+
perl-configure = perl -v; perl -e 'require Time::HiRes'
25+
unixbench-configure = ls -la ~/byte-unixbench/UnixBench/Run
2026
### END - Tests ###
2127

2228
### START - Dependency versions ###
23-
unixbench-ver = ANY
29+
gcc-ver = ANY
2430
git-ver = ANY
31+
perl-ver = 5.10
32+
unixbench-ver = ANY
2533
### END - Dependency versions ###
2634

35+
### START - Dependency URLs ###
36+
common-unixbench-urls-man = https://github.com/kdlucas/byte-unixbench.git
37+
### END - Dependency URLs ###
38+
2739
### START - Dependency and method-specific command lines ###
28-
common-git-install-man = package_install git-all
29-
common-unixbench-install-man = git clone https://github.com/kdlucas/byte-unixbench.git
40+
ubuntu-gcc-preinstall-pm = apt-get update -y
41+
ubuntu-gcc-install-pm = package_install build-essential
42+
fedora-gcc-install-pm = package_install gcc
43+
44+
common-git-install-pm = package_install git-all
45+
46+
# perl package only need to be explicitly installed on CentOS 6.x
47+
fedora-perl-install-pm = package_install perl-Time-HiRes
48+
49+
common-unixbench-preinstall-git = cd ~
50+
common-unixbench-install-git = git clone URL
3051
### END - Dependency and method-specific command lines ###

0 commit comments

Comments
 (0)