A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cosmetics around ns-3
[simgrid.git]
/
tools
/
jenkins
/
project_description.sh
diff --git
a/tools/jenkins/project_description.sh
b/tools/jenkins/project_description.sh
index
b1f9d04
..
afc1a8c
100755
(executable)
--- a/
tools/jenkins/project_description.sh
+++ b/
tools/jenkins/project_description.sh
@@
-1,4
+1,4
@@
-#!/
bin/
bash
+#!/
usr/bin/env
bash
get_boost(){
grep -m 1 "Boost version:" ./consoleText | sed "s/.*-- Boost version: \([a-zA-Z0-9\.]*\)/\1/g"
get_boost(){
grep -m 1 "Boost version:" ./consoleText | sed "s/.*-- Boost version: \([a-zA-Z0-9\.]*\)/\1/g"
@@
-17,7
+17,7
@@
get_cmake(){
}
get_ns3(){
}
get_ns3(){
- found=$(grep -c "
NS
-3 found" ./consoleText)
+ found=$(grep -c "
ns
-3 found" ./consoleText)
if [ $found != 0 ]; then
echo "✔"
else
if [ $found != 0 ]; then
echo "✔"
else
@@
-45,7
+45,7
@@
fi
#get the list of nodes on jenkins
wget --quiet ${BUILD_URL}/consoleText >/dev/null 2>&1
#get the list of nodes on jenkins
wget --quiet ${BUILD_URL}/consoleText >/dev/null 2>&1
-nodes=($(
grep -rR "Triggering SimGrid ? Debug," ./consoleText | sed "s/Triggering SimGrid ? Debug,\(.*\)/\1/g"
| sort))
+nodes=($(
sed -n 's/^Triggering SimGrid [^ ]* Debug,//p' ./consoleText
| sort))
rm consoleText
rm consoleText
@@
-68,10
+68,10
@@
function compareVersion(v1, v2) {
<script>
function sortTable(n, type) {
var table, rows, switching, i, x, y, shouldSwitch, dir, switchcount = 0;
<script>
function sortTable(n, type) {
var table, rows, switching, i, x, y, shouldSwitch, dir, switchcount = 0;
- table = document.getElementById(
"configuration-matrix"
);
+ table = document.getElementById(
'configuration-matrix'
);
switching = true;
//Set the sorting direction to ascending:
switching = true;
//Set the sorting direction to ascending:
- dir =
"asc"
;
+ dir =
'asc'
;
/*Make a loop that will continue until
no switching has been done:*/
while (switching) {
/*Make a loop that will continue until
no switching has been done:*/
while (switching) {
@@
-85,18
+85,18
@@
function sortTable(n, type) {
shouldSwitch = false;
/*Get the two elements you want to compare,
one from current row and one from the next:*/
shouldSwitch = false;
/*Get the two elements you want to compare,
one from current row and one from the next:*/
- x = rows[i].getElementsByTagName(
"TD"
)[n];
- y = rows[i + 1].getElementsByTagName(
"TD"
)[n];
+ x = rows[i].getElementsByTagName(
'TD'
)[n];
+ y = rows[i + 1].getElementsByTagName(
'TD'
)[n];
/*check if the two rows should switch place,
based on the direction, asc or desc:*/
/*check if the two rows should switch place,
based on the direction, asc or desc:*/
- if (dir ==
"asc"
) {
- if(type ==
"version"
){
+ if (dir ==
'asc'
) {
+ if(type ==
'version'
){
shouldSwitch = (compareVersion(x.innerHTML.toLowerCase(), y.innerHTML.toLowerCase()) > 0);
}else{
shouldSwitch = (x.innerHTML.toLowerCase() > y.innerHTML.toLowerCase());
}
shouldSwitch = (compareVersion(x.innerHTML.toLowerCase(), y.innerHTML.toLowerCase()) > 0);
}else{
shouldSwitch = (x.innerHTML.toLowerCase() > y.innerHTML.toLowerCase());
}
- } else if (dir ==
"desc"
) {
- if(type ==
"version"
){
+ } else if (dir ==
'desc'
) {
+ if(type ==
'version'
){
shouldSwitch = (compareVersion(x.innerHTML.toLowerCase(), y.innerHTML.toLowerCase()) < 0);
}else{
shouldSwitch = (x.innerHTML.toLowerCase() < y.innerHTML.toLowerCase());
shouldSwitch = (compareVersion(x.innerHTML.toLowerCase(), y.innerHTML.toLowerCase()) < 0);
}else{
shouldSwitch = (x.innerHTML.toLowerCase() < y.innerHTML.toLowerCase());
@@
-113,17
+113,17
@@
function sortTable(n, type) {
//Each time a switch is done, increase this count by 1:
switchcount ++;
} else {
//Each time a switch is done, increase this count by 1:
switchcount ++;
} else {
- /*If no switching has been done AND the direction is
"asc"
,
- set the direction to
"desc"
and run the while loop again.*/
- if (switchcount == 0 && dir ==
"asc"
) {
- dir =
"desc"
;
+ /*If no switching has been done AND the direction is
'asc'
,
+ set the direction to
'desc'
and run the while loop again.*/
+ if (switchcount == 0 && dir ==
'asc'
) {
+ dir =
'desc'
;
switching = true;
}
}
}
}</script>
<table id=configuration-matrix>
switching = true;
}
}
}
}</script>
<table id=configuration-matrix>
-<tr class=matrix-row> <td class=matrix-header style=min-width:75px onclick='sortTable(0);'>Name of the Builder</td><td class=matrix-header style=min-width:75px onclick='sortTable(1);'>OS</td><td class=matrix-header style=min-width:75px onclick='sortTable(2);'>Compiler</td><td class=matrix-header style=min-width:75px onclick=
'sortTable(3, 'version');'>Boost</td><td class=matrix-header style=min-width:75px onclick='sortTable(4,'version');'>Java</td><td class=matrix-header style=min-width:75px onclick='sortTable(5,'version');'>Cmake</td><td class=matrix-header style=min-width:50px onclick='sortTable(6);'>NS
3</td><td class=matrix-header style=min-width:50px onclick='sortTable(7);'>Python</td></tr>"
+<tr class=matrix-row> <td class=matrix-header style=min-width:75px onclick='sortTable(0);'>Name of the Builder</td><td class=matrix-header style=min-width:75px onclick='sortTable(1);'>OS</td><td class=matrix-header style=min-width:75px onclick='sortTable(2);'>Compiler</td><td class=matrix-header style=min-width:75px onclick=
\"sortTable(3, 'version');\">Boost</td><td class=matrix-header style=min-width:75px onclick=\"sortTable(4,'version');\">Java</td><td class=matrix-header style=min-width:75px onclick=\"sortTable(5,'version');\">Cmake</td><td class=matrix-header style=min-width:50px onclick='sortTable(6);'>ns-
3</td><td class=matrix-header style=min-width:50px onclick='sortTable(7);'>Python</td></tr>"
for node in "${nodes[@]}"
do
for node in "${nodes[@]}"
do
@@
-154,7
+154,7
@@
do
sed -i -e "s/\r//g" ./consoleText
if [ $id == 0 ]; then
node="<a href=\"https://travis-ci.org/simgrid/simgrid\">travis-linux</a>"
sed -i -e "s/\r//g" ./consoleText
if [ $id == 0 ]; then
node="<a href=\"https://travis-ci.org/simgrid/simgrid\">travis-linux</a>"
- os="Ubuntu 16.04 (<a href=\"https://docs.travis-ci.com/user/reference/xenial/\">
X
enial</a>) 64 bits"
+ os="Ubuntu 16.04 (<a href=\"https://docs.travis-ci.com/user/reference/xenial/\">
x
enial</a>) 64 bits"
else
node="<a href=\"https://travis-ci.org/simgrid/simgrid\">travis-mac</a>"
os="Mac OSX High Sierra (kernel: 17.4.0)"
else
node="<a href=\"https://travis-ci.org/simgrid/simgrid\">travis-mac</a>"
os="Mac OSX High Sierra (kernel: 17.4.0)"