Commits

Sebastian Freundt committed c1da131 Merge

Merge branch 'next'

* next:
fix, skip special format specifiers if build is for ltrcc
Revert "fix, avoid parallel builds of info stuff"
fix, PEBKAC, actually write doc generated files into proper subdirs
fix, avoid parallel builds of info stuff
fix, PEBKAC, make clear how to make dexpr-parser.h
fix, mention fmt-special.gperf source in EXTRA ltrcc SOURCES
chore, always update repositories

  • Participants
  • Parent commits 872b72e, a62c5c8
  • Tags v0.2.4

Comments (0)

Files changed (6)

   - gcc
   - clang
 
-before_script:
+before_install:
+  - sudo apt-get -qq update
+
+install:
   - sudo apt-get install -qq gengetopt
   - sudo apt-get install -qq gperf
   - sudo apt-get install -qq help2man
   - sudo apt-get install -qq bison
   - sudo apt-get install -qq flex
   - sudo apt-get install -qq texlive
+
+before_script:
   - autoreconf -vfi
 
 script: ./configure && make clean all check distcheck || (cat test/test-suite.log && /bin/false)

File info/genh2m.sh

 ## backport from dt-test.sh
 tsp_create_env()
 {
-	TS_TMPDIR="`basename "${testfile}"`.tmpd"
+	TS_TMPDIR="`basename "${BINARY}"`.tmpd"
 	rm -rf "${TS_TMPDIR}" || return 1
 	mkdir "${TS_TMPDIR}" || return 1
 

File info/gentexi.sh

 ## backport from new test suite
 tsp_create_env()
 {
-	TS_TMPDIR="`basename "${testfile}"`.tmpd"
+	TS_TMPDIR="`basename "${BINARY}"`.tmpd"
 	rm -rf "${TS_TMPDIR}" || return 1
 	mkdir "${TS_TMPDIR}" || return 1
 

File lib/Makefile.am

 ltrcc_SOURCES = ltrcc.c
 ltrcc_SOURCES += dt-core.c dt-core.h
 EXTRA_ltrcc_SOURCES =
-EXTRA_ltrcc_SOURCES += fmt-special.c
+EXTRA_ltrcc_SOURCES += fmt-special.gperf fmt-special.c
 endif  ## BUILD_LTRCC
 
 

File lib/date-core.c

 #include "token.c"
 #include "strops.c"
 #include "date-core-strpf.c"
+#if !defined SKIP_LEAP_ARITH
 /* we assume this file is in the dist, it's gen'd from fmt-special.gperf */
-#include "fmt-special.c"
+# include "fmt-special.c"
+#endif	/* SKIP_LEAP_ARITH */
 
 static const char ymd_dflt[] = "%F";
 static const char ymcw_dflt[] = "%Y-%m-%c-%w";
 static dt_dtyp_t
 __trans_dfmt_special(const char *fmt)
 {
+#if !defined SKIP_LEAP_ARITH
 	size_t len = strlen(fmt);
 	const struct dt_fmt_special_s *res;
 
 	if (UNLIKELY((res = __fmt_special(fmt, len)) != NULL)) {
 		return res->e;
 	}
+#else  /* SKIP_LEAP_ARITH */
+	(void)fmt;
+#endif	/* !SKIP_LEAP_ARITH */
 	return DT_DUNK;
 }
 

File src/Makefile.am

 	$(AM_V_GEN) $(GPERF) $< --output-file $@
 
 
+## just for parallel builds
+dexpr-parser.h: dexpr-parser.c
+
+
 ## for dist or dist check we need binaries, so help2man can work
 dist-hook: $(bin_PROGRAMS)