win32: generate PDB files for releases
https://msdn.microsoft.com/fsk896zz.aspx fixes https://github.com/OpenSC/OpenSC/issues/1191
This commit is contained in:
parent
ddc9baed25
commit
4444d24f59
20
appveyor.yml
20
appveyor.yml
|
@ -6,9 +6,7 @@ platform:
|
||||||
|
|
||||||
configuration:
|
configuration:
|
||||||
- Release
|
- Release
|
||||||
- Debug
|
|
||||||
- Light-Release
|
- Light-Release
|
||||||
- Light-Debug
|
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
matrix:
|
matrix:
|
||||||
|
@ -29,15 +27,11 @@ install:
|
||||||
If ($env:Platform -Match "x86") {
|
If ($env:Platform -Match "x86") {
|
||||||
$env:VCVARS_PLATFORM="x86"
|
$env:VCVARS_PLATFORM="x86"
|
||||||
$env:OPENSSL_PF="Win32"
|
$env:OPENSSL_PF="Win32"
|
||||||
$env:ARTIFACT="OpenSC-win32_vs${env:VSVER}-${env:CONFIGURATION}.msi"
|
$env:ARTIFACT="OpenSC-win32_vs${env:VSVER}-${env:CONFIGURATION}"
|
||||||
} Else {
|
} Else {
|
||||||
$env:VCVARS_PLATFORM="amd64"
|
$env:VCVARS_PLATFORM="amd64"
|
||||||
$env:OPENSSL_PF="Win64"
|
$env:OPENSSL_PF="Win64"
|
||||||
$env:ARTIFACT="OpenSC-win64_vs${env:VSVER}-${env:CONFIGURATION}.msi"
|
$env:ARTIFACT="OpenSC-win64_vs${env:VSVER}-${env:CONFIGURATION}"
|
||||||
}
|
|
||||||
- ps: >-
|
|
||||||
If ($env:Configuration -Like "*Debug*") {
|
|
||||||
$env:NMAKE_EXTRA="DEBUG_DEF=/DDEBUG ${env:NMAKE_EXTRA}"
|
|
||||||
}
|
}
|
||||||
- ps: >-
|
- ps: >-
|
||||||
If (!($env:Configuration -Like "*Light*")) {
|
If (!($env:Configuration -Like "*Light*")) {
|
||||||
|
@ -98,13 +92,15 @@ build_script:
|
||||||
- cp win32/winconfig.h config.h
|
- cp win32/winconfig.h config.h
|
||||||
- nmake /f Makefile.mak %NMAKE_EXTRA%
|
- nmake /f Makefile.mak %NMAKE_EXTRA%
|
||||||
- cd win32 && nmake /f Makefile.mak %NMAKE_EXTRA% VSVER=%VSVER% OpenSC.msi
|
- cd win32 && nmake /f Makefile.mak %NMAKE_EXTRA% VSVER=%VSVER% OpenSC.msi
|
||||||
- move OpenSC.msi %ARTIFACT%
|
- move OpenSC.msi %ARTIFACT%.msi
|
||||||
- appveyor PushArtifact %ARTIFACT%
|
- appveyor PushArtifact %ARTIFACT%.msi
|
||||||
# put all pdb files for dump analysis, but this consumes approx 100 MB per build
|
# put all pdb files for dump analysis, but this consumes approx 100 MB per build
|
||||||
|
- md %ARTIFACT%-Debug
|
||||||
- ps: >-
|
- ps: >-
|
||||||
If ($env:Configuration -Like "*Debug*") {
|
Get-ChildItem -recurse C:\projects\OpenSC -exclude vc*.pdb *.pdb | % {
|
||||||
Get-ChildItem -recurse c:\projects\OpenSC -exclude vc*.pdb *.pdb | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
|
7z a -tzip ${env:ARTIFACT}-Debug.zip $_.FullName
|
||||||
}
|
}
|
||||||
|
- appveyor PushArtifact %ARTIFACT%-Debug.zip
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
- C:\zlib -> appveyor.yml
|
- C:\zlib -> appveyor.yml
|
||||||
|
|
|
@ -44,6 +44,7 @@ static struct sc_atr_table tcos_atrs[] = {
|
||||||
{ "3B:BA:96:00:81:31:86:5D:00:64:05:7B:02:03:31:80:90:00:7D", NULL, NULL, SC_CARD_TYPE_TCOS_V2, 0, NULL },
|
{ "3B:BA:96:00:81:31:86:5D:00:64:05:7B:02:03:31:80:90:00:7D", NULL, NULL, SC_CARD_TYPE_TCOS_V2, 0, NULL },
|
||||||
/* Philips P5CT072 */
|
/* Philips P5CT072 */
|
||||||
{ "3B:BF:96:00:81:31:FE:5D:00:64:04:11:03:01:31:C0:73:F7:01:D0:00:90:00:7D", NULL, NULL, SC_CARD_TYPE_TCOS_V3, 0, NULL },
|
{ "3B:BF:96:00:81:31:FE:5D:00:64:04:11:03:01:31:C0:73:F7:01:D0:00:90:00:7D", NULL, NULL, SC_CARD_TYPE_TCOS_V3, 0, NULL },
|
||||||
|
{ "3B:BF:96:00:81:31:FE:5D:00:64:04:11:04:0F:31:C0:73:F7:01:D0:00:90:00:74", NULL, NULL, SC_CARD_TYPE_TCOS_V3, 0, NULL },
|
||||||
/* Philips P5CT080 */
|
/* Philips P5CT080 */
|
||||||
{ "3B:BF:B6:00:81:31:FE:5D:00:64:04:28:03:02:31:C0:73:F7:01:D0:00:90:00:67", NULL, NULL, SC_CARD_TYPE_TCOS_V3, 0, NULL },
|
{ "3B:BF:B6:00:81:31:FE:5D:00:64:04:28:03:02:31:C0:73:F7:01:D0:00:90:00:67", NULL, NULL, SC_CARD_TYPE_TCOS_V3, 0, NULL },
|
||||||
{ NULL, NULL, NULL, 0, 0, NULL }
|
{ NULL, NULL, NULL, 0, 0, NULL }
|
||||||
|
|
|
@ -84,7 +84,9 @@ static void sc_do_log_va(sc_context_t *ctx, int level, const char *file, int lin
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
GetLocalTime(&st);
|
GetLocalTime(&st);
|
||||||
r = snprintf(p, left,
|
r = snprintf(p, left,
|
||||||
"%i-%02i-%02i %02i:%02i:%02i.%03i ",
|
"P:%lu; T:%lu %i-%02i-%02i %02i:%02i:%02i.%03i ",
|
||||||
|
(unsigned long)GetCurrentProcessId(),
|
||||||
|
(unsigned long)GetCurrentThreadId(),
|
||||||
st.wYear, st.wMonth, st.wDay,
|
st.wYear, st.wMonth, st.wDay,
|
||||||
st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
|
st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -864,14 +864,18 @@ int main(int argc, char *argv[])
|
||||||
b = malloc(file->size);
|
b = malloc(file->size);
|
||||||
if(b == NULL)
|
if(b == NULL)
|
||||||
{
|
{
|
||||||
printf("Not enougth memory.\n");
|
printf("Not enougth memory.\n");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(b, 0, file->size);
|
memset(b, 0, file->size);
|
||||||
|
|
||||||
fp = fopen(put_filename, "rb");
|
fp = fopen(put_filename, "rb");
|
||||||
fread(b, 1, file->size, fp);
|
if (fp == NULL || file->size != fread(b, 1, file->size, fp))
|
||||||
|
{
|
||||||
|
printf("could not read %s.\n", put_filename);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
||||||
r = sc_update_binary(card, 0, b, file->size, 0);
|
r = sc_update_binary(card, 0, b, file->size, 0);
|
||||||
|
|
|
@ -139,8 +139,8 @@ LINKDEBUGFLAGS = /NODEFAULTLIB:LIBCMT /DEBUG
|
||||||
CODE_OPTIMIZATION =
|
CODE_OPTIMIZATION =
|
||||||
COPTS = /GS /W3 /WX /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_WARNINGS /MTd /nologo /DHAVE_CONFIG_H $(ALL_INCLUDES) /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DWIN32_LEAN_AND_MEAN $(OPENPACE_DEF) $(OPENSSL_DEF) $(ZLIB_DEF) $(MINIDRIVER_DEF) $(SM_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\"" /DDEBUG /Zi /Od
|
COPTS = /GS /W3 /WX /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_WARNINGS /MTd /nologo /DHAVE_CONFIG_H $(ALL_INCLUDES) /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DWIN32_LEAN_AND_MEAN $(OPENPACE_DEF) $(OPENSSL_DEF) $(ZLIB_DEF) $(MINIDRIVER_DEF) $(SM_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\"" /DDEBUG /Zi /Od
|
||||||
!ELSE
|
!ELSE
|
||||||
LINKDEBUGFLAGS = /NODEFAULTLIB:LIBCMTD
|
LINKDEBUGFLAGS = /NODEFAULTLIB:LIBCMTD /DEBUG /OPT:REF /OPT:ICF
|
||||||
COPTS = /GS /W3 /WX /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_WARNINGS /MT /nologo /DHAVE_CONFIG_H $(ALL_INCLUDES) /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DWIN32_LEAN_AND_MEAN $(OPENPACE_DEF) $(OPENSSL_DEF) $(ZLIB_DEF) $(MINIDRIVER_DEF) $(SM_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\""
|
COPTS = /GS /W3 /WX /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_WARNINGS /MT /nologo /DHAVE_CONFIG_H $(ALL_INCLUDES) /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DWIN32_LEAN_AND_MEAN $(OPENPACE_DEF) $(OPENSSL_DEF) $(ZLIB_DEF) $(MINIDRIVER_DEF) $(SM_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\"" /Zi
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue