Skip to content

Commit ec9a440

Browse files
author
Antoine Morvan
committed
merge branch 'develop' for new version 1.1.3
2 parents 9b6a623 + ed2bcf8 commit ec9a440

File tree

7 files changed

+146
-7
lines changed

7 files changed

+146
-7
lines changed

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.2
1+
1.1.3

‎master/CMakeCodeblock.bat

+32
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,38 @@
6666
@REM knowledge of the CeCILL license and that you accept its terms.
6767
@REM
6868

69+
@rem Hugo Miomandre <[email protected]> (2017)
70+
@REM
71+
@REM Spider is a dataflow based runtime used to execute dynamic PiSDF
72+
@REM applications. The Preesm tool may be used to design PiSDF applications.
73+
@REM
74+
@REM This software is governed by the CeCILL license under French law and
75+
@REM abiding by the rules of distribution of free software. You can use,
76+
@REM modify and/ or redistribute the software under the terms of the CeCILL
77+
@REM license as circulated by CEA, CNRS and INRIA at the following URL
78+
@REM "http://www.cecill.info".
79+
@REM
80+
@REM As a counterpart to the access to the source code and rights to copy,
81+
@REM modify and redistribute granted by the license, users are provided only
82+
@REM with a limited warranty and the software's author, the holder of the
83+
@REM economic rights, and the successive licensors have only limited
84+
@REM liability.
85+
@REM
86+
@REM In this respect, the user's attention is drawn to the risks associated
87+
@REM with loading, using, modifying and/or developing or reproducing the
88+
@REM software by the user in light of its specific status of free software,
89+
@REM that may mean that it is complicated to manipulate, and that also
90+
@REM therefore means that it is reserved for developers and experienced
91+
@REM professionals having in-depth computer knowledge. Users are therefore
92+
@REM encouraged to load and test the software's suitability as regards their
93+
@REM requirements in conditions enabling the security of their systems and/or
94+
@REM data to be ensured and, more generally, to use and operate it in the
95+
@REM same conditions as regards security.
96+
@REM
97+
@REM The fact that you are presently reading this means that you have had
98+
@REM knowledge of the CeCILL license and that you accept its terms.
99+
@REM
100+
69101
@echo off
70102
mkdir bin
71103
cd bin

‎master/CMakeVS2013.bat

+32
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,38 @@
6666
@REM knowledge of the CeCILL license and that you accept its terms.
6767
@REM
6868

69+
@rem Hugo Miomandre <[email protected]> (2017)
70+
@REM
71+
@REM Spider is a dataflow based runtime used to execute dynamic PiSDF
72+
@REM applications. The Preesm tool may be used to design PiSDF applications.
73+
@REM
74+
@REM This software is governed by the CeCILL license under French law and
75+
@REM abiding by the rules of distribution of free software. You can use,
76+
@REM modify and/ or redistribute the software under the terms of the CeCILL
77+
@REM license as circulated by CEA, CNRS and INRIA at the following URL
78+
@REM "http://www.cecill.info".
79+
@REM
80+
@REM As a counterpart to the access to the source code and rights to copy,
81+
@REM modify and redistribute granted by the license, users are provided only
82+
@REM with a limited warranty and the software's author, the holder of the
83+
@REM economic rights, and the successive licensors have only limited
84+
@REM liability.
85+
@REM
86+
@REM In this respect, the user's attention is drawn to the risks associated
87+
@REM with loading, using, modifying and/or developing or reproducing the
88+
@REM software by the user in light of its specific status of free software,
89+
@REM that may mean that it is complicated to manipulate, and that also
90+
@REM therefore means that it is reserved for developers and experienced
91+
@REM professionals having in-depth computer knowledge. Users are therefore
92+
@REM encouraged to load and test the software's suitability as regards their
93+
@REM requirements in conditions enabling the security of their systems and/or
94+
@REM data to be ensured and, more generally, to use and operate it in the
95+
@REM same conditions as regards security.
96+
@REM
97+
@REM The fact that you are presently reading this means that you have had
98+
@REM knowledge of the CeCILL license and that you accept its terms.
99+
@REM
100+
69101
@echo off
70102
mkdir bin
71103
cd bin

‎master/CMakeVS2015.bat

+32
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,38 @@
6666
@REM knowledge of the CeCILL license and that you accept its terms.
6767
@REM
6868

69+
@rem Hugo Miomandre <[email protected]> (2017)
70+
@REM
71+
@REM Spider is a dataflow based runtime used to execute dynamic PiSDF
72+
@REM applications. The Preesm tool may be used to design PiSDF applications.
73+
@REM
74+
@REM This software is governed by the CeCILL license under French law and
75+
@REM abiding by the rules of distribution of free software. You can use,
76+
@REM modify and/ or redistribute the software under the terms of the CeCILL
77+
@REM license as circulated by CEA, CNRS and INRIA at the following URL
78+
@REM "http://www.cecill.info".
79+
@REM
80+
@REM As a counterpart to the access to the source code and rights to copy,
81+
@REM modify and redistribute granted by the license, users are provided only
82+
@REM with a limited warranty and the software's author, the holder of the
83+
@REM economic rights, and the successive licensors have only limited
84+
@REM liability.
85+
@REM
86+
@REM In this respect, the user's attention is drawn to the risks associated
87+
@REM with loading, using, modifying and/or developing or reproducing the
88+
@REM software by the user in light of its specific status of free software,
89+
@REM that may mean that it is complicated to manipulate, and that also
90+
@REM therefore means that it is reserved for developers and experienced
91+
@REM professionals having in-depth computer knowledge. Users are therefore
92+
@REM encouraged to load and test the software's suitability as regards their
93+
@REM requirements in conditions enabling the security of their systems and/or
94+
@REM data to be ensured and, more generally, to use and operate it in the
95+
@REM same conditions as regards security.
96+
@REM
97+
@REM The fact that you are presently reading this means that you have had
98+
@REM knowledge of the CeCILL license and that you accept its terms.
99+
@REM
100+
69101
@echo off
70102
mkdir bin
71103
cd bin

‎master/CMakeVS2017.bat

+32
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,38 @@
6666
@REM knowledge of the CeCILL license and that you accept its terms.
6767
@REM
6868

69+
@rem Hugo Miomandre <[email protected]> (2017)
70+
@REM
71+
@REM Spider is a dataflow based runtime used to execute dynamic PiSDF
72+
@REM applications. The Preesm tool may be used to design PiSDF applications.
73+
@REM
74+
@REM This software is governed by the CeCILL license under French law and
75+
@REM abiding by the rules of distribution of free software. You can use,
76+
@REM modify and/ or redistribute the software under the terms of the CeCILL
77+
@REM license as circulated by CEA, CNRS and INRIA at the following URL
78+
@REM "http://www.cecill.info".
79+
@REM
80+
@REM As a counterpart to the access to the source code and rights to copy,
81+
@REM modify and redistribute granted by the license, users are provided only
82+
@REM with a limited warranty and the software's author, the holder of the
83+
@REM economic rights, and the successive licensors have only limited
84+
@REM liability.
85+
@REM
86+
@REM In this respect, the user's attention is drawn to the risks associated
87+
@REM with loading, using, modifying and/or developing or reproducing the
88+
@REM software by the user in light of its specific status of free software,
89+
@REM that may mean that it is complicated to manipulate, and that also
90+
@REM therefore means that it is reserved for developers and experienced
91+
@REM professionals having in-depth computer knowledge. Users are therefore
92+
@REM encouraged to load and test the software's suitability as regards their
93+
@REM requirements in conditions enabling the security of their systems and/or
94+
@REM data to be ensured and, more generally, to use and operate it in the
95+
@REM same conditions as regards security.
96+
@REM
97+
@REM The fact that you are presently reading this means that you have had
98+
@REM knowledge of the CeCILL license and that you accept its terms.
99+
@REM
100+
69101
@echo off
70102
mkdir bin
71103
cd bin

‎release_notes.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
Spider Changelog
22
================
33

4+
## Release version 1.1.3
5+
*2018.06.11*
6+
7+
### New Feature
8+
9+
### Changes
10+
* Fix release scripts;
11+
12+
### Bug fix
13+
14+
415
## Release version 1.1.2
516
*2018.06.11*
617

‎releng/release.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ LCANS=`echo "${ANS}" | tr '[:upper:]' '[:lower:]'`
4545

4646
NEW_VERSION=$1
4747

48-
RELEASE_LINES=$(cat release_notes.md | grep -n Release | head -n 2 | cut -d':' -f 1 | xargs)
49-
NEW_RELEASE_LINE=$(echo $RELEASE_LINES | cut -d' ' -f 1)
50-
PREV_RELEASE_LINE=$(echo $RELEASE_LINES | cut -d' ' -f 2)
51-
RELEASE_BODY=$(cat release_notes.md | head -n $((PREV_RELEASE_LINE - 1)) | tail -n +${NEW_RELEASE_LINE})
52-
53-
5448
CURRENT_BRANCH=$(cd `dirname $0` && echo `git branch`)
5549
ORIG_DIR=`pwd`
5650
TODAY_DATE=`date +%Y.%m.%d`
@@ -69,6 +63,12 @@ git clean -xdf
6963
./releng/update-version.sh $NEW_VERSION
7064
sed -i -e "s/X\.Y\.Z/$NEW_VERSION/g" release_notes.md
7165
sed -i -e "s/XXXX\.XX\.XX/$TODAY_DATE/g" release_notes.md
66+
67+
RELEASE_LINES=$(cat release_notes.md | grep -n Release | head -n 2 | cut -d':' -f 1 | xargs)
68+
NEW_RELEASE_LINE=$(echo $RELEASE_LINES | cut -d' ' -f 1)
69+
PREV_RELEASE_LINE=$(echo $RELEASE_LINES | cut -d' ' -f 2)
70+
RELEASE_BODY=$(cat release_notes.md | head -n $((PREV_RELEASE_LINE - 1)) | tail -n +${NEW_RELEASE_LINE} | tr '\n' '\r' | sed 's/\r/\\n/g')
71+
7272
git stash
7373

7474
# Fix headers

0 commit comments

Comments
 (0)