Changeset 3468

Show
Ignore:
Timestamp:
04/08/08 20:36:42 (6 months ago)
Author:
alonbl
Message:

Distribute autoconf generated files for MSVC build

Construct resource files and winconfig.h using autoconf
substitutions.

Location:
trunk
Files:
2 removed
15 modified
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.am

    r3454 r3468  
    2323dist-hook: 
    2424        echo > "$(distdir)/packaged" 
    25  
    26 distcheck-hook: 
    27         @eval $$(sed -e '/^PACKAGE_VERSION=/!d' -e 's/-svn//' -e 's,^,configure_,' "$(srcdir)/configure"); \ 
    28         eval $$(sed -e '/^ \(FILE\|PRODUCT\)VERSION /!d' -e 's,^ ,version_rc_,' -e 's, ,=,' -e 's/,/./g' "$(srcdir)/win32/version.rc"); \ 
    29         eval $$(sed -e '/^#define VERSION /!d' -e 's,^#define ,winconfig_h_,' -e 's, ,=,' "$(srcdir)/src/include/winconfig.h"); \ 
    30         err=$$( \ 
    31                 test "$${configure_PACKAGE_VERSION}.0" = "$${version_rc_FILEVERSION}" || echo "configure PACKAGE_VERSION $${configure_PACKAGE_VERSION} != win32/version.rc FILEVERSION $${version_rc_FILEVERSION}"; \ 
    32                 test "$${configure_PACKAGE_VERSION}.0" = "$${version_rc_PRODUCTVERSION}" || echo "configure PACKAGE_VERSION $${configure_PACKAGE_VERSION} != win32/version.rc PRODUCTVERSION $${version_rc_PRODUCTVERSION}"; \ 
    33                 test "$${configure_PACKAGE_VERSION}" = "$${winconfig_h_VERSION}" || echo "configure PACKAGE_VERSION $${configure_PACKAGE_VERSION} != src/include/winconfig.h VERSION $${winconfig_h_VERSION}"; \ 
    34         ); \ 
    35         echo "$${err}"; \ 
    36         test -z "$${err}" 

  • trunk/Makefile.mak

    r1437 r3468  
    11 
    2 SUBDIRS = win32 src 
     2SUBDIRS = src 
    33 
    44all:: 

  • trunk/configure.ac

    r3456 r3468  
    603603        src/common/Makefile 
    604604        src/include/Makefile 
     605        src/include/winconfig.h 
    605606        src/include/opensc/Makefile 
    606607        src/libopensc/Makefile 
    … …  
    619620        src/tools/Makefile 
    620621        win32/Makefile 
    621         win32/versioninfo.rc 
     622        win32/versioninfo.rc.in 
    622623]) 
    623624 

  • trunk/src/include/Makefile.am

    r3450 r3468  
    11MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    2 EXTRA_DIST = Makefile.mak winconfig.h 
     2EXTRA_DIST = Makefile.mak 
    33 
    44SUBDIRS = opensc 
     5 
     6dist_noinst_HEADERS = winconfig.h 

  • trunk/src/include/winconfig.h.in

    r3465 r3468  
    8282 
    8383#ifndef PACKAGE_VERSION 
    84 #define PACKAGE_VERSION "0.11.4.2" 
     84#define PACKAGE_VERSION "@PACKAGE_VERSION@" 
    8585#endif 
    8686 
    8787#ifndef PACKAGE_NAME 
    88 #define PACKAGE_NAME "opensc" 
     88#define PACKAGE_NAME "@PACKAGE_NAME@" 
    8989#endif 
    9090 

  • trunk/src/libopensc/Makefile.am

    r3462 r3468  
    4848        libopensc.exports 
    4949if WIN32 
    50 nodist_libopensc_la_SOURCES = versioninfo.rc 
     50libopensc_la_SOURCES += versioninfo.rc 
     51else 
     52dist_noinst_DATA = versioninfo.rc 
    5153endif 
    5254libopensc_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(OPTIONAL_OPENCT_LIBS) \ 
    … …  
    6466versioninfo.rc: 
    6567        sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \ 
    66                 "$(top_builddir)/win32/versioninfo.rc" > versioninfo.rc 
     68                "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc 
    6769 
    6870if WIN32 

  • trunk/src/libopensc/Makefile.mak

    r3464 r3468  
    3535        pkcs15-rutoken.obj pkcs15-prkey-rutoken.obj \ 
    3636        compression.obj p15card-helper.obj \ 
    37         $(TOPDIR)\win32\version.res 
     37        versioninfo.res 
    3838 
    3939all: install-headers $(TARGET) 

  • trunk/src/pkcs11/Makefile.am

    r3462 r3468  
    2525 
    2626opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) hack-disabled.c 
    27 if WIN32 
    28 nodist_opensc_pkcs11_la_SOURCES = versioninfo.rc 
    29 endif 
    3027opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS) 
    3128opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \ 
    … …  
    3431 
    3532onepin_opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) hack-enabled.c 
    36 if WIN32 
    37 nodist_onepin_opensc_pkcs11_la_SOURCES = versioninfo.rc 
    38 endif 
    3933onepin_opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS) 
    4034onepin_opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \ 
    … …  
    4438 
    4539pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h pkcs11-spy.exports 
    46 if WIN32 
    47 nodist_pkcs11_spy_la_SOURCES = versioninfo.rc 
    48 endif 
    4940pkcs11_spy_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) libpkcs11.la 
    5041pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \ 
    5142        -export-symbols "$(srcdir)/pkcs11-spy.exports" \ 
    5243        -module -avoid-version -no-undefined 
     44 
     45if WIN32 
     46opensc_pkcs11_la_SOURCES += versioninfo.rc 
     47onepin_opensc_pkcs11_la_SOURCES += versioninfo.rc 
     48pkcs11_spy_la_SOURCES += versioninfo.rc 
     49else 
     50dist_noinst_DATA = versioninfo.rc 
     51endif 
    5352 
    5453jar-dir: 
    … …  
    8483versioninfo.rc: 
    8584        sed 's/@@FILE_DESCRIPTION@@/OpenSC PKCS#11 Provider/g' \ 
    86                 "$(top_builddir)/win32/versioninfo.rc" > versioninfo.rc 
     85                "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc 

  • trunk/src/pkcs11/Makefile.mak

    r3466 r3468  
    1313                          mechanism.obj openssl.obj secretkey.obj framework-pkcs15.obj \ 
    1414                          framework-pkcs15init.obj debug.obj \ 
    15                           $(TOPDIR)\win32\version.res 
     15                          versioninfo.res 
    1616OBJECTS2                = libpkcs11.obj 
    1717OBJECTS3                = pkcs11-spy.obj pkcs11-display.obj libpkcs11.obj 

  • trunk/src/pkcs15init/Makefile.am

    r3462 r3468  
    3636        pkcs15init.exports 
    3737if WIN32 
    38 nodist_libpkcs15init_la_SOURCES = versioninfo.rc 
     38libpkcs15init_la_SOURCES += versioninfo.rc 
     39else 
     40dist_noinst_DATA = versioninfo.rc 
    3941endif 
    4042libpkcs15init_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) \ 
    … …  
    4951versioninfo.rc: 
    5052        sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \ 
    51                 "$(top_builddir)/win32/versioninfo.rc" > versioninfo.rc 
     53                "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc 
    5254 
    5355if WIN32 

  • trunk/src/scconf/Makefile.am

    r3462 r3468  
    1717        scconf.exports 
    1818if WIN32 
    19 nodist_libscconf_la_SOURCES = versioninfo.rc 
     19libscconf_la_SOURCES += versioninfo.rc 
     20else 
     21dist_noinst_DATA += versioninfo.rc 
    2022endif 
    2123libscconf_la_LIBADD = $(top_builddir)/src/common/libcompat.la 
    … …  
    3032versioninfo.rc: 
    3133        sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \ 
    32                 "$(top_builddir)/win32/versioninfo.rc" > versioninfo.rc 
     34                "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc 

  • trunk/src/tests/Makefile.mak

    r3005 r3468  
    1515        cl $(COPTS) /c $< 
    1616        link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj sc-test.obj print.obj \ 
    17         ..\common\common.lib ..\libopensc\opensc.lib $(TOPDIR)\win32\version.res 
     17        ..\common\common.lib ..\libopensc\opensc.lib versioninfo.res 
    1818        if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1 
    1919 

  • trunk/src/tools/Makefile.am

    r3450 r3468  
    4242 
    4343if WIN32 
    44 nodist_opensc_tool_SOURCES = versioninfo.rc 
    45 nodist_piv_tool_SOURCES = versioninfo.rc 
    46 nodist_opensc_explorer_SOURCES = versioninfo.rc 
    47 nodist_pkcs15_tool_SOURCES = versioninfo.rc 
    48 nodist_pkcs11_tool_SOURCES = versioninfo.rc 
    49 nodist_pkcs15_crypt_SOURCES = versioninfo.rc 
    50 nodist_cryptoflex_tool_SOURCES = versioninfo.rc 
    51 nodist_pkcs15_init_SOURCES = versioninfo.rc 
    52 nodist_cardos_info_SOURCES = versioninfo.rc 
    53 nodist_eidenv_SOURCES = versioninfo.rc 
    54 nodist_netkey_tool_SOURCES = versioninfo.rc 
    55 nodist_rutoken_tool_SOURCES = versioninfo.rc 
     44opensc_tool_SOURCES += versioninfo.rc 
     45piv_tool_SOURCES += versioninfo.rc 
     46opensc_explorer_SOURCES += versioninfo.rc 
     47pkcs15_tool_SOURCES += versioninfo.rc 
     48pkcs11_tool_SOURCES += versioninfo.rc 
     49pkcs15_crypt_SOURCES += versioninfo.rc 
     50cryptoflex_tool_SOURCES += versioninfo.rc 
     51pkcs15_init_SOURCES += versioninfo.rc 
     52cardos_info_SOURCES += versioninfo.rc 
     53eidenv_SOURCES += versioninfo.rc 
     54netkey_tool_SOURCES += versioninfo.rc 
     55rutoken_tool_SOURCES += versioninfo.rc 
     56else 
     57dist_noinst_DATA = versioninfo.rc 
    5658endif 
    5759 
    5860versioninfo.rc: 
    5961        sed 's/@@FILE_DESCRIPTION@@/OpenSC Utility/g' \ 
    60                 "$(top_builddir)/win32/versioninfo.rc" > versioninfo.rc 
     62                "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc 

  • trunk/src/tools/Makefile.mak

    r3464 r3468  
    1818        ..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \ 
    1919        ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \ 
    20         $(TOPDIR)\win32\version.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib 
     20        versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib 
    2121                if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1 
    2222 
    … …  
    2626        ..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \ 
    2727        ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \ 
    28         $(TOPDIR)\win32\version.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib 
     28        versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib 
    2929                if EXIST netkey-tool.exe.manifest mt -manifest netkey-tool.exe.manifest -outputresource:netkey-tool.exe;1 

  • trunk/win32/Make.rules.mak

    r3466 r3468  
    5353        cl $(COPTS) /c $< 
    5454 
     55.rc.res:: 
     56        rc /l 0x809 /r /fo"$*.res" $< 
     57 
    5558clean:: 
    5659        del /Q *.obj *.dll *.exe *.pdb *.lib *.exp *.def 

  • trunk/win32/Makefile.am

    r3464 r3468  
    11MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
    22EXTRA_DIST = Make.rules.mak Makefile.mak 
    3  
    4 dist_noinst_DATA = version.rc versioninfo.rc