windres usage for application resources.

git-svn-id: file:///svn/unbound/trunk@1496 be551aaa-1e26-0410-a405-d3ace91eadb9

Makefile.in

@@ -38,6 +38,7 @@ staticexe=@staticexe@
 configfile=@ub_conf_file@
 UNBOUND_RUN_DIR=@UNBOUND_RUN_DIR@
 CHECKLOCK_SRC=@CHECKLOCK_SRC@
+UB_ON_WINDOWS=@UB_ON_WINDOWS@
 
 YACC=@YACC@
 LEX=@LEX@
@@ -119,6 +120,21 @@ ALL_SRC=$(sort $(COMMON_SRC) $(UNITTEST_SRC) $(DAEMON_SRC) \
 ALL_OBJ=$(addprefix $(BUILD),$(ALL_SRC:.c=.lo) \
 	$(addprefix compat/,$(LIBOBJS:.o=.lo))) $(COMPAT_OBJ)
 
+ifeq "$(UB_ON_WINDOWS)" "yes"
+  DAEMON_OBJ+=$(BUILD)winrc/rsrc_unbound.o
+  HOST_OBJ+=$(BUILD)winrc/rsrc_unbound_host.o
+  CONTROL_OBJ+=$(BUILD)winrc/rsrc_unbound_control.o
+  CHECKCONF_OBJ+=$(BUILD)winrc/rsrc_unbound_checkconf.o
+
+$(BUILD)%.o:      $(srcdir)/%.rc
+	$(INFO) Resource $<
+	@if test ! -z "$(ldnsdir)" -a ! -e $(ldnsdir)/include/ldns/ldns.h; \
+		then (cd $(ldnsdir); $(MAKE) copy-headers); fi
+	@-if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@));
+ fi
+	$Q$(WINDRES) $(CPPFLAGS) $< $@
+endif
+
 COMPILE=$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS)
 LINK=$(LIBTOOL) --tag=CC --mode=link $(CC) $(staticexe) $(RUNTIME_PATH) $(CFLAGS) $(LDFLAGS)
 LINK_LIB=$(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CFLAGS) $(LDFLAGS) $(staticexe) -version-number @LIBUNBOUND_CURRENT@:@LIBUNBOUND_REVISION@:@LIBUNBOUND_AGE@ -no-undefined

config.h.in

@@ -334,12 +334,18 @@
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE
 
+/* version number for resource files */
+#undef RSRC_PACKAGE_VERSION
+
 /* Directory to chdir to */
 #undef RUN_DIR
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Use win32 resources and API */
+#undef UB_ON_WINDOWS
+
 /* default username */
 #undef UB_USERNAME
 
@@ -390,11 +396,9 @@
 /* in_port_t */
 #undef in_port_t
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   calls it, or to nothing if 'inline' is not supported under any name.  */
+   if it is not supported. */
-#ifndef __cplusplus
 #undef inline
-#endif
 
 /* Define to `short' if <sys/types.h> does not define. */
 #undef int16_t
@@ -411,7 +415,7 @@
 /* Define to rpl_malloc if the replacement function should be used. */
 #undef malloc
 
-/* Define to `long int' if <sys/types.h> does not define. */
+/* Define to `long' if <sys/types.h> does not define. */
 #undef off_t
 
 /* Define to `int' if <sys/types.h> does not define. */
@@ -420,7 +424,7 @@
 /* Define to 'int' if not defined */
 #undef rlim_t
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define to 'int' if not defined */

configure.ac

@@ -95,6 +95,11 @@ AC_SUBST(UNBOUND_USERNAME)
 AC_DEFINE_UNQUOTED(UB_USERNAME, ["$UNBOUND_USERNAME"], [default username])
 
 AC_DEFINE(WINVER, 0x0502, [the version of the windows API enabled])
+dnl compute package version for windows res files, the first four numbers.
+[
+wnvs=`echo $PACKAGE_VERSION | sed -e 's/^[^0-9]*\([0-9]\)[^0-9]*\([0-9]\)[^0-9]*\([0-9]\)[^0-9]*\([0-9]\).*$/\1,\2,\3,\4/' -e 's/^[^0-9]*\([0-9]\)[^0-9]*\([0-9]\)[^0-9]*\([0-9]\)[^0-9]*$/\1,\2,\3,0/' `
+]
+AC_DEFINE_UNQUOTED(RSRC_PACKAGE_VERSION, [$wnvs], [version number for resource files])
 
 dnl routine to help check for compiler flags.
 AC_DEFUN([CHECK_COMPILER_FLAG],
@@ -837,6 +842,9 @@ AC_LANG_PROGRAM(
 [
 ac_cv_func_getaddrinfo="yes"
 dnl already: LIBS="$LIBS -lws2_32"
+AC_DEFINE(UB_ON_WINDOWS, 1, [Use win32 resources and API])
+UB_ON_WINDOWS=yes
+AC_SUBST(UB_ON_WINDOWS)
 AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used])
 ],
 [

doc/Changelog

@@ -1,3 +1,6 @@
+25 February 2009: Wouter
+	- windres usage for application resources.
+
 24 February 2009: Wouter
 	- isc moved their dlv key download location.
 	- fixup warning on vista/mingw.

winrc/rsrc_unbound.rc

@@ -0,0 +1,42 @@
+/*
+  Unbound resource file for windows.  For use with windres
+*/
+#include "winver.h"
+#include "config.h"
+
+1 ICON "winrc/unbound64.ico"
+2 ICON "winrc/unbound48.ico"
+3 ICON "winrc/unbound32.ico"
+4 ICON "winrc/unbound16.ico"
+
+1 VERSIONINFO
+/*FILEVERSION	1,0,0,0
+PRODUCTVERSION	1,0,0,0*/
+FILEVERSION	RSRC_PACKAGE_VERSION
+PRODUCTVERSION  RSRC_PACKAGE_VERSION
+FILEFLAGSMASK	0
+FILEFLAGS	0
+FILEOS		VOS__WINDOWS32
+FILETYPE	VFT_APP
+FILESUBTYPE	0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName",	"NLnet Labs"
+      VALUE "FileDescription",	"Unbound DNS Server"
+      VALUE "FileVersion",	PACKAGE_VERSION
+      VALUE "InternalName",	"unbound"
+      VALUE "OriginalFilename",	"unbound.exe"
+      VALUE "ProductName",	"unbound"
+      VALUE "ProductVersion",	PACKAGE_VERSION
+      VALUE "LegalCopyright",	"(C) 2009 NLnet Labs. Source is BSD licensed."
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    /* English(409), windows ANSI codepage (1252) */
+    VALUE "Translation", 0x409, 0x1252
+  END
+END

winrc/rsrc_unbound_checkconf.rc

@@ -0,0 +1,42 @@
+/*
+  Unbound resource file for windows.  For use with windres
+*/
+#include "winver.h"
+#include "config.h"
+
+1 ICON "winrc/unbound64.ico"
+2 ICON "winrc/unbound48.ico"
+3 ICON "winrc/unbound32.ico"
+4 ICON "winrc/unbound16.ico"
+
+1 VERSIONINFO
+/*FILEVERSION	1,0,0,0
+PRODUCTVERSION	1,0,0,0*/
+FILEVERSION	RSRC_PACKAGE_VERSION
+PRODUCTVERSION  RSRC_PACKAGE_VERSION
+FILEFLAGSMASK	0
+FILEFLAGS	0
+FILEOS		VOS__WINDOWS32
+FILETYPE	VFT_APP
+FILESUBTYPE	0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName",	"NLnet Labs"
+      VALUE "FileDescription",	"Unbound Configuration Checker"
+      VALUE "FileVersion",	PACKAGE_VERSION
+      VALUE "InternalName",	"unbound-checkconf"
+      VALUE "OriginalFilename",	"unbound-checkconf.exe"
+      VALUE "ProductName",	"unbound"
+      VALUE "ProductVersion",	PACKAGE_VERSION
+      VALUE "LegalCopyright",	"(C) 2009 NLnet Labs. Source is BSD licensed."
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    /* English(409), windows ANSI codepage (1252) */
+    VALUE "Translation", 0x409, 0x1252
+  END
+END

winrc/rsrc_unbound_control.rc

@@ -0,0 +1,42 @@
+/*
+  Unbound resource file for windows.  For use with windres
+*/
+#include "winver.h"
+#include "config.h"
+
+1 ICON "winrc/unbound64.ico"
+2 ICON "winrc/unbound48.ico"
+3 ICON "winrc/unbound32.ico"
+4 ICON "winrc/unbound16.ico"
+
+1 VERSIONINFO
+/*FILEVERSION	1,0,0,0
+PRODUCTVERSION	1,0,0,0*/
+FILEVERSION	RSRC_PACKAGE_VERSION
+PRODUCTVERSION  RSRC_PACKAGE_VERSION
+FILEFLAGSMASK	0
+FILEFLAGS	0
+FILEOS		VOS__WINDOWS32
+FILETYPE	VFT_APP
+FILESUBTYPE	0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName",	"NLnet Labs"
+      VALUE "FileDescription",	"Unbound Remote Control Tool"
+      VALUE "FileVersion",	PACKAGE_VERSION
+      VALUE "InternalName",	"unbound-control"
+      VALUE "OriginalFilename",	"unbound-control.exe"
+      VALUE "ProductName",	"unbound"
+      VALUE "ProductVersion",	PACKAGE_VERSION
+      VALUE "LegalCopyright",	"(C) 2009 NLnet Labs. Source is BSD licensed."
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    /* English(409), windows ANSI codepage (1252) */
+    VALUE "Translation", 0x409, 0x1252
+  END
+END

winrc/rsrc_unbound_host.rc

@@ -0,0 +1,42 @@
+/*
+  Unbound resource file for windows.  For use with windres
+*/
+#include "winver.h"
+#include "config.h"
+
+1 ICON "winrc/unbound64.ico"
+2 ICON "winrc/unbound48.ico"
+3 ICON "winrc/unbound32.ico"
+4 ICON "winrc/unbound16.ico"
+
+1 VERSIONINFO
+/*FILEVERSION	1,0,0,0
+PRODUCTVERSION	1,0,0,0*/
+FILEVERSION	RSRC_PACKAGE_VERSION
+PRODUCTVERSION  RSRC_PACKAGE_VERSION
+FILEFLAGSMASK	0
+FILEFLAGS	0
+FILEOS		VOS__WINDOWS32
+FILETYPE	VFT_APP
+FILESUBTYPE	0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName",	"NLnet Labs"
+      VALUE "FileDescription",	"Unbound Lookup Utility"
+      VALUE "FileVersion",	PACKAGE_VERSION
+      VALUE "InternalName",	"unbound-host"
+      VALUE "OriginalFilename",	"unbound-host.exe"
+      VALUE "ProductName",	"unbound"
+      VALUE "ProductVersion",	PACKAGE_VERSION
+      VALUE "LegalCopyright",	"(C) 2009 NLnet Labs. Source is BSD licensed."
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    /* English(409), windows ANSI codepage (1252) */
+    VALUE "Translation", 0x409, 0x1252
+  END
+END