|
102 | 102 | $branch =~ s/\s+$//;
|
103 | 103 | pod2usage("Not on a branch") unless $branch;
|
104 | 104 | pod2usage("Current branch is $branch. master or a release branch expected") if $branch !~ /^(master.*|release-(\d+)_(\d+))$/;
|
105 |
| -pod2usage("Version mismatch ($2.$3 in branch $branch vs. $major.$minor in CMakeLists.txt)") if $branch ne "master" && ( $major != $2 || $minor != $3 ); |
106 |
| -pod2usage("Release name Master expected on master branch" ) if $branch eq "master" && $releasename ne "Master"; |
| 105 | +pod2usage("Version mismatch ($2.$3) in branch $branch vs. $major.$minor in CMakeLists.txt)") if $branch !~ /master/ && ( $major != $2 || $minor != $3 ); |
| 106 | +pod2usage("Release name Master expected on master branch" ) if $branch =~ /^master/ && $releasename ne "Master"; |
107 | 107 |
|
108 | 108 | if( $branch =~ /^master.*/ ) {
|
109 | 109 | pod2usage("No point releases on master branch") if $dopoint;
|
|
136 | 136 | my $splashwidth;
|
137 | 137 | unless( $dopoint ) {
|
138 | 138 | pod2usage("Splash images/splash/splash-$newmajor.$newminor.png not found") unless -r "images/splash/splash-$newmajor.$newminor.png";
|
139 |
| - pod2usage("NSIS image ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp not found") unless -r "ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp"; |
140 |
| - my $welcomeformat = `identify -format '%wx%h %m' ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp`; |
141 |
| - pod2usage("NSIS Image ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp mis-sized [$welcomeformat vs. 164x314 BMP3]") unless $welcomeformat =~ /^164x314 /; |
| 139 | + pod2usage("NSIS image ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png not found") unless -r "ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png"; |
| 140 | + my $welcomeformat = `identify -format '%wx%h %m' ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png`; |
| 141 | + pod2usage("NSIS Image ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png mis-sized [$welcomeformat vs. 164x314 BMP3]") unless $welcomeformat =~ /^164x314 /; |
142 | 142 | }
|
143 | 143 |
|
144 | 144 | print "Last pull rebase...\n";
|
|
182 | 182 |
|
183 | 183 | unless( $dopoint ) {
|
184 | 184 | run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" );
|
185 |
| - run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.bmp BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" ); |
| 185 | + run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" ); |
186 | 186 |
|
187 | 187 | if( -f "images/splash/splash-release.xcf.bz2" ) {
|
188 | 188 | run( "cp -v images/splash/splash-$newmajor.$newminor.xcf.bz2 images/splash/splash.xcf.bz2", "splash xcf switch failed" );
|
|
0 commit comments