Distribute autoconf generated files for MSVC build

Construct resource files and winconfig.h using autoconf substitutions. git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3468 c6295689-39f2-0310-b995-f0e70906c6a9
2008-04-08 18:36:42 +00:00 · 2008-04-08 18:36:42 +00:00 · d84077749b
parent 9dff29af2d
commit d84077749b
19 changed files with 52 additions and 110 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -22,15 +22,3 @@ dist_doc_DATA = NEWS
 # Allow detection of packaged tarball
 dist-hook:
 	echo > "$(distdir)/packaged"
-
-distcheck-hook:
-	@eval $$(sed -e '/^PACKAGE_VERSION=/!d' -e 's/-svn//' -e 's,^,configure_,' "$(srcdir)/configure"); \
-	eval $$(sed -e '/^ \(FILE\|PRODUCT\)VERSION /!d' -e 's,^ ,version_rc_,' -e 's, ,=,' -e 's/,/./g' "$(srcdir)/win32/version.rc"); \
-	eval $$(sed -e '/^#define VERSION /!d' -e 's,^#define ,winconfig_h_,' -e 's, ,=,' "$(srcdir)/src/include/winconfig.h"); \
-	err=$$( \
-		test "$${configure_PACKAGE_VERSION}.0" = "$${version_rc_FILEVERSION}" || echo "configure PACKAGE_VERSION $${configure_PACKAGE_VERSION} != win32/version.rc FILEVERSION $${version_rc_FILEVERSION}"; \
-		test "$${configure_PACKAGE_VERSION}.0" = "$${version_rc_PRODUCTVERSION}" || echo "configure PACKAGE_VERSION $${configure_PACKAGE_VERSION} != win32/version.rc PRODUCTVERSION $${version_rc_PRODUCTVERSION}"; \
-		test "$${configure_PACKAGE_VERSION}" = "$${winconfig_h_VERSION}" || echo "configure PACKAGE_VERSION $${configure_PACKAGE_VERSION} != src/include/winconfig.h VERSION $${winconfig_h_VERSION}"; \
-	); \
-	echo "$${err}"; \
-	test -z "$${err}"
--- a/Makefile.mak
+++ b/Makefile.mak
@ -1,5 +1,5 @@

-SUBDIRS = win32 src
+SUBDIRS = src

 all::

--- a/configure.ac
+++ b/configure.ac
@ -602,6 +602,7 @@ AC_OUTPUT([
 	src/Makefile
 	src/common/Makefile
 	src/include/Makefile
+	src/include/winconfig.h
 	src/include/opensc/Makefile
 	src/libopensc/Makefile
 	src/libopensc/opensc-config
@ -618,7 +619,7 @@ AC_OUTPUT([
 	src/tests/regression/Makefile
 	src/tools/Makefile
 	win32/Makefile
-	win32/versioninfo.rc
+	win32/versioninfo.rc.in
 ])

 cat <<EOF
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@ -1,4 +1,6 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-EXTRA_DIST = Makefile.mak winconfig.h
+EXTRA_DIST = Makefile.mak

 SUBDIRS = opensc
+
+dist_noinst_HEADERS = winconfig.h
--- a/src/include/winconfig.h.in
+++ b/src/include/winconfig.h.in
@ -81,11 +81,11 @@
 #define PATH_MAX _MAX_PATH

 #ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "0.11.4.2"
+#define PACKAGE_VERSION "@PACKAGE_VERSION@"
 #endif

 #ifndef PACKAGE_NAME
-#define PACKAGE_NAME "opensc"
+#define PACKAGE_NAME "@PACKAGE_NAME@"
 #endif

 #ifndef OPENSC_FEATURES
--- a/src/libopensc/Makefile.am
+++ b/src/libopensc/Makefile.am
@ -47,7 +47,9 @@ libopensc_la_SOURCES = \
 	\
 	libopensc.exports
 if WIN32
-nodist_libopensc_la_SOURCES = versioninfo.rc
+libopensc_la_SOURCES += versioninfo.rc
+else
+dist_noinst_DATA = versioninfo.rc
 endif
 libopensc_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(OPTIONAL_OPENCT_LIBS) \
 	$(OPTIONAL_ZLIB_LIBS) $(LTLIB_LIBS) \
@ -63,7 +65,7 @@ libopensc_la_LDFLAGS = $(AM_LDFLAGS) \

 versioninfo.rc:
 	sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \
-		"$(top_builddir)/win32/versioninfo.rc" > versioninfo.rc
+		"$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc

 if WIN32
 # def file required for MS users to build library
--- a/src/libopensc/Makefile.mak
+++ b/src/libopensc/Makefile.mak
@ -34,7 +34,7 @@ OBJECTS			= \
 	pkcs15-actalis.obj pkcs15-atrust-acos.obj pkcs15-tccardos.obj pkcs15-piv.obj \
 	pkcs15-rutoken.obj pkcs15-prkey-rutoken.obj \
 	compression.obj p15card-helper.obj \
-	$(TOPDIR)\win32\version.res
+	versioninfo.res

 all: install-headers $(TARGET)

--- a/src/pkcs11/Makefile.am
+++ b/src/pkcs11/Makefile.am
@ -24,18 +24,12 @@ OPENSC_PKCS11_LIBS = $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) \
 libpkcs11_la_SOURCES = libpkcs11.c

 opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) hack-disabled.c
-if WIN32
-nodist_opensc_pkcs11_la_SOURCES = versioninfo.rc
-endif
 opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
 opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \
 	-export-symbols "$(srcdir)/opensc-pkcs11.exports" \
 	-module -avoid-version -no-undefined

 onepin_opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) hack-enabled.c
-if WIN32
-nodist_onepin_opensc_pkcs11_la_SOURCES = versioninfo.rc
-endif
 onepin_opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
 onepin_opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \
 	-export-symbols "$(srcdir)/opensc-pkcs11.exports" \
@ -43,14 +37,19 @@ onepin_opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \


 pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h pkcs11-spy.exports
-if WIN32
-nodist_pkcs11_spy_la_SOURCES = versioninfo.rc
-endif
 pkcs11_spy_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) libpkcs11.la
 pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
 	-export-symbols "$(srcdir)/pkcs11-spy.exports" \
 	-module -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
+endif
+
 jar-dir:
 	if test ! -d jar-dir ; then mkdir jar-dir ; fi

@ -83,4 +82,4 @@ endif

 versioninfo.rc:
 	sed 's/@@FILE_DESCRIPTION@@/OpenSC PKCS#11 Provider/g' \
-		"$(top_builddir)/win32/versioninfo.rc" > versioninfo.rc
+		"$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc
--- a/src/pkcs11/Makefile.mak
+++ b/src/pkcs11/Makefile.mak
@ -12,7 +12,7 @@ TARGET3			= pkcs11-spy.dll
 OBJECTS			= pkcs11-global.obj pkcs11-session.obj pkcs11-object.obj misc.obj slot.obj \
 			  mechanism.obj openssl.obj secretkey.obj framework-pkcs15.obj \
 			  framework-pkcs15init.obj debug.obj \
-			  $(TOPDIR)\win32\version.res
+			  versioninfo.res
 OBJECTS2		= libpkcs11.obj
 OBJECTS3		= pkcs11-spy.obj pkcs11-display.obj libpkcs11.obj

--- a/src/pkcs15init/Makefile.am
+++ b/src/pkcs15init/Makefile.am
@ -35,7 +35,9 @@ libpkcs15init_la_SOURCES = \
 	pkcs15-muscle.c pkcs15-asepcos.c pkcs15-rutoken.c \
 	pkcs15init.exports
 if WIN32
-nodist_libpkcs15init_la_SOURCES = versioninfo.rc
+libpkcs15init_la_SOURCES += versioninfo.rc
+else
+dist_noinst_DATA = versioninfo.rc
 endif
 libpkcs15init_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) \
 	$(top_builddir)/src/libopensc/libopensc.la \
@ -48,7 +50,7 @@ libpkcs15init_la_LDFLAGS = $(AM_LDFLAGS) \

 versioninfo.rc:
 	sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \
-		"$(top_builddir)/win32/versioninfo.rc" > versioninfo.rc
+		"$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc

 if WIN32
 # def file required for MS users to build library
--- a/src/scconf/Makefile.am
+++ b/src/scconf/Makefile.am
@ -16,7 +16,9 @@ INCLUDES = -I$(top_srcdir)/src/common
 libscconf_la_SOURCES = scconf.c parse.c write.c sclex.c \
 	scconf.exports
 if WIN32
-nodist_libscconf_la_SOURCES = versioninfo.rc
+libscconf_la_SOURCES += versioninfo.rc
+else
+dist_noinst_DATA += versioninfo.rc
 endif
 libscconf_la_LIBADD = $(top_builddir)/src/common/libcompat.la
 libscconf_la_LDFLAGS = $(AM_LDFLAGS) \
@ -29,4 +31,4 @@ test_conf_LDADD = libscconf.la

 versioninfo.rc:
 	sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \
-		"$(top_builddir)/win32/versioninfo.rc" > versioninfo.rc
+		"$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc
--- a/src/tests/Makefile.mak
+++ b/src/tests/Makefile.mak
@ -14,6 +14,6 @@ all: print.obj sc-test.obj $(TARGETS)
 .c.exe:
 	cl $(COPTS) /c $<
        link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj sc-test.obj print.obj \
-        ..\common\common.lib ..\libopensc\opensc.lib $(TOPDIR)\win32\version.res
+        ..\common\common.lib ..\libopensc\opensc.lib versioninfo.res
 	if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1

--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@ -41,20 +41,22 @@ rutoken_tool_SOURCES = rutoken-tool.c util.c
 rutoken_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)

 if WIN32
-nodist_opensc_tool_SOURCES = versioninfo.rc
-nodist_piv_tool_SOURCES = versioninfo.rc
-nodist_opensc_explorer_SOURCES = versioninfo.rc
-nodist_pkcs15_tool_SOURCES = versioninfo.rc
-nodist_pkcs11_tool_SOURCES = versioninfo.rc
-nodist_pkcs15_crypt_SOURCES = versioninfo.rc
-nodist_cryptoflex_tool_SOURCES = versioninfo.rc
-nodist_pkcs15_init_SOURCES = versioninfo.rc
-nodist_cardos_info_SOURCES = versioninfo.rc
-nodist_eidenv_SOURCES = versioninfo.rc
-nodist_netkey_tool_SOURCES = versioninfo.rc
-nodist_rutoken_tool_SOURCES = versioninfo.rc
+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_info_SOURCES += versioninfo.rc
+eidenv_SOURCES += versioninfo.rc
+netkey_tool_SOURCES += versioninfo.rc
+rutoken_tool_SOURCES += versioninfo.rc
+else
+dist_noinst_DATA = versioninfo.rc
 endif

 versioninfo.rc:
 	sed 's/@@FILE_DESCRIPTION@@/OpenSC Utility/g' \
-		"$(top_builddir)/win32/versioninfo.rc" > versioninfo.rc
+		"$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc
--- a/src/tools/Makefile.mak
+++ b/src/tools/Makefile.mak
@ -17,7 +17,7 @@ all: util.obj $(TARGETS)
        link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj util.obj \
        ..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \
        ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \
-        $(TOPDIR)\win32\version.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
+        versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
 		if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1

 netkey-tool.exe: netkey-tool.c
@ -25,5 +25,5 @@ netkey-tool.exe: netkey-tool.c
        link $(LINKFLAGS) /pdb:netkey-tool.pdb /out:netkey-tool.exe netkey-tool.obj \
        ..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \
        ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \
-        $(TOPDIR)\win32\version.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
+        versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
 		if EXIST netkey-tool.exe.manifest mt -manifest netkey-tool.exe.manifest -outputresource:netkey-tool.exe;1
--- a/win32/Make.rules.mak
+++ b/win32/Make.rules.mak
@ -52,5 +52,8 @@ install-headers-dir:
 .c.obj::
 	cl $(COPTS) /c $<

+.rc.res::
+	rc /l 0x809 /r /fo"$*.res" $<
+
 clean::
 	del /Q *.obj *.dll *.exe *.pdb *.lib *.exp *.def
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@ -1,4 +1,2 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 EXTRA_DIST = Make.rules.mak Makefile.mak
-
-dist_noinst_DATA = version.rc versioninfo.rc
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@ -1,12 +0,0 @@
-TOPDIR = ..
-
-TARGET			= version.res
-
-VERSION_RC		= version.rc
-
-RSC_PROJ=/l 0x809 /r /fo"version.res"
-
-all: $(TARGET)
-
-$(TARGET): $(VERSION_RC)
-	rc $(RSC_PROJ) $(VERSION_RC)
--- a/win32/version.rc
+++ b/win32/version.rc
@ -1,45 +0,0 @@
-#ifdef APSTUDIO_INVOKED
-#define APSTUDIO_HIDDEN_SYMBOLS // Ignore following symbols
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0400   // default to Windows Version 4 (NT 4)
-#endif
-
-#include <winresrc.h>
-
-#ifdef APSTUDIO_INVOKED
-#undef APSTUDIO_HIDDEN_SYMBOLS
-#endif
-
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
-#pragma code_page(1252)
-#endif
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,11,4,0
- PRODUCTVERSION 0,11,4,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "080904b0"
-        BEGIN
-            VALUE "Description", "OpenSC PKCS#11 library\0"
-            VALUE "FileVersion", "0, 11, 4, 0\0"
-            VALUE "ProductVersion", "0, 11, 4, 0\0"
-            VALUE "Licence", "LGPL\0"
-            VALUE "Info", "http://www.opensc-project.org/\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x809, 1200
-    END
-END
--- a/win32/versioninfo.rc.in.in
+++ b/win32/versioninfo.rc.in.in