Skip to content

Commit e8beaf9

Browse files
author
jfpoilpret
committed
Fix build-release shell script to fit new dirs structure.
1 parent 40807e1 commit e8beaf9

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

make/build-release

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@
1010
# 5. Collect size information and prepare integration to doxygen tutorial size tables
1111
# 6. Regenerate docs
1212

13+
CURDIR=`pwd`
14+
MAKEDIR=$(dirname "$0")
15+
BASEDIR=$MAKEDIR/..
16+
DOCDIR=$BASEDIR/basedoc
17+
1318
echo "Clean up all generated code"
19+
cd $BASEDIR
1420
make clean-all >/dev/null 2>&1
1521
make clean-examples-all >/dev/null 2>&1
1622

@@ -19,7 +25,7 @@ export TARGETS="UNO LEONARDO MEGA ATtiny84 ATtiny85"
1925
for TARGET in $TARGETS
2026
do
2127
echo "Target: $TARGET"
22-
make CONF=$TARGET examples 2>errors | ./stats.py >newsizes-$TARGET
28+
make CONF=$TARGET examples 2>errors | $MAKEDIR/stats.py >newsizes-$TARGET
2329
grep "Error" errors
2430
# check if error found, then abort
2531
if [ $? -ne 1 ]; then
@@ -30,7 +36,7 @@ do
3036
done
3137

3238
echo "Generate size data sheets"
33-
./gen-size-sheet.py new-examples-data.xlsx $TARGETS
39+
$MAKEDIR/gen-size-sheet.py $DOCDIR/new-examples-data.xlsx $TARGETS
3440

3541
echo "Remove intermediate result files"
3642
for TARGET in $TARGETS
@@ -39,4 +45,5 @@ do
3945
done
4046

4147
echo "Compare new sizes with previous release sizes"
42-
./compare-size-sheets.py examples-data.xlsx new-examples-data.xlsx >sizes-diff.xlsx
48+
$MAKEDIR/compare-size-sheets.py $DOCDIR/examples-data.xlsx $DOCDIR/new-examples-data.xlsx >$DOCDIR/sizes-diff.xlsx
49+
cd $CURDIR

make/compare-size-sheets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
def read_template():
1717
global ALL_EXAMPLES
1818
global ALL_SIZES
19-
with open("examples-list.txt", "r") as handle:
19+
with open("make/examples-list.txt", "r") as handle:
2020
for line in handle:
2121
data = line.split('\t')
2222
ALL_EXAMPLES.append(data[0])

make/gen-size-sheet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
def read_template():
1515
global ALL_EXAMPLES
1616
global ALL_SIZES
17-
with open("examples-list.txt", "r") as handle:
17+
with open("make/examples-list.txt", "r") as handle:
1818
for line in handle:
1919
data = line.split('\t')
2020
ALL_EXAMPLES.append(data[0])

0 commit comments

Comments
 (0)