Skip to content

Commit fcb103a

Browse files
galfargalfar
committed
- updated test scripts
- added simple release maker script
1 parent e31ce58 commit fcb103a

File tree

4 files changed

+58
-28
lines changed

4 files changed

+58
-28
lines changed

‎Bin/RunTests.bat

+9-14
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,24 @@
66
@setlocal EnableDelayedExpansion
77
@if defined param1 set DESKEW=%param1%
88

9+
%DESKEW% ../TestImages/2.png
910
%DESKEW% -t a -a 5 -o TestOut/Out1.tif ../TestImages/1.tif
1011
%DESKEW% -t a -a 10 -o TestOut/Out2.png ../TestImages/2.png
11-
%DESKEW% -t a -a 10 -o TestOut/Out3.png ../TestImages/3.png
12-
%DESKEW% -t a -a 10 -o TestOut/Out4.png ../TestImages/4.png
13-
%DESKEW% -t a -a 10 -o TestOut/Out5.png ../TestImages/5.png
14-
%DESKEW% -t a -a 5 -o TestOut/OutF1550.jpg ../TestImages/F1550.jpg
15-
%DESKEW% -t a -a 5 -b DD -c j95,tjpeg -o TestOut/Out-tiff-jpeg.tif ../TestImages/tiff-jpeg.tif
16-
12+
%DESKEW% -a 10 -o TestOut/Out3.png ../TestImages/3.png
13+
%DESKEW% -o TestOut/Out4.png ../TestImages/4.png
14+
%DESKEW% -q lanczos -a 10 -o TestOut/Out5.png ../TestImages/5.png
15+
%DESKEW% -g c -o TestOut/OutF1550.jpg ../TestImages/F1550.jpg
16+
%DESKEW% -b DD -c j95,tjpeg -o TestOut/Out-tiff-jpeg.tif ../TestImages/tiff-jpeg.tif
1717
%DESKEW% -t 128 -o TestOut/Oute1.tif ../TestImages/1.tif
1818
%DESKEW% -t 128 -o TestOut/Oute2.png ../TestImages/2.png
1919
%DESKEW% -t 180 -o TestOut/OuteF1550.jpg ../TestImages/F1550.jpg
20-
2120
%DESKEW% -b FF0000 -o TestOut/Outb1.tif ../TestImages/1.tif
22-
%DESKEW% -b 00FFFF -o TestOut/Outb5.png ../TestImages/5.png
23-
21+
%DESKEW% -q nearest -b 00FFFF -o TestOut/Outb5.png ../TestImages/5.png
2422
%DESKEW% -r 214,266,933,1040 -o TestOut/Outr4.png ../TestImages/4.png
25-
2623
%DESKEW% -t 100 -a 11 -b aa55cc -r 314,366,833,940 -s sp -o TestOut/Outs4.png ../TestImages/4.png
27-
2824
%DESKEW% -f b1 -o TestOut/Outf1.tif ../TestImages/1.tif
2925
%DESKEW% -f b1 -o TestOut/Outf2.png ../TestImages/2.png
30-
3126
%DESKEW% -a 5 -l 2 -o TestOut/Outl1.tif ../TestImages/1.tif
32-
3327
%DESKEW% -f rgba32 -b 40ff00ff -o TestOut/Outa6.png ../TestImages/6.png
34-
%DESKEW% -f g8 -b 77 -o -s t TestOut/Outg6.png ../TestImages/6.png
28+
%DESKEW% -f g8 -b 77 -o -s t TestOut/Outg6.png ../TestImages/6.png
29+
%DESKEW% -g d ../TestImages/5.png

‎Bin/runtests.sh

+8-13
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,27 @@ set -e
66
# a parameter e.g. "runtests.sh deskew-arm"
77
DESKEW=${1-deskew}
88

9+
./$DESKEW ../TestImages/2.png
910
./$DESKEW -t a -a 5 -o TestOut/Out1.tif ../TestImages/1.tif
1011
./$DESKEW -t a -a 10 -o TestOut/Out2.png ../TestImages/2.png
11-
./$DESKEW -t a -a 10 -o TestOut/Out3.png ../TestImages/3.png
12-
./$DESKEW -t a -a 10 -o TestOut/Out4.png ../TestImages/4.png
13-
./$DESKEW -t a -a 10 -o TestOut/Out5.png ../TestImages/5.png
14-
./$DESKEW -t a -a 5 -o TestOut/OutF1550.jpg ../TestImages/F1550.jpg
15-
./$DESKEW -t a -a 5 -b DD -c j95,tjpeg -o TestOut/Out-tiff-jpeg.tif ../TestImages/tiff-jpeg.tif
16-
12+
./$DESKEW -a 10 -o TestOut/Out3.png ../TestImages/3.png
13+
./$DESKEW -o TestOut/Out4.png ../TestImages/4.png
14+
./$DESKEW -q lanczos -a 10 -o TestOut/Out5.png ../TestImages/5.png
15+
./$DESKEW -g c -o TestOut/OutF1550.jpg ../TestImages/F1550.jpg
16+
./$DESKEW -b DD -c j95,tjpeg -o TestOut/Out-tiff-jpeg.tif ../TestImages/tiff-jpeg.tif
1717
./$DESKEW -t 128 -o TestOut/Oute1.tif ../TestImages/1.tif
1818
./$DESKEW -t 128 -o TestOut/Oute2.png ../TestImages/2.png
1919
./$DESKEW -t 180 -o TestOut/OuteF1550.jpg ../TestImages/F1550.jpg
20-
2120
./$DESKEW -b FF0000 -o TestOut/Outb1.tif ../TestImages/1.tif
22-
./$DESKEW -b 00FFFF -o TestOut/Outb5.png ../TestImages/5.png
23-
21+
./$DESKEW -q nearest -b 00FFFF -o TestOut/Outb5.png ../TestImages/5.png
2422
./$DESKEW -r 214,266,933,1040 -o TestOut/Outr4.png ../TestImages/4.png
25-
2623
./$DESKEW -t 100 -a 11 -b aa55cc -r 314,366,833,940 -s sp -o TestOut/Outs4.png ../TestImages/4.png
27-
2824
./$DESKEW -f b1 -o TestOut/Outf1.tif ../TestImages/1.tif
2925
./$DESKEW -f b1 -o TestOut/Outf2.png ../TestImages/2.png
30-
3126
./$DESKEW -a 5 -l 2 -o TestOut/Outl1.tif ../TestImages/1.tif
32-
3327
./$DESKEW -f rgba32 -b 40ff00ff -o TestOut/Outa6.png ../TestImages/6.png
3428
./$DESKEW -f g8 -b 77 -o -s t TestOut/Outg6.png ../TestImages/6.png
29+
./$DESKEW -g d ../TestImages/5.png
3530

3631
echo
3732
echo TESTS PASSED!

‎Scripts/create_cli_release_zip.sh

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
set -e
2+
3+
cd ..
4+
5+
# extract version number from main unit
6+
VERSION_STR=$(grep -oP "(?<=SAppTitle = 'Deskew )([0-9\.]+)" MainUnit.pas)
7+
8+
ZIP_NAME=Deskew-$VERSION_STR.zip
9+
RELEASE_DIR=_internal/Release-CLI
10+
CONTENTS_DIR=$RELEASE_DIR/Deskew
11+
rm -rf $RELEASE_DIR/*
12+
mkdir -p $CONTENTS_DIR
13+
14+
# clone sources (without .hg folder)
15+
hg archive -t files $CONTENTS_DIR
16+
rm $CONTENTS_DIR/.hg*
17+
18+
# copy binaries to release folder (must be prebuilt - no platfrom where we could cross-compile all atm)
19+
cp Bin/deskew $CONTENTS_DIR/Bin
20+
cp Bin/deskew.exe $CONTENTS_DIR/Bin
21+
cp Bin/deskew32.exe $CONTENTS_DIR/Bin
22+
cp Bin/deskew-mac $CONTENTS_DIR/Bin
23+
cp Bin/deskew-arm $CONTENTS_DIR/Bin
24+
chmod 755 $CONTENTS_DIR/Bin/deskew*
25+
26+
# build the ZIP (in Linux/WSL so the exe permissions are presserved)
27+
cd $RELEASE_DIR
28+
zip -r -9 -q $ZIP_NAME Deskew
29+
30+
# check expected contents
31+
OUTPUT=$(unzip -Z $ZIP_NAME)
32+
33+
echo "$OUTPUT" | grep -q "^-r.xr.xr.x.*unx.*deskew$"
34+
echo "$OUTPUT" | grep -q "^-r.xr.xr.x.*unx.*deskew-mac$"
35+
echo "$OUTPUT" | grep -q "^-r.xr.xr.x.*unx.*deskew-arm$"
36+
37+
echo "Finished OK with $RELEASE_DIR/$ZIP_NAME!"
38+
39+
40+

‎Scripts/create_gui_release_zip.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set -e
22

3-
RELEASE_DIR=../_internal/Release
3+
RELEASE_DIR=../_internal/Release-GUI
44
rm -f $RELEASE_DIR/*.zip
55

66
# get version from Lazarus project file

0 commit comments

Comments
 (0)