mirror/ctemplate
1
0
Fork 0
mirror of https://github.com/OlafvdSpek/ctemplate.git synced 2025-09-28 19:05:49 +08:00
Code Issues Releases Wiki Activity

Change on 2011-07-29 12:10:58-07:00 by csilvers

Browse Source 
mingw fixes:

	1) mingw needs an #include to have access to mkdir.

	2) It needs to always #include port.h (this is an identical
	bit of code, in configure.ac, that I have in other opensource
	projects for mingw support.)

	3) I moved some code from port.cc to port.h, so I didn't have
	to add logic to link in port.cc for mingw.

	Last change before new release!  (*knock on wood*)  Submitting
	TBR so I can get the release out today.  This isn't exactly a
	trivial change, so I'm chary to submit TBR, but it's pretty
	isolated to windows and mingw, and I've tested on those
	platforms to make sure they compile and all tests pass.

	DELTA=70  (37 added, 30 deleted, 3 changed)

Change on 2011-07-29 12:21:55-07:00 by csilvers

	Small change to get tests passing on mingw -- using /tmp is
	causing problems with our diffs, since sometimes it follows
	the /tmp (built-in msys) symlink, and sometimes it doesn't.

	R=jad
	DELTA=10  (8 added, 0 deleted, 2 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=2821
This commit is contained in:
csilvers+ctemplate@google.com 2011-07-29 19:58:48 +00:00
parent fd02964e99
commit 92d6f935bc
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -11,6 +11,14 @@ if GCC
AM_CXXFLAGS = -Wall -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare
endif
# mingw does weird directory munging on /tmp, which causes some of our
# tests to fail, so use a different tmpdir there.
if MINGW
TMPDIR = ./
else
TMPDIR = /tmp
endif
ctemplateincludedir = $(includedir)/ctemplate
## The .h files you want to install (that is, .h files that people
## who install this package can include in their own applications.)
@ -426,14 +434,14 @@ noinst_SCRIPTS += src/tests/make_tpl_varnames_h_unittest.sh
make_tpl_varnames_h_unittest_sh: src/tests/make_tpl_varnames_h_unittest.sh \
make_tpl_varnames_h
sh $(top_srcdir)/src/tests/make_tpl_varnames_h_unittest.sh \
$(top_builddir)/make_tpl_varnames_h /tmp/$@_dir
$(top_builddir)/make_tpl_varnames_h $(TMPDIR)/$@_dir
check_SCRIPTS += diff_tpl_auto_escape_unittest_sh
noinst_SCRIPTS += src/tests/diff_tpl_auto_escape_unittest.sh
diff_tpl_auto_escape_unittest_sh: src/tests/diff_tpl_auto_escape_unittest.sh \
diff_tpl_auto_escape
sh $(top_srcdir)/src/tests/diff_tpl_auto_escape_unittest.sh \
$(top_builddir)/diff_tpl_auto_escape /tmp/$@_dir
$(top_builddir)/diff_tpl_auto_escape $(TMPDIR)/$@_dir
## ^^^^ END OF RULES TO MAKE THE LIBRARIES, BINARIES, AND UNITTESTS

9
Makefile.in
View File

@ -777,6 +777,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
# These are good warnings to turn on by default
@GCC_TRUE@AM_CXXFLAGS = -Wall -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare
@MINGW_FALSE@TMPDIR = /tmp
# mingw does weird directory munging on /tmp, which causes some of our
# tests to fail, so use a different tmpdir there.
@MINGW_TRUE@TMPDIR = ./
ctemplateincludedir = $(includedir)/ctemplate
nodist_ctemplateinclude_HEADERS = \
src/ctemplate/template.h \
@ -2730,11 +2735,11 @@ generate_fsm_test_sh: src/tests/generate_fsm_test.sh \
make_tpl_varnames_h_unittest_sh: src/tests/make_tpl_varnames_h_unittest.sh \
make_tpl_varnames_h
sh $(top_srcdir)/src/tests/make_tpl_varnames_h_unittest.sh \
$(top_builddir)/make_tpl_varnames_h /tmp/$@_dir
$(top_builddir)/make_tpl_varnames_h $(TMPDIR)/$@_dir
diff_tpl_auto_escape_unittest_sh: src/tests/diff_tpl_auto_escape_unittest.sh \
diff_tpl_auto_escape
sh $(top_srcdir)/src/tests/diff_tpl_auto_escape_unittest.sh \
$(top_builddir)/diff_tpl_auto_escape /tmp/$@_dir
$(top_builddir)/diff_tpl_auto_escape $(TMPDIR)/$@_dir
rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec
@cd packages && ./rpm.sh ${PACKAGE} ${VERSION}