giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

win32: build: 'version-info' resource for each target

This commit is contained in:
Viktor Tarasov 2013-12-29 19:20:59 +01:00
parent b928e814e5
commit 53ed5dc502
14 changed files with 187 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -638,13 +638,17 @@ AC_CONFIG_FILES([
src/libopensc/libopensc.pc src/libopensc/libopensc.pc
src/libsm/Makefile src/libsm/Makefile
src/pkcs11/Makefile src/pkcs11/Makefile
src/pkcs11/versioninfo-pkcs11.rc
src/pkcs11/versioninfo-pkcs11-spy.rc
src/pkcs15init/Makefile src/pkcs15init/Makefile
src/scconf/Makefile src/scconf/Makefile
src/tests/Makefile src/tests/Makefile
src/tests/regression/Makefile src/tests/regression/Makefile
src/tools/Makefile src/tools/Makefile
src/tools/versioninfo-tools.rc
src/smm/Makefile src/smm/Makefile
src/minidriver/Makefile src/minidriver/Makefile
src/minidriver/versioninfo-minidriver.rc
src/minidriver/opensc-minidriver.inf src/minidriver/opensc-minidriver.inf
win32/Makefile win32/Makefile
win32/versioninfo.rc win32/versioninfo.rc

7
src/minidriver/Makefile.am
View File

@ -1,7 +1,7 @@
include $(top_srcdir)/win32/ltrc.inc include $(top_srcdir)/win32/ltrc.inc
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo-minidriver.rc
EXTRA_DIST = Makefile.mak EXTRA_DIST = Makefile.mak versioninfo-minidriver.rc.in
if ENABLE_MINIDRIVER if ENABLE_MINIDRIVER
lib_LTLIBRARIES = opensc-minidriver@LIBRARY_BITNESS@.la lib_LTLIBRARIES = opensc-minidriver@LIBRARY_BITNESS@.la
@ -14,8 +14,7 @@ endif
AM_CPPFLAGS = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
opensc_minidriver@LIBRARY_BITNESS@_la_SOURCES = minidriver.c minidriver.exports \ opensc_minidriver@LIBRARY_BITNESS@_la_SOURCES = minidriver.c minidriver.exports versioninfo-minidriver.rc
$(top_builddir)/win32/versioninfo.rc
opensc_minidriver@LIBRARY_BITNESS@_la_LIBADD = \ opensc_minidriver@LIBRARY_BITNESS@_la_LIBADD = \
$(top_builddir)/src/libopensc/libopensc.la \ $(top_builddir)/src/libopensc/libopensc.la \
-lcrypt32 -lcrypt32

4
src/minidriver/Makefile.mak
View File

@ -1,11 +1,11 @@
TOPDIR = ..\.. TOPDIR = ..\..
TARGET = opensc-minidriver.dll TARGET = opensc-minidriver.dll
OBJECTS = minidriver.obj OBJECTS = minidriver.obj versioninfo-minidriver.res
!INCLUDE $(TOPDIR)\win32\Make.rules.mak !INCLUDE $(TOPDIR)\win32\Make.rules.mak
all: $(TARGET) all: versioninfo-minidriver.res $(TARGET)
$(TARGET): $(OBJECTS) ..\libopensc\opensc_a.lib ..\pkcs15init\pkcs15init.lib $(TARGET): $(OBJECTS) ..\libopensc\opensc_a.lib ..\pkcs15init\pkcs15init.lib
echo LIBRARY $* > $*.def echo LIBRARY $* > $*.def

33
src/minidriver/versioninfo-minidriver.rc.in Normal file
View File

@ -0,0 +1,33 @@
#include <winresrc.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x21L
#else
FILEFLAGS 0x20L
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License (LGPLv2.1+)."
VALUE "CompanyName", "OpenSC Project"
VALUE "FileVersion", "@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@.@OPENSC_VERSION_REVISION@"
VALUE "InternalName", "@PACKAGE_NAME@"
VALUE "LegalCopyright", "OpenSC Project"
VALUE "LegalTrademarks", ""
VALUE "PrivateBuild", ""
VALUE "ProductName", "OpenSC minidriver"
VALUE "ProductVersion", "@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@"
VALUE "SpecialBuild", ""
END
END
END

8
src/pkcs11/Makefile.am
View File

@ -1,7 +1,7 @@
include $(top_srcdir)/win32/ltrc.inc include $(top_srcdir)/win32/ltrc.inc
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo-pkcs11.rc $(srcdir)/versioninfo-pkcs11-spy.rc
EXTRA_DIST = Makefile.mak EXTRA_DIST = Makefile.mak versioninfo-pkcs11.rc.in versioninfo-pkcs11-spy.rc.in
dist_noinst_SCRIPTS = opensc_pkcs11_install.js dist_noinst_SCRIPTS = opensc_pkcs11_install.js
lib_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la lib_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la
@ -36,8 +36,8 @@ pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
-module -shared -avoid-version -no-undefined -module -shared -avoid-version -no-undefined
if WIN32 if WIN32
opensc_pkcs11_la_SOURCES += $(top_builddir)/win32/versioninfo.rc opensc_pkcs11_la_SOURCES += versioninfo-pkcs11.rc
pkcs11_spy_la_SOURCES += $(top_builddir)/win32/versioninfo.rc pkcs11_spy_la_SOURCES += versioninfo-pkcs11-spy.rc
endif endif
jar-dir: jar-dir:

10
src/pkcs11/Makefile.mak
View File

@ -4,13 +4,11 @@ TARGET1 = opensc-pkcs11.dll
TARGET3 = pkcs11-spy.dll TARGET3 = pkcs11-spy.dll
OBJECTS = pkcs11-global.obj pkcs11-session.obj pkcs11-object.obj misc.obj slot.obj \ OBJECTS = pkcs11-global.obj pkcs11-session.obj pkcs11-object.obj misc.obj slot.obj \
mechanism.obj openssl.obj framework-pkcs15.obj \ mechanism.obj openssl.obj framework-pkcs15.obj framework-pkcs15init.obj \
framework-pkcs15init.obj debug.obj pkcs11-display.obj \ debug.obj pkcs11-display.obj versioninfo-pkcs11.res
$(TOPDIR)\win32\versioninfo.res OBJECTS3 = pkcs11-spy.obj pkcs11-display.obj versioninfo-pkcs11-spy.res
OBJECTS3 = pkcs11-spy.obj pkcs11-display.obj \
$(TOPDIR)\win32\versioninfo.res
all: $(TOPDIR)\win32\versioninfo.res $(TARGET1) $(TARGET3) all: versioninfo-pkcs11.res $(TARGET1) $(TARGET3) versioninfo-pkcs11-spy.res
!INCLUDE $(TOPDIR)\win32\Make.rules.mak !INCLUDE $(TOPDIR)\win32\Make.rules.mak

33
src/pkcs11/versioninfo-pkcs11-spy.rc.in Normal file
View File

@ -0,0 +1,33 @@
#include <winresrc.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x21L
#else
FILEFLAGS 0x20L
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License (LGPLv2.1+)."
VALUE "CompanyName", "OpenSC Project"
VALUE "FileVersion", "@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@.@OPENSC_VERSION_REVISION@"
VALUE "InternalName", "@PACKAGE_NAME@"
VALUE "LegalCopyright", "OpenSC Project"
VALUE "LegalTrademarks", ""
VALUE "PrivateBuild", ""
VALUE "ProductName", "OpenSC PKCS#11 spy"
VALUE "ProductVersion", "@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@"
VALUE "SpecialBuild", ""
END
END
END

33
src/pkcs11/versioninfo-pkcs11.rc.in Normal file
View File

@ -0,0 +1,33 @@
#include <winresrc.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x21L
#else
FILEFLAGS 0x20L
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License (LGPLv2.1+)."
VALUE "CompanyName", "OpenSC Project"
VALUE "FileVersion", "@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@.@OPENSC_VERSION_REVISION@"
VALUE "InternalName", "@PACKAGE_NAME@"
VALUE "LegalCopyright", "OpenSC Project"
VALUE "LegalTrademarks", ""
VALUE "PrivateBuild", ""
VALUE "ProductName", "OpenSC PKCS#11 module"
VALUE "ProductVersion", "@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@"
VALUE "SpecialBuild", ""
END
END
END

3
src/smm/sm-common.exports Normal file
View File

@ -0,0 +1,3 @@
sm_cwa_get_mac
sm_cwa_securize_apdu

35
src/tools/Makefile.am
View File

@ -1,7 +1,7 @@
include $(top_srcdir)/win32/ltrc.inc include $(top_srcdir)/win32/ltrc.inc
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo-tools.rc
EXTRA_DIST = Makefile.mak EXTRA_DIST = Makefile.mak versioninfo-tools.rc.in
noinst_HEADERS = util.h noinst_HEADERS = util.h
bin_PROGRAMS = opensc-tool opensc-explorer pkcs15-tool pkcs15-crypt \ bin_PROGRAMS = opensc-tool opensc-explorer pkcs15-tool pkcs15-crypt \
@ -53,20 +53,19 @@ dnie_tool_SOURCES = dnie-tool.c util.c
dnie_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS) dnie_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
if WIN32 if WIN32
opensc_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc opensc_tool_SOURCES += versioninfo-tools.rc
piv_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc piv_tool_SOURCES += versioninfo-tools.rc
opensc_explorer_SOURCES += $(top_builddir)/win32/versioninfo.rc opensc_explorer_SOURCES += versioninfo-tools.rc
pkcs15_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc pkcs15_tool_SOURCES += versioninfo-tools.rc
pkcs11_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc pkcs11_tool_SOURCES += versioninfo-tools.rc
pkcs15_crypt_SOURCES += $(top_builddir)/win32/versioninfo.rc pkcs15_crypt_SOURCES += versioninfo-tools.rc
cryptoflex_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc cryptoflex_tool_SOURCES += versioninfo-tools.rc
pkcs15_init_SOURCES += $(top_builddir)/win32/versioninfo.rc pkcs15_init_SOURCES += versioninfo-tools.rc
cardos_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc cardos_tool_SOURCES += versioninfo-tools.rc
eidenv_SOURCES += $(top_builddir)/win32/versioninfo.rc eidenv_SOURCES += versioninfo-tools.rc
netkey_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc netkey_tool_SOURCES += versioninfo-tools.rc
westcos_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc westcos_tool_SOURCES += versioninfo-tools.rc
openpgp_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc openpgp_tool_SOURCES += versioninfo-tools.rc
iasecc_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc iasecc_tool_SOURCES += versioninfo-tools.rc
sc_hsm_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc sc_hsm_tool_SOURCES += versioninfo-tools.rc
sc_hsm_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc
endif endif

9
src/tools/Makefile.mak
View File

@ -6,7 +6,7 @@ TARGETS = opensc-tool.exe opensc-explorer.exe pkcs15-tool.exe pkcs15-crypt.exe \
pkcs11-tool.exe cardos-tool.exe eidenv.exe sc-hsm-tool.exe openpgp-tool.exe dnie-tool.exe \ pkcs11-tool.exe cardos-tool.exe eidenv.exe sc-hsm-tool.exe openpgp-tool.exe dnie-tool.exe \
$(PROGRAMS_OPENSSL) $(PROGRAMS_OPENSSL)
$(TARGETS): $(TOPDIR)\win32\versioninfo.res util.obj $(TARGETS): versioninfo-tools.res util.obj
all: $(TARGETS) all: $(TARGETS)
@ -15,8 +15,7 @@ all: $(TARGETS)
.c.exe: .c.exe:
cl $(COPTS) /c $< cl $(COPTS) /c $<
link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj util.obj \ link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj util.obj ..\common\common.lib \
..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \ ..\scconf\scconf.lib ..\libopensc\opensc.lib ..\pkcs15init\pkcs15init.lib \
..\pkcs15init\pkcs15init.lib ..\common\libpkcs11.lib ..\common\libscdl.lib \ ..\common\libpkcs11.lib ..\common\libscdl.lib versioninfo-tools.res $(OPENSSL_LIB) gdi32.lib
$(TOPDIR)\win32\versioninfo.res $(OPENSSL_LIB) gdi32.lib
if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1 if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1

33
src/tools/versioninfo-tools.rc.in Normal file
View File

@ -0,0 +1,33 @@
#include <winresrc.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x21L
#else
FILEFLAGS 0x20L
#endif
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License (LGPLv2.1+)."
VALUE "CompanyName", "OpenSC Project"
VALUE "FileVersion", "@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@.@OPENSC_VERSION_REVISION@"
VALUE "InternalName", "@PACKAGE_NAME@"
VALUE "LegalCopyright", "OpenSC Project"
VALUE "LegalTrademarks", ""
VALUE "PrivateBuild", ""
VALUE "ProductName", "OpenSC command line tools"
VALUE "ProductVersion", "@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@"
VALUE "SpecialBuild", ""
END
END
END

2
win32/Make.rules.mak
View File

@ -95,4 +95,4 @@ CANDLEFLAGS = -dPlatform=x86
rc /l 0x0409 $< rc /l 0x0409 $<
clean:: clean::
del /Q *.obj *.dll *.exe *.pdb *.lib *.def *.manifest del /Q *.obj *.dll *.exe *.pdb *.lib *.def *.manifest *.res

26
win32/versioninfo.rc.in
View File

@ -1,8 +1,8 @@
#include <winresrc.h> #include <winresrc.h>
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,0 FILEVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,0 PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x21L FILEFLAGS 0x21L
@ -10,23 +10,23 @@ VS_VERSION_INFO VERSIONINFO
FILEFLAGS 0x20L FILEFLAGS 0x20L
#endif #endif
FILEOS 0x40004L FILEOS 0x40004L
FILETYPE 0x1L FILETYPE 0x2L
FILESUBTYPE 0x0L FILESUBTYPE 0x0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License (LGPLv2.1+).\0" VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License (LGPLv2.1+)."
VALUE "CompanyName", "OpenSC Project\0" VALUE "CompanyName", "OpenSC Project"
VALUE "FileVersion", "@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@.0\0" VALUE "FileVersion", "@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@.@OPENSC_VERSION_REVISION@"
VALUE "InternalName", "@PACKAGE_NAME@\0" VALUE "InternalName", "@PACKAGE_NAME@"
VALUE "LegalCopyright", "OpenSC Project\0" VALUE "LegalCopyright", "OpenSC Project"
VALUE "LegalTrademarks", "\0" VALUE "LegalTrademarks", ""
VALUE "PrivateBuild", "\0" VALUE "PrivateBuild", ""
VALUE "ProductName", "OpenSC\0" VALUE "ProductName", "OpenSC"
VALUE "ProductVersion", "@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,0\0" VALUE "ProductVersion", "@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@"
VALUE "SpecialBuild", "\0" VALUE "SpecialBuild", ""
END END
END END
END END