# HG changeset patch # User rs200217 # Date 1189710511 25200 # Node ID 105442d80fa2a55feca6c8dd269f31fa237d3da2 # Parent 8bd749a329c96f688a5d793d958423ba172ab7d7 6603905 mdns files appear in wsdiff output due to javadoc timestamp option and use of __DATE__/__TIME__ diff -r 8bd749a329c9 -r 105442d80fa2 usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile --- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile Thu Sep 13 11:38:19 2007 -0700 +++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile Thu Sep 13 12:08:31 2007 -0700 @@ -44,7 +44,8 @@ -DLOG_PERROR=0 -DHAVE_SOLARIS -DHAVE_SOLARIS_ZONES \ -D_XPG4_2 -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME \ -DHAVE_IPV6=1 -Dasm=__asm -DMDNSD_NOROOT \ - -DPID_FILE=\"\" -DMDNSD_USER=\"noaccess\" + -DPID_FILE=\"\" -DMDNSD_USER=\"noaccess\" \ + -DMDNS_VERSIONSTR_NODTS include ../../../Makefile.cmd diff -r 8bd749a329c9 -r 105442d80fa2 usr/src/cmd/cmd-inet/usr.lib/mdnsd/PosixDaemon.c --- a/usr/src/cmd/cmd-inet/usr.lib/mdnsd/PosixDaemon.c Thu Sep 13 11:38:19 2007 -0700 +++ b/usr/src/cmd/cmd-inet/usr.lib/mdnsd/PosixDaemon.c Thu Sep 13 12:08:31 2007 -0700 @@ -364,6 +364,8 @@ // For convenience when using the "strings" command, this is the last thing in the file #if mDNSResponderVersion > 1 mDNSexport const char mDNSResponderVersionString[] = "mDNSResponder-" STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ") "; +#elif MDNS_VERSIONSTR_NODTS +mDNSexport const char mDNSResponderVersionString[] = "mDNSResponder (Engineering Build) "; #else mDNSexport const char mDNSResponderVersionString[] = "mDNSResponder (Engineering Build) (" __DATE__ " " __TIME__ ") "; #endif diff -r 8bd749a329c9 -r 105442d80fa2 usr/src/lib/libdns_sd/java/com/apple/dnssd/Makefile --- a/usr/src/lib/libdns_sd/java/com/apple/dnssd/Makefile Thu Sep 13 11:38:19 2007 -0700 +++ b/usr/src/lib/libdns_sd/java/com/apple/dnssd/Makefile Thu Sep 13 12:08:31 2007 -0700 @@ -140,11 +140,11 @@ install_doc: $(CLASSES) $(DOCAPIDESTDIR) -$(RM) -r $(DOCAPIDESTDIR)/* cd $(TOP); umask 022; \ - $(JAVADOC) $(JAVASRCDIR)/*.java -classpath $(CLASSPATH) -d \ - $(DOCAPIDESTDIR) -public $(DNSSD_PKG) + $(JAVADOC) $(JAVASRCDIR)/*.java -notimestamp -classpath \ + $(CLASSPATH) -d $(DOCAPIDESTDIR) -public $(DNSSD_PKG) doc: -@mkdir -p $(DOCAPIDIR) cd $(TOP); umask 022; \ - $(JAVADOC) $(JAVASRCDIR)/*.java -classpath $(CLASSPATH) -d \ - $(DOCAPIDIR) -public $(DNSSD_PKG) + $(JAVADOC) $(JAVASRCDIR)/*.java -notimestamp -classpath \ + $(CLASSPATH) -d $(DOCAPIDIR) -public $(DNSSD_PKG)