comparison version.sh @ 953:a2033b220db0

Remove suffix handling from version script.
author Sjoerd Mullender <sjoerd@acm.org>
date Thu, 16 Jan 2025 13:23:41 +0100 (2 months ago)
parents ec7530f615bf
children
comparison
equal deleted inserted replaced
952:203c4cc8d94d 953:a2033b220db0
9 # Copyright 2024, 2025 MonetDB Foundation; 9 # Copyright 2024, 2025 MonetDB Foundation;
10 # Copyright August 2008 - 2023 MonetDB B.V.; 10 # Copyright August 2008 - 2023 MonetDB B.V.;
11 # Copyright 1997 - July 2008 CWI. 11 # Copyright 1997 - July 2008 CWI.
12 12
13 if [[ -z $1 ]] ; then 13 if [[ -z $1 ]] ; then
14 echo "Usage: $0 [-w] jdbc <(major|minor|suffix)=newversion> [...]" 14 echo "Usage: $0 [-w] <(major|minor)=newversion> [...]"
15 echo "where -w activates actual write of changes" 15 echo "where -w activates actual write of changes"
16 exit -1 16 exit -1
17 fi 17 fi
18 18
19 PROPERTIES='build.properties' 19 PROPERTIES='build.properties'
34 -w) 34 -w)
35 patch="patch -p0"; 35 patch="patch -p0";
36 shift 36 shift
37 ;; 37 ;;
38 esac 38 esac
39 case $1 in
40 jdbc)
41 TYPE=JDBC
42 FILES="monetdb-jdbc-XXX.jar"
43 ;;
44 *)
45 echo "invalid type: $1"
46 exit -1
47 ;;
48 esac
49 shift
50 39
51 CUR_MAJOR=$(eval "get_value '${TYPE}_MAJOR'") 40 CUR_MAJOR=$(eval "get_value 'JDBC_MAJOR'")
52 CUR_MINOR=$(eval "get_value '${TYPE}_MINOR'") 41 CUR_MINOR=$(eval "get_value 'JDBC_MINOR'")
53 CUR_SUFFIX=$(eval "get_value '${TYPE}_VER_SUFFIX'")
54 42
55 NEW_MAJOR=${CUR_MAJOR} 43 NEW_MAJOR=${CUR_MAJOR}
56 NEW_MINOR=${CUR_MINOR} 44 NEW_MINOR=${CUR_MINOR}
57 NEW_SUFFIX=${CUR_SUFFIX}
58 45
59 ESC_MAJOR=$(escape_value ${CUR_MAJOR}) 46 ESC_MAJOR=$(escape_value ${CUR_MAJOR})
60 ESC_MINOR=$(escape_value ${CUR_MINOR}) 47 ESC_MINOR=$(escape_value ${CUR_MINOR})
61 ESC_SUFFIX=$(escape_value ${CUR_SUFFIX})
62 48
63 for param in $* ; do 49 for param in $* ; do
64 arg=${param%%=*} 50 arg=${param%%=*}
65 val=${param#*=} 51 val=${param#*=}
66 num=$(echo ${val} | grep -E '[0-9]+' -o | head -n1) 52 num=$(echo ${val} | grep -E '[0-9]+' -o | head -n1)
77 echo "minor needs a numeric argument!"; 63 echo "minor needs a numeric argument!";
78 exit -1 64 exit -1
79 fi 65 fi
80 NEW_MINOR=${num} 66 NEW_MINOR=${num}
81 ;; 67 ;;
82 suffix)
83 NEW_SUFFIX=${val}
84 ;;
85 esac 68 esac
86 done 69 done
87 70
88 if [[ -n $CUR_SUFFIX ]]; then 71 echo "Current version: ${CUR_MAJOR}.${CUR_MINOR}"
89 CUR_SUFFIX_p=" (${CUR_SUFFIX})" 72 echo "New version: ${NEW_MAJOR}.${NEW_MINOR}"
90 ESC_SUFFIX_p=" (${ESC_SUFFIX})"
91 fi
92 if [[ -n $NEW_SUFFIX ]]; then
93 NEW_SUFFIX_p=" (${NEW_SUFFIX})"
94 fi
95
96 echo "Current version: ${CUR_MAJOR}.${CUR_MINOR}${CUR_SUFFIX_p}"
97 echo "New version: ${NEW_MAJOR}.${NEW_MINOR}${NEW_SUFFIX_p}"
98 73
99 diff="diff -Naur" 74 diff="diff -Naur"
100 75
101 file="release.txt" 76 file="release.txt"
102 sed \ 77 sed \
103 -e "s|version ${ESC_MAJOR}\.${ESC_MINOR}${ESC_SUFFIX_p}|version ${NEW_MAJOR}.${NEW_MINOR}${NEW_SUFFIX_p}|g" \ 78 -e "s|version ${ESC_MAJOR}\.${ESC_MINOR}|version ${NEW_MAJOR}.${NEW_MINOR}|g" \
104 -e "s|${TYPE}-${ESC_MAJOR}\.${ESC_MINOR}|${TYPE}-${NEW_MAJOR}.${NEW_MINOR}|g" \ 79 -e "s|JDBC-${ESC_MAJOR}\.${ESC_MINOR}|JDBC-${NEW_MAJOR}.${NEW_MINOR}|g" \
105 -e "s|Release date: 20[0-9][0-9]-[01][0-9]-[0-3][0-9]|Release date: `date +%F`|" \ 80 -e "s|Release date: 20[0-9][0-9]-[01][0-9]-[0-3][0-9]|Release date: `date +%F`|" \
106 ${file} | ${diff} ${file} - | ${patch} 81 ${file} | ${diff} ${file} - | ${patch}
107 82
108 file="build.properties" 83 file="build.properties"
109 sed \ 84 sed \
110 -e "s|${TYPE}_MAJOR=${ESC_MAJOR}|${TYPE}_MAJOR=${NEW_MAJOR}|g" \ 85 -e "s|JDBC_MAJOR=${ESC_MAJOR}|JDBC_MAJOR=${NEW_MAJOR}|g" \
111 -e "s|${TYPE}_MINOR=${ESC_MINOR}|${TYPE}_MINOR=${NEW_MINOR}|g" \ 86 -e "s|JDBC_MINOR=${ESC_MINOR}|JDBC_MINOR=${NEW_MINOR}|g" \
112 -e "s|${TYPE}_VER_SUFFIX=${ESC_SUFFIX}|${TYPE}_VER_SUFFIX=${NEW_SUFFIX}|g" \
113 ${file} | ${diff} ${file} - | ${patch} 87 ${file} | ${diff} ${file} - | ${patch}
114 88
115 file="pom.xml" 89 file="pom.xml"
116 sed \ 90 sed \
117 -e "/monetdb-jdbc/,/MonetDB JDBC driver/s|<version>${ESC_MAJOR}\.${ESC_MINOR}</version>|<version>${NEW_MAJOR}.${NEW_MINOR}</version>|g" \ 91 -e "/monetdb-jdbc/,/MonetDB JDBC driver/s|<version>${ESC_MAJOR}\.${ESC_MINOR}</version>|<version>${NEW_MAJOR}.${NEW_MINOR}</version>|g" \