Kouhei Sutou
null+****@clear*****
Wed Apr 6 23:18:16 JST 2016
Kouhei Sutou 2016-04-06 23:18:16 +0900 (Wed, 06 Apr 2016) New Revision: 64eb389300234cf626f0c8d2812718be6e46e516 https://github.com/groonga/groonga/commit/64eb389300234cf626f0c8d2812718be6e46e516 Message: windows: support DLL version Added files: lib/metadata.rc.in Removed files: lib/libgroonga.c Modified files: .gitignore configure.ac lib/Makefile.am Modified: .gitignore (+1 -0) =================================================================== --- .gitignore 2016-04-06 18:16:53 +0900 (ebd435c) +++ .gitignore 2016-04-06 23:18:16 +0900 (626bc2e) @@ -96,6 +96,7 @@ CMakeFiles /doc/sphinx/ /lib/icudump /lib/grn_ecmascript.out +/lib/metadata.rc /coverage /coverage.info /test/unit/lib/*-*.*.*/ Modified: configure.ac (+7 -3) =================================================================== --- configure.ac 2016-04-06 18:16:53 +0900 (9622eca) +++ configure.ac 2016-04-06 23:18:16 +0900 (c7d688a) @@ -4,6 +4,9 @@ AC_INIT([groonga], groonga_version, [groonga �� razil.jp]) AC_CONFIG_MACRO_DIR([m4]) AM_CONFIG_HEADER(config.h) +GRN_VERSION_RC=`echo groonga_version | sed -e 's/\./,/g'` +AC_SUBST(GRN_VERSION_RC) + AM_INIT_AUTOMAKE([foreign tar-pax subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -205,9 +208,9 @@ AC_SUBST(NO_STRICT_ALIASING_CFLAGS) AC_SUBST(NO_FLOAT_EQUAL_CFLAGS) AC_SUBST(NO_BAD_FUNCTION_CAST_CFLAGS) -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL -m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) +LT_INIT([dlopen win32-dll]) +LT_LANG([Windows Resource]) +LT_OUTPUT LT_CURRENT=0 LT_REVISION=0 @@ -1643,6 +1646,7 @@ GROONGA_HTTPD_DEFAULT_DATABASE_PATH="` AC_SUBST(GROONGA_HTTPD_DEFAULT_DATABASE_PATH) AC_OUTPUT([ + lib/metadata.rc packages/rpm/centos/groonga.spec packages/apt/debian/groonga-keyring.postrm packages/apt/env.sh Modified: lib/Makefile.am (+11 -0) =================================================================== --- lib/Makefile.am 2016-04-06 18:16:53 +0900 (195b329) +++ lib/Makefile.am 2016-04-06 23:18:16 +0900 (8814f5f) @@ -59,6 +59,17 @@ SUFFIXES = .lemon .c $(LEMON) $< endif +if PLATFORM_WIN32 +libgroonga_la_SOURCES += \ + metadata.rc + +.rc.lo: + $(LIBTOOL) $(AM_V_lt) --tag=RC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile \ + $(RC) $(RCFLAGS) -o $@ $< +endif + EXTRA_DIST = \ grn_ecmascript.c \ grn_ecmascript.h \ Deleted: lib/libgroonga.c (+0 -8) 100644 =================================================================== --- lib/libgroonga.c 2016-04-06 18:16:53 +0900 (19e0941) +++ /dev/null @@ -1,8 +0,0 @@ -#ifdef WIN32 -#include <windows.h> - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void * reserve) -{ - return TRUE; -} -#endif Added: lib/metadata.rc.in (+28 -0) 100644 =================================================================== --- /dev/null +++ lib/metadata.rc.in 2016-04-06 23:18:16 +0900 (0c43cd7) @@ -0,0 +1,28 @@ +#include <windows.h> + +#define LANG_CODE_US_ENGLISH 0x0409 +#define CHARSET_UNICODE 0x04b0 +#define US_ENGLISH_UNICODE "040904b0" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION 0, �� GRN_VERSION_RC@ +PRODUCTVERSION 0, �� GRN_VERSION_RC@ +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK US_ENGLISH_UNICODE + BEGIN + VALUE "CompanyName", "Groonga project" + VALUE "FileDescription", "Full text search engine library" + VALUE "FileVersion", "@GRN_VERSION@" + VALUE "InternalName", "libgroonga" + VALUE "OriginalFilename", "@GRN_DLL_FILENAME@" + VALUE "ProductName", "libgroonga" + VALUE "ProductVersion", "@GRN_VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", LANG_CODE_US_ENGLISH, CHARSET_UNICODE + END +END -------------- next part -------------- HTML����������������������������...Download