[WINDOWS] Remove tool specific file description support resource file
The implementation was based on the previous MSC build, each tool had its own description in version resource. This change sets a single version resource to all files, and produces much simpler build. git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3980 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
596b8c3c03
commit
a6f9f023a0
|
@ -702,7 +702,7 @@ AC_CONFIG_FILES([
|
|||
src/tests/regression/Makefile
|
||||
src/tools/Makefile
|
||||
win32/Makefile
|
||||
win32/versioninfo.rc.in
|
||||
win32/versioninfo.rc
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
include $(top_srcdir)/win32/ltrc.inc
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
$(srcdir)/Makefile.in $(srcdir)/versioninfo.rc
|
||||
CLEANFILES = versioninfo.rc
|
||||
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
|
||||
|
||||
EXTRA_DIST = Makefile.mak
|
||||
|
||||
|
@ -50,9 +48,7 @@ libopensc_la_SOURCES = \
|
|||
compression.c p15card-helper.c \
|
||||
libopensc.exports
|
||||
if WIN32
|
||||
libopensc_la_SOURCES += versioninfo.rc
|
||||
else
|
||||
dist_noinst_DATA = versioninfo.rc
|
||||
libopensc_la_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
endif
|
||||
libopensc_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(OPTIONAL_OPENCT_LIBS) \
|
||||
$(OPTIONAL_ZLIB_LIBS) $(OPTIONAL_ICONV_LIBS) $(LTLIB_LIBS) \
|
||||
|
@ -67,10 +63,6 @@ libopensc_la_LDFLAGS = $(AM_LDFLAGS) \
|
|||
-export-symbols "$(srcdir)/libopensc.exports" \
|
||||
-no-undefined
|
||||
|
||||
versioninfo.rc:
|
||||
sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \
|
||||
"$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc
|
||||
|
||||
if WIN32
|
||||
# def file required for MS users to build library
|
||||
mylibdir=$(libdir)
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
include $(top_srcdir)/win32/ltrc.inc
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
$(srcdir)/Makefile.in $(srcdir)/versioninfo.rc
|
||||
CLEANFILES = versioninfo.rc
|
||||
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
|
||||
EXTRA_DIST = Makefile.mak
|
||||
|
||||
dist_noinst_SCRIPTS = opensc_pkcs11_install.js
|
||||
|
@ -43,11 +41,9 @@ pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
|
|||
-module -shared -avoid-version -no-undefined
|
||||
|
||||
if WIN32
|
||||
opensc_pkcs11_la_SOURCES += versioninfo.rc
|
||||
onepin_opensc_pkcs11_la_SOURCES += versioninfo.rc
|
||||
pkcs11_spy_la_SOURCES += versioninfo.rc
|
||||
else
|
||||
dist_noinst_DATA = versioninfo.rc
|
||||
opensc_pkcs11_la_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
onepin_opensc_pkcs11_la_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
pkcs11_spy_la_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
endif
|
||||
|
||||
jar-dir:
|
||||
|
@ -79,7 +75,3 @@ install-exec-hook: install-pkcs11DATA
|
|||
done
|
||||
|
||||
endif
|
||||
|
||||
versioninfo.rc:
|
||||
sed 's/@@FILE_DESCRIPTION@@/OpenSC PKCS#11 Provider/g' \
|
||||
"$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
include $(top_srcdir)/win32/ltrc.inc
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
$(srcdir)/Makefile.in $(srcdir)/versioninfo.rc
|
||||
CLEANFILES = versioninfo.rc
|
||||
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
|
||||
EXTRA_DIST = Makefile.mak
|
||||
|
||||
noinst_LTLIBRARIES = libpkcs15init.la
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
include $(top_srcdir)/win32/ltrc.inc
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
$(srcdir)/Makefile.in $(srcdir)/versioninfo.rc
|
||||
CLEANFILES = versioninfo.rc
|
||||
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
|
||||
EXTRA_DIST = Makefile.mak
|
||||
|
||||
SUBDIRS = regression
|
||||
|
@ -22,15 +20,9 @@ pintest_SOURCES = pintest.c print.c $(COMMON_SRC) $(COMMON_INC)
|
|||
prngtest_SOURCES = prngtest.c $(COMMON_SRC) $(COMMON_INC)
|
||||
|
||||
if WIN32
|
||||
base64_SOURCES += versioninfo.rc
|
||||
lottery_SOURCES += versioninfo.rc
|
||||
p15dump_SOURCES += versioninfo.rc
|
||||
pintest_SOURCES += versioninfo.rc
|
||||
prngtest_SOURCES += versioninfo.rc
|
||||
else
|
||||
dist_noinst_DATA = versioninfo.rc
|
||||
base64_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
lottery_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
p15dump_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
pintest_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
prngtest_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
endif
|
||||
|
||||
versioninfo.rc:
|
||||
sed 's/@@FILE_DESCRIPTION@@/OpenSC Test Program/g' \
|
||||
"$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
include $(top_srcdir)/win32/ltrc.inc
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
$(srcdir)/Makefile.in $(srcdir)/versioninfo.rc
|
||||
CLEANFILES = versioninfo.rc
|
||||
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
|
||||
EXTRA_DIST = Makefile.mak
|
||||
|
||||
noinst_HEADERS = util.h
|
||||
|
@ -48,23 +46,17 @@ westcos_tool_SOURCES = westcos-tool.c
|
|||
westcos_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
|
||||
|
||||
if WIN32
|
||||
opensc_tool_SOURCES += versioninfo.rc
|
||||
piv_tool_SOURCES += versioninfo.rc
|
||||
opensc_explorer_SOURCES += versioninfo.rc
|
||||
pkcs15_tool_SOURCES += versioninfo.rc
|
||||
pkcs11_tool_SOURCES += versioninfo.rc
|
||||
pkcs15_crypt_SOURCES += versioninfo.rc
|
||||
cryptoflex_tool_SOURCES += versioninfo.rc
|
||||
pkcs15_init_SOURCES += versioninfo.rc
|
||||
cardos_tool_SOURCES += versioninfo.rc
|
||||
eidenv_SOURCES += versioninfo.rc
|
||||
netkey_tool_SOURCES += versioninfo.rc
|
||||
rutoken_tool_SOURCES += versioninfo.rc
|
||||
westcos_tool_SOURCES += versioninfo.rc
|
||||
else
|
||||
dist_noinst_DATA = versioninfo.rc
|
||||
opensc_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
piv_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
opensc_explorer_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
pkcs15_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
pkcs11_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
pkcs15_crypt_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
cryptoflex_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
pkcs15_init_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
cardos_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
eidenv_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
netkey_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
rutoken_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
westcos_tool_SOURCES += $(top_builddir)/win32/versioninfo.rc
|
||||
endif
|
||||
|
||||
versioninfo.rc:
|
||||
sed 's/@@FILE_DESCRIPTION@@/OpenSC Utility/g' \
|
||||
"$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
/* This file is processed by configure to create versioninfo.rc */
|
||||
/* Every component changes @@FILE_DESCRIPTION@@ to local string */
|
||||
|
||||
#include <winresrc.h>
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
|
@ -22,7 +19,6 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "Comments", "Provided under the terms of the GNU General Public License (LGPLv2.1+).\0"
|
||||
VALUE "CompanyName", "OpenSC Project\0"
|
||||
VALUE "FileDescription", "@@FILE_DESCRIPTION@@\0"
|
||||
VALUE "FileVersion", "@OPENSC_LT_CURRENT@.@OPENSC_LT_AGE@.@OPENSC_LT_REVISION@.0\0"
|
||||
VALUE "InternalName", "@PACKAGE_NAME@\0"
|
||||
VALUE "LegalCopyright", "OpenSC Project\0"
|
Loading…
Reference in New Issue