Promote file containing date & time build was configured to top-level

Promote the generated file containing the date & time build was
configured to top-level.

Rename it from xf86Build.h to buildDateTIme.h.

Use it as well in XQuartz, stringize BUILD_DATE when needed.

Makefile.am

@@ -142,7 +142,7 @@ EXTRA_DIST += \
 	include/xorg-config.h.meson.in \
 	include/xwin-config.h.meson.in \
 	hw/xfree86/loader/symbol-test.c \
-	hw/xfree86/common/xf86Build.sh \
+	buildDateTime.sh \
 	composite/meson.build \
 	config/meson.build \
 	damageext/meson.build \
@@ -213,3 +213,5 @@ EXTRA_DIST += \
 	xfixes/meson.build \
 	Xi/meson.build \
 	xkb/meson.build
+
+DISTCLEANFILES = buildDateTime.h

configure.ac

@@ -2407,6 +2407,7 @@ if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then
 fi
 
 AC_CONFIG_FILES([
+buildDateTime.h
 Makefile
 glx/Makefile
 include/Makefile
@@ -2442,7 +2443,6 @@ hw/Makefile
 hw/xfree86/Makefile
 hw/xfree86/Xorg.sh
 hw/xfree86/common/Makefile
-hw/xfree86/common/xf86Build.h
 hw/xfree86/ddc/Makefile
 hw/xfree86/dixmods/Makefile
 hw/xfree86/doc/Makefile

hw/xfree86/common/Makefile.am

@@ -45,14 +45,15 @@ libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
                       xf86Mode.c xorgHelper.c xf86Extensions.h \
 		      xf86Extensions.c $(XF86VMODESOURCES) \
                       $(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES)
-nodist_libcommon_la_SOURCES = xf86DefModeSet.c xf86Build.h
+nodist_libcommon_la_SOURCES = xf86DefModeSet.c
 libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la
 
 AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
 	   -I$(srcdir)/../loader -I$(srcdir)/../parser \
            -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
 	   -I$(srcdir)/../vgahw -I$(srcdir)/../dixmods/extmod \
-	   -I$(srcdir)/../modes -I$(srcdir)/../ramdac -I$(srcdir)/../dri2
+	   -I$(srcdir)/../modes -I$(srcdir)/../ramdac -I$(srcdir)/../dri2 \
+	   -I$(top_builddir)
 
 sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
               xf86PciInfo.h xf86Priv.h xf86Privstr.h \
@@ -62,7 +63,6 @@ sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
 	      xf86platformBus.h xf86MatchDrivers.h \
 	      xaarop.h
 
-DISTCLEANFILES = xf86Build.h
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = \

hw/xfree86/common/meson.build

@@ -74,11 +74,6 @@ if get_option('pciaccess')
     srcs_xorg_common += ['xf86pciBus.c', 'xf86VGAarbiter.c']
 endif
 
-srcs_xorg_common += configure_file(
-    output: 'xf86Build.h',
-    command: ['sh', join_paths(meson.current_source_dir(), 'xf86Build.sh'), '@OUTPUT@'],
-)
-
 srcs_xorg_common += custom_target(
     'xf86DefModeSet.c',
     output: 'xf86DefModeSet.c',
@@ -89,7 +84,7 @@ srcs_xorg_common += custom_target(
 
 xorg_common = static_library('xorg_common',
     srcs_xorg_common,
-    include_directories: [inc, xorg_inc],
+    include_directories: [inc, xorg_inc, top_dir_inc],
     dependencies: [
         common_dep,
         dbus_dep,

hw/xfree86/common/xf86Init.c

@@ -65,7 +65,7 @@
 #include "xf86_OSlib.h"
 #include "xf86cmap.h"
 #include "xorgVersion.h"
-#include "xf86Build.h"
+#include "buildDateTime.h"
 #include "mipointer.h"
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>

hw/xquartz/Makefile.am

@@ -2,13 +2,13 @@ noinst_LTLIBRARIES = libXquartz.la
 AM_CFLAGS = $(DIX_CFLAGS)
 AM_OBJCFLAGS = $(DIX_CFLAGS)
 AM_CPPFLAGS = \
-	-DBUILD_DATE=\"$(BUILD_DATE)\" \
 	-DXSERVER_VERSION=\"$(VERSION)\" \
 	-DINXQUARTZ \
 	-DUSE_NEW_CLUT \
 	-DXFree86Server \
 	-I$(top_srcdir)/miext/rootless \
 	-I$(top_builddir)/pseudoramiX \
+	-I$(top_builddir) \
 	-DX11LIBDIR=\"$(libdir)\"
 
 if GLX

hw/xquartz/darwin.c

@@ -34,6 +34,7 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include "buildDateTime.h"
 #include "os.h"
 #include "servermd.h"
 #include "inputstr.h"
@@ -168,7 +169,7 @@ DarwinPrintBanner(void)
 {
     ErrorF("Xquartz starting:\n");
     ErrorF("X.Org X Server %s\n", XSERVER_VERSION);
-    ErrorF("Build Date: %s\n", BUILD_DATE);
+    ErrorF("Build Date: %d\n", BUILD_DATE);
 }
 
 /*

hw/xquartz/mach-startup/Makefile.am

@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
 	-I$(srcdir)/.. \
-	-DBUILD_DATE=\"$(BUILD_DATE)\" \
+	-I$(top_builddir) \
 	-DXSERVER_VERSION=\"$(VERSION)\" \
 	-DX11BINDIR=\"$(bindir)\"
 

hw/xquartz/mach-startup/bundle-main.c

@@ -62,6 +62,7 @@
 #include "mach_startupServer.h"
 
 #include "console_redirect.h"
+#include "buildDateTime.h"
 
 /* From darwinEvents.c ... but don't want to pull in all the server cruft */
 void
@@ -81,9 +82,9 @@ extern int noPanoramiXExtension;
 #define DEFAULT_STARTX X11BINDIR "/startx -- " X11BINDIR "/Xquartz"
 #define DEFAULT_SHELL  "/bin/sh"
 
-#ifndef BUILD_DATE
+#define _STRINGIZE(s) #s
-#define BUILD_DATE ""
+#define STRINGIZE(s) _STRINGIZE(s)
-#endif
+
 #ifndef XSERVER_VERSION
 #define XSERVER_VERSION "?"
 #endif
@@ -99,7 +100,7 @@ asm (".desc ___crashreporter_info__, 0x10");
 #endif
 
 static const char *__crashreporter_info__base =
-    "X.Org X Server " XSERVER_VERSION " Build Date: " BUILD_DATE;
+    "X.Org X Server " XSERVER_VERSION " Build Date: " STRINGIZE(BUILD_DATE);
 
 char *bundle_id_prefix = NULL;
 static char *server_bootstrap_name = NULL;

hw/xwin/glx/meson.build

@@ -72,7 +72,7 @@ xwin_glx = static_library(
     srcs_windows_glx,
     include_directories: [
         inc,
-        top_srcdir_inc,
+        top_dir_inc,
         include_directories('../'),
     ],
     dependencies: common_dep,
@@ -89,7 +89,7 @@ WGLthunk = shared_library(
     srcs_wgl_thunk,
     include_directories: [
         inc,
-        top_srcdir_inc,
+        top_dir_inc,
     ],
     c_args: xwin_glx_c_args + [
       '-Wno-unused-function',

hw/xwin/meson.build

@@ -142,7 +142,7 @@ xwin_dep = [
 executable(
     server_name,
     srcs_windows,
-    include_directories: [inc, top_srcdir_inc],
+    include_directories: [inc, top_dir_inc],
     dependencies: xwin_dep,
     link_with: [
         xwin_windowsdri,

meson.build

@@ -531,7 +531,7 @@ endif
 
 glx_inc = include_directories('glx')
 
-top_srcdir_inc = include_directories('.')
+top_dir_inc = include_directories('.')
 
 serverconfigdir = join_paths(get_option('libdir'), 'xorg')
 
@@ -566,6 +566,12 @@ manpage_config.set('modulepath', module_dir)
 manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), 'libexec'))
 manpage_config.set('default_font_path', default_font_path)
 
+# generate header containing date & time build was configued
+build_date_time = configure_file(
+    output: 'buildDateTime.h',
+    command: ['sh', join_paths(meson.current_source_dir(), 'buildDateTime.sh'), '@OUTPUT@'],
+)
+
 # Include must come first, as it sets up dix-config.h
 subdir('include')