Skip to content

Commit 1745a5e

Browse files
pbatardpbatard
committed
libwdi 1.3.0
* Also bump Zadig to 2.3
1 parent 4817f0c commit 1745a5e

File tree

13 files changed

+78
-53
lines changed

13 files changed

+78
-53
lines changed

‎.amend.cmd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
echo off
2+
echo .>.amend

‎ChangeLog‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
For the latest changes, please visit:
22
https://github.com/pbatard/libwdi/commits/master
33

4+
o v1.3.0 (2017.04.18)
5+
Bugfixes:
6+
- fix issues with extended characters in current user directory
7+
Improvements:
8+
- drop Windows XP and Vista support
9+
410
o v1.2.5 (2016.01.22)
511
Bugfixes:
612
- fix possible crash when deleting the self signing private key

‎Makefile.am‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,12 @@ SUBDIRS = libwdi
44

55
if BUILD_EXAMPLES
66
SUBDIRS += examples
7+
ZADIG_VERSION = $(shell sed -n 's/^.*\"FileVersion\", \"\(.*\)\..*\"/\1/p' examples/zadig.rc)
78
endif
9+
10+
# This step produces the UPX compressed and signed releases that are made available for public download
11+
# NB: UPX v3.09 or later is needed for LZMA compression (http://upx.sourceforge.net/)
12+
zadig_release:
13+
@cp examples/zadig.exe ./zadig-$(ZADIG_VERSION).exe
14+
@upx --lzma zadig-$(ZADIG_VERSION).exe
15+
@cmd.exe //c _sign.cmd zadig-$(ZADIG_VERSION).exe

‎_bm.sh‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22
# Create and upload a Zadig release
33
# !!!THIS SCRIPT IS FOR INTERNAL DEVELOPER USE ONLY!!!
44

5-
target_dir=/e/dailies/libwdi
6-
75
type -P git &>/dev/null || { echo "Git not found. Aborting." >&2; exit 1; }
8-
type -P sed &>/dev/null || { echo "Set not found. Aborting." >&2; exit 1; }
6+
type -P sed &>/dev/null || { echo "Sed not found. Aborting." >&2; exit 1; }
97
type -P upx &>/dev/null || { echo "UPX executable not found. Aborting." >&2; exit 1; }
108

11-
zadig_version=`sed -n 's/^.*\"FileVersion\", \"\(.*\)\..*\"/\1/p' examples/zadig.rc`
12-
echo Building Zadig v$zadig_version...
13-
149
git clean -fdx
1510
./autogen.sh --disable-shared
1611

17-
cd libwdi
18-
make
19-
cd ../examples
20-
make zadig.exe
21-
type -P SetACL &>/dev/null && { SetACL -on ./zadig.exe -ot file -actn ace -ace "n:S-1-5-18;p:read,read_ex;s:y"; }
22-
upx --lzma zadig.exe
23-
cp zadig.exe $target_dir/zadig_$zadig_version.exe
24-
cmd.exe /k zadig_sign.bat "$target_dir/zadig_$zadig_version.exe"
25-
cd ..
12+
zadig_version=`sed -n 's/^.*\"FileVersion\", \"\(.*\)\..*\"/\1/p' examples/zadig.rc`
13+
echo Building Zadig v$zadig_version...
14+
15+
make -j12
16+
make zadig_release

‎_sign.cmd‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
@echo off
2+
:retry_sha1
3+
"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool" sign /v /sha1 655f6413a8f721e3286ace95025c9e0ea132a984 /fd SHA1 /tr http://timestamp.comodoca.com/rfc3161 /td SHA1 %1
4+
if ERRORLEVEL 1 goto retry_sha1
5+
:retry_sha256
6+
"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool" sign /as /v /sha1 5759b23dc8f45e9120a7317f306e5b6890b612f0 /fd SHA256 /tr http://timestamp.comodoca.com/rfc3161 /td SHA256 %1
7+
if ERRORLEVEL 1 goto retry_sha256
8+
exit

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([libwdi], [1.2.5], [[email protected]], [libwdi], [http://libwdi.akeo.ie])
1+
AC_INIT([libwdi], [1.3.0], [[email protected]], [libwdi], [http://libwdi.akeo.ie])
22
AM_INIT_AUTOMAKE([-Wno-portability 1.11 foreign])
33
AC_CONFIG_SRCDIR([libwdi/libwdi.c])
44
AC_CONFIG_MACRO_DIR([m4])

‎examples/wdi-simple.rc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#endif
88

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 1,2,5,700
11-
PRODUCTVERSION 1,2,5,700
10+
FILEVERSION 1,3,0,701
11+
PRODUCTVERSION 1,3,0,701
1212
FILEFLAGSMASK 0x17L
1313
#ifdef _DEBUG
1414
FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
2525
BEGIN
2626
VALUE "CompanyName", "akeo.ie"
2727
VALUE "FileDescription", "WDI-Simple"
28-
VALUE "FileVersion", "1.2.5.700"
28+
VALUE "FileVersion", "1.3.0.701"
2929
VALUE "InternalName", "WDI-Simple"
30-
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
30+
VALUE "LegalCopyright", "� 2010-2017 Pete Batard (LGPL v3)"
3131
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
3232
VALUE "OriginalFilename", "wdi-simple.exe"
3333
VALUE "ProductName", "WDI-Simple"
34-
VALUE "ProductVersion", "1.2.5.700"
34+
VALUE "ProductVersion", "1.3.0.701"
3535
VALUE "Comments", "http://libwdi.akeo.ie"
3636
END
3737
END

‎examples/zadic.rc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ END
5656
//
5757

5858
VS_VERSION_INFO VERSIONINFO
59-
FILEVERSION 1,2,5,700
60-
PRODUCTVERSION 1,2,5,700
59+
FILEVERSION 1,3,0,701
60+
PRODUCTVERSION 1,3,0,701
6161
FILEFLAGSMASK 0x17L
6262
#ifdef _DEBUG
6363
FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
7474
BEGIN
7575
VALUE "CompanyName", "akeo.ie"
7676
VALUE "FileDescription", "Zadic"
77-
VALUE "FileVersion", "1.2.5.700"
77+
VALUE "FileVersion", "1.3.0.701"
7878
VALUE "InternalName", "Zadic"
79-
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
79+
VALUE "LegalCopyright", "� 2010-2017 Pete Batard (LGPL v3)"
8080
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
8181
VALUE "OriginalFilename", "zadic.exe"
8282
VALUE "ProductName", "Zadic"
83-
VALUE "ProductVersion", "1.2.5.700"
83+
VALUE "ProductVersion", "1.3.0.701"
8484
VALUE "Comments", "http://libwdi.akeo.ie"
8585
END
8686
END

‎examples/zadig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#define FIELD_ORANGE RGB(255,240,200)
6060
#define ARROW_GREEN RGB(92,228,65)
6161
#define ARROW_ORANGE RGB(253,143,56)
62-
#define APP_VERSION "Zadig 2.2.700"
62+
#define APP_VERSION "Zadig 2.3.701"
6363

6464
// These are used to flag end users about the driver they are going to replace
6565
enum driver_type {

‎examples/zadig.rc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ END
246246
//
247247

248248
VS_VERSION_INFO VERSIONINFO
249-
FILEVERSION 2,2,682,700
250-
PRODUCTVERSION 2,2,682,700
249+
FILEVERSION 2,3,682,701
250+
PRODUCTVERSION 2,3,682,701
251251
FILEFLAGSMASK 0x17L
252252
#ifdef _DEBUG
253253
FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
264264
BEGIN
265265
VALUE "CompanyName", "akeo.ie"
266266
VALUE "FileDescription", "Zadig"
267-
VALUE "FileVersion", "2.2.700"
267+
VALUE "FileVersion", "2.3.701"
268268
VALUE "InternalName", "Zadig"
269-
VALUE "LegalCopyright", "� 2010-2016 Pete Batard (GPL v3)"
269+
VALUE "LegalCopyright", "� 2010-2017 Pete Batard (GPL v3)"
270270
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
271271
VALUE "OriginalFilename", "zadig.exe"
272272
VALUE "ProductName", "Zadig"
273-
VALUE "ProductVersion", "2.2.700"
273+
VALUE "ProductVersion", "2.3.701"
274274
VALUE "Comments", "http://libwdi.akeo.ie"
275275
END
276276
END

0 commit comments

Comments
 (0)