[gtk-doc] tests: some old OSes don't support %N on the date command
- From: Stefan Kost <stefkost src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-doc] tests: some old OSes don't support %N on the date command
- Date: Tue, 4 Jun 2013 07:53:56 +0000 (UTC)
commit 057663ace1d088579890fa7465a45df33839dc65
Author: Stefan Sauer <ensonic users sf net>
Date: Tue Jun 4 07:54:54 2013 +0200
tests: some old OSes don't support %N on the date command
Check for %N in configure and drop it from the format where it is not supported.
Fixed #671519
configure.ac | 9 +++++++++
tests/gtk-doc.make | 20 ++++++++++----------
tests/gtk-doc.notmpl.make | 18 +++++++++---------
3 files changed, 28 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8259283..0f2b2db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,6 +209,15 @@ else
fi
AC_SUBST(TRACE)
+dnl check what date format we can use for the makefile tracing in tests
+date +%s.%N | grep -q "%N"
+if test "$?" == "1"; then
+ TS_FMT="+%s.%N"
+else
+ TS_FMT="+%s.0"
+fi
+AC_SUBST(TS_FMT)
+
dnl
dnl Documentation
dnl
diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make
index 1e68ad8..4eefef6 100644
--- a/tests/gtk-doc.make
+++ b/tests/gtk-doc.make
@@ -53,17 +53,17 @@ REPORT_FILES = \
CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
check-local: html-build.stamp pdf-build.stamp
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: All done"
docs: html-build.stamp pdf-build.stamp
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: All done"
$(REPORT_FILES): sgml-build.stamp
ts:
- @echo >ts `date +%s.%N`;
+ @echo >ts `date $(TS_FMT)`;
#### setup ####
@@ -86,7 +86,7 @@ setup-build.stamp: ts
#### scan ####
scan-build.stamp: ts $(HFILE_GLOB) $(CFILE_GLOB)
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: Scanning header files"
@_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
@@ -96,7 +96,7 @@ scan-build.stamp: ts $(HFILE_GLOB) $(CFILE_GLOB)
PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir}
$(SCAN_OPTIONS) $(EXTRA_HFILES) 2>&1 | tee -a gtkdoc-scan.log
@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
- ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: Introspecting gobjects"; \
scanobj_options=""; \
if test "x$(V)" = "x1"; then \
@@ -119,7 +119,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
#### templates ####
tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt
$(DOC_MODULE)-overrides.txt
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: Rebuilding template files"
@echo "gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)" >gtkdoc-mktmpl.log; \
PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
@@ -140,7 +140,7 @@ $(srcdir)/tmpl/*.sgml:
#### xml ####
sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: Building XML"
@_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
@@ -157,7 +157,7 @@ sgml.stamp: sgml-build.stamp
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @00$$tsd +%H:%M:%S.%N`: Building HTML"
@rm -rf html
@mkdir html
@@ -177,7 +177,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
cp $(abs_builddir)/$$file $(abs_builddir)/html; \
fi; \
done;
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: Fixing cross-references"
@echo "gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR)
$(FIXXREF_OPTIONS)" >gtkdoc-fixxref.log; \
PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
@@ -187,7 +187,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
#### pdf ####
pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: Building PDF"
@rm -f $(DOC_MODULE).pdf
@mkpdf_options=""; \
diff --git a/tests/gtk-doc.notmpl.make b/tests/gtk-doc.notmpl.make
index 9d91d3c..b3a700a 100644
--- a/tests/gtk-doc.notmpl.make
+++ b/tests/gtk-doc.notmpl.make
@@ -53,17 +53,17 @@ REPORT_FILES = \
CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
check-local: html-build.stamp pdf-build.stamp
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: All done"
docs: html-build.stamp pdf-build.stamp
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: All done"
$(REPORT_FILES): sgml-build.stamp
ts:
- @echo >ts `date +%s.%N`;
+ @echo >ts `date $(TS_FMT)`;
#### setup ####
@@ -83,7 +83,7 @@ setup-build.stamp: ts
#### scan ####
scan-build.stamp: ts $(HFILE_GLOB) $(CFILE_GLOB)
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: Scanning header files"
@_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
@@ -93,7 +93,7 @@ scan-build.stamp: ts $(HFILE_GLOB) $(CFILE_GLOB)
PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir}
$(SCAN_OPTIONS) $(EXTRA_HFILES) 2>&1 | tee -a gtkdoc-scan.log
@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
- ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: Introspecting gobjects"; \
scanobj_options=""; \
if test "x$(V)" = "x1"; then \
@@ -116,7 +116,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
#### xml ####
sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt
$(DOC_MODULE)-overrides.txt $(expand_content_files)
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: Building XML"
@_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
@@ -133,7 +133,7 @@ sgml.stamp: sgml-build.stamp
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @00$$tsd +%H:%M:%S.%N`: Building HTML"
@rm -rf html
@mkdir html
@@ -153,7 +153,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
cp $(abs_builddir)/$$file $(abs_builddir)/html; \
fi; \
done;
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: Fixing cross-references"
@echo "gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR)
$(FIXXREF_OPTIONS)" >gtkdoc-fixxref.log; \
PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
@@ -163,7 +163,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
#### pdf ####
pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @ts1=`cat ts`;ts2=`date +%s.%N`;tsd=`echo $$ts2-$$ts1 | bc`; \
+ @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \
echo " DOC `date --utc --date @0$$tsd +%H:%M:%S.%N`: Building PDF"
@rm -f $(DOC_MODULE).pdf
@mkpdf_options=""; \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]