1
1
#! /bin/bash
2
2
#
3
+ next=" 2.4.0"
3
4
4
5
# Figure out how will the package be called
5
- ver=` git describe --tags --always`
6
+ ver=` git describe --exact-match`
7
+ if [ $? -ne 0 ]; then
8
+ # not tagged version; generate nightly package
9
+ date_str=` date +" %Y%m%d" `
10
+ is_nightly=1
11
+ plain_ver=" ${next} -nightly"
12
+ ver=" ${plain_ver} +${date_str} "
13
+ else
14
+ plain_ver=$ver
15
+ fi
16
+
6
17
package_name=esp8266-$ver
7
18
echo " Version: $ver "
8
19
echo " Package name: $package_name "
@@ -71,7 +82,7 @@ $SED 's/recipe.hooks.core.prebuild.1.pattern.*//g' \
71
82
> $outdir /platform.txt
72
83
73
84
# Put core version and short hash of git version into core_version.h
74
- ver_define=` echo $ver | tr " [:lower:].-" " [:upper:]_" `
85
+ ver_define=` echo $plain_ver | tr " [:lower:].-+ " " [:upper:]_" `
75
86
echo Ver define: $ver_define
76
87
echo \# define ARDUINO_ESP8266_GIT_VER 0x` git rev-parse --short=8 HEAD 2> /dev/null` > $outdir /cores/esp8266/core_version.h
77
88
echo \# define ARDUINO_ESP8266_RELEASE_$ver_define >> $outdir /cores/esp8266/core_version.h
@@ -90,14 +101,26 @@ echo Size: $size
90
101
echo SHA-256: $sha
91
102
92
103
echo " Making package_esp8266com_index.json"
93
- cat $srcdir /package/package_esp8266com_index.template.json | \
94
- jq " .packages[0].platforms[0].version = \" $ver \" | \
104
+
105
+ jq_arg= " .packages[0].platforms[0].version = \" $ver \" | \
95
106
.packages[0].platforms[0].url = \" $PKG_URL \" |\
96
107
.packages[0].platforms[0].archiveFileName = \" $package_name .zip\" |\
97
- .packages[0].platforms[0].checksum = \" SHA-256:$sha \" |\
98
- .packages[0].platforms[0].size = \" $size \" |\
99
- .packages[0].platforms[0].help.online = \" $DOC_URL \" " \
100
- > package_esp8266com_index.json
108
+ .packages[0].platforms[0].help.online = \" $DOC_URL \" "
109
+
110
+ if [ -z " $is_nightly " ]; then
111
+ jq_arg=" $jq_arg |\
112
+ .packages[0].platforms[0].size = \" $size \" |\
113
+ .packages[0].platforms[0].checksum = \" SHA-256:$sha \" |"
114
+ fi
115
+
116
+ cat $srcdir /package/package_esp8266com_index.template.json | \
117
+ jq " $jq_arg " > package_esp8266com_index.json
118
+
119
+ old_json=package_esp8266com_index_stable.json
120
+ wget -O $old_json http://arduino.esp8266.com/$branch /package_esp8266com_index.json
121
+ new_json=package_esp8266com_index.json
122
+
123
+ python ../../merge_packages.py $new_json $old_json > tmp && mv tmp $new_json && rm $old_json
101
124
102
125
popd
103
126
popd
0 commit comments