Browse code

updated configure.sh

src/Makevars modified instead of DESCRIPTION

August Guang authored on 13/02/2019 00:52:12
Showing 1 changed files
... ...
@@ -11,7 +11,7 @@
11 11
 
12 12
 if [[ "${CI}" == "true" ]]; then
13 13
     if [[ "${TRAVIS}" == "true" ]]; then 
14
-        echo "** Overriding DESCRIPTION and removing C++14 on Travis only"
15
-        sed -i '/SystemRequirements: C++14/d' DESCRIPTION
14
+        echo "** Overriding src/Makevars and removing C++14 on Travis only"
15
+        sed -i '/CXX_STD = CXX14/d' src/Makevars
16 16
     fi
17 17
 fi
18 18
\ No newline at end of file
Browse code

delete line

August Guang authored on 26/11/2018 19:31:26
Showing 1 changed files
... ...
@@ -12,6 +12,6 @@
12 12
 if [[ "${CI}" == "true" ]]; then
13 13
     if [[ "${TRAVIS}" == "true" ]]; then 
14 14
         echo "** Overriding DESCRIPTION and removing C++14 on Travis only"
15
-        sed -i 's|SystemRequirements: C++14\n||' DESCRIPTION
15
+        sed -i '/SystemRequirements: C++14/d' DESCRIPTION
16 16
     fi
17 17
 fi
18 18
\ No newline at end of file
Browse code

need to remove \n also

August Guang authored on 26/11/2018 18:39:36
Showing 1 changed files
... ...
@@ -12,6 +12,6 @@
12 12
 if [[ "${CI}" == "true" ]]; then
13 13
     if [[ "${TRAVIS}" == "true" ]]; then 
14 14
         echo "** Overriding DESCRIPTION and removing C++14 on Travis only"
15
-        sed -i 's|SystemRequirements: C++14||' DESCRIPTION
15
+        sed -i 's|SystemRequirements: C++14\n||' DESCRIPTION
16 16
     fi
17 17
 fi
18 18
\ No newline at end of file
Browse code

modify configure.sh slightly for RSeqAn DESCRIPTION file

August Guang authored on 26/11/2018 17:47:18
Showing 1 changed files
... ...
@@ -12,6 +12,6 @@
12 12
 if [[ "${CI}" == "true" ]]; then
13 13
     if [[ "${TRAVIS}" == "true" ]]; then 
14 14
         echo "** Overriding DESCRIPTION and removing C++14 on Travis only"
15
-        sed -i 's|C++14, ||' DESCRIPTION
15
+        sed -i 's|SystemRequirements: C++14||' DESCRIPTION
16 16
     fi
17 17
 fi
18 18
\ No newline at end of file
Browse code

changing travis from c to r

August Guang authored on 26/11/2018 17:00:43
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,17 @@
1
+#!/bin/bash
2
+
3
+## Travis can let us run R 3.4.0 (from CRAN and the PPAs) but this R version
4
+## does not know about C++14.  Even though we can select CXX_STD = C++14, R
5
+## will fail as the version we use there was built in too old an environment,
6
+## namely Ubuntu "trusty" 14.04.
7
+##
8
+## So we install g++-6 from another repo and rely on the fact that is
9
+## defaults to C++14.  Sadly, we need R to not fail and hence, just on
10
+## Travis, remove the C++14 instruction
11
+
12
+if [[ "${CI}" == "true" ]]; then
13
+    if [[ "${TRAVIS}" == "true" ]]; then 
14
+        echo "** Overriding DESCRIPTION and removing C++14 on Travis only"
15
+        sed -i 's|C++14, ||' DESCRIPTION
16
+    fi
17
+fi
0 18
\ No newline at end of file