Skip to content

Commit cc68d6e

Browse files
committed
createrelease: use tag 2.x.0. ensure version.txt does not point out premium version.
1 parent bdbd886 commit cc68d6e

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

createrelease

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@
8989
#
9090
# Set debug version (see 803eea912c9512c810a7e78d58bb927d89a6daa1)
9191

92-
# Tag to use
93-
tag=$1
92+
# Folder/tag to use
93+
folder=$1
94+
tag=$folder.0
9495

9596
# Name of release
9697
releasename=cppcheck-$tag
@@ -101,6 +102,7 @@ cd ~/cppcheck
101102

102103
git checkout $tag
103104

105+
rm -rf upload
104106
mkdir -p upload
105107

106108
make clean
@@ -110,16 +112,17 @@ git archive --format=tar --prefix=$releasename/ $tag | gzip > upload/$releasenam
110112
git archive --format=tar --prefix=$releasename/ $tag | bzip2 > upload/$releasename.tar.bz2
111113
git archive --format=zip -9 --prefix=$releasename/ $tag > upload/$releasename.zip
112114
cd upload
113-
scp $releasename.* danielmarjamaki,cppcheck@frs.sourceforge.net:/home/frs/project/c/cp/cppcheck/cppcheck/$tag/
115+
scp $releasename.* danielmarjamaki,cppcheck@frs.sourceforge.net:/home/frs/project/c/cp/cppcheck/cppcheck/$folder/
114116
rm $releasename.*
115117
cd ..
116118

117119
# Generate version.txt
118120
make -j4
121+
rm cppcheck.cfg
119122
./cppcheck --version > upload/version.txt
120123

121124
cd ~/cppcheck/upload
122-
scp * danielmarjamaki,cppcheck@web.sourceforge.net:htdocs/
125+
scp version.txt danielmarjamaki,cppcheck@web.sourceforge.net:htdocs/
123126

124127
cd ~/cppcheck
125128
rm -rf upload

0 commit comments

Comments
 (0)