From 13373a8d7eeda1773ad1a2a28daf0a608b3830cf Mon Sep 17 00:00:00 2001 From: Amritanshu Pandia Date: Wed, 25 Oct 2017 14:58:19 +0530 Subject: [PATCH] [Gtest][Fixed build issues for the build failures of dependent modules] Change-Id: I336b3d12987447245fae4586fb4172447fdaeec4 Signed-off-by: Amritanshu Pandia (cherry picked from commit 5e15a9977535b0e73645883fe0f101638aa1a8e3) --- Makefile | 47 +++++++++++++++++++++++++++++++++++++++-------- Makefile.am | 7 +++++-- Makefile.in | 47 +++++++++++++++++++++++++++++++++++++++-------- codegear/gtest.cbproj | 14 +++++++++++++- make/Makefile | 3 ++- packaging/gtest.spec | 1 + 6 files changed, 99 insertions(+), 20 deletions(-) mode change 100644 => 100755 Makefile diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 index 0e04310..d98178f --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ check_PROGRAMS = samples/sample1_unittest$(EXEEXT) \ test/gtest_all_test$(EXEEXT) test/fused_gtest_test$(EXEEXT) subdir = . DIST_COMMON = README $(am__configure_deps) $(pkginclude_HEADERS) \ - $(pkginclude_internal_HEADERS) $(srcdir)/Makefile.am \ + $(pkginclude_internal_HEADERS) $(pkginclude_internalcustom_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/build-aux/config.h.in \ $(top_srcdir)/configure $(top_srcdir)/scripts/gtest-config.in \ COPYING build-aux/config.guess build-aux/config.sub \ @@ -88,7 +88,8 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(m4datadir)" \ "$(DESTDIR)$(pkgincludedir)" \ - "$(DESTDIR)$(pkginclude_internaldir)" + "$(DESTDIR)$(pkginclude_internaldir)" \ + "$(DESTDIR)$(pkginclude_internalcustomdir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) lib_libgtest_la_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp @@ -160,7 +161,7 @@ DIST_SOURCES = $(lib_libgtest_la_SOURCES) \ $(test_fused_gtest_test_SOURCES) \ $(test_gtest_all_test_SOURCES) DATA = $(m4data_DATA) -HEADERS = $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) +HEADERS = $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) $(pkginclude_internalcustom_HEADERS) ETAGS = etags CTAGS = ctags am__tty_colors = \ @@ -438,10 +439,17 @@ pkginclude_internal_HEADERS = \ include/gtest/internal/gtest-param-util-generated.h \ include/gtest/internal/gtest-param-util.h \ include/gtest/internal/gtest-port.h \ + include/gtest/internal/gtest-port-arch.h \ include/gtest/internal/gtest-string.h \ include/gtest/internal/gtest-tuple.h \ include/gtest/internal/gtest-type-util.h +pkginclude_internalcustomdir = $(pkgincludedir)/internal/custom +pkginclude_internalcustom_HEADERS = \ + include/gtest/internal/custom/gtest.h \ + include/gtest/internal/custom/gtest-port.h \ + include/gtest/internal/custom/gtest-printers.h + lib_libgtest_main_la_SOURCES = src/gtest_main.cc lib_libgtest_main_la_LIBADD = lib/libgtest.la @@ -854,6 +862,26 @@ uninstall-pkginclude_internalHEADERS: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(pkginclude_internaldir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(pkginclude_internaldir)" && rm -f $$files +install-pkginclude_internalcustomHEADERS: $(pkginclude_internalcustom_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkginclude_internalcustomdir)" || $(MKDIR_P) "$(DESTDIR)$(pkginclude_internalcustomdir)" + @list='$(pkginclude_internalcustom_HEADERS)'; test -n "$(pkginclude_internalcustomdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkginclude_internalcustomdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkginclude_internalcustomdir)" || exit $$?; \ + done + +uninstall-pkginclude_internalcustomHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pkginclude_internalcustom_HEADERS)'; test -n "$(pkginclude_internalcustomdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkginclude_internalcustomdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkginclude_internalcustomdir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -1153,7 +1181,7 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkginclude_internaldir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkginclude_internaldir)" "$(DESTDIR)$(pkginclude_internalcustomdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1216,7 +1244,7 @@ info: info-am info-am: install-data-am: install-data-local install-m4dataDATA \ - install-pkgincludeHEADERS install-pkginclude_internalHEADERS + install-pkgincludeHEADERS install-pkginclude_internalHEADERS install-pkginclude_internalcustomHEADERS install-dvi: install-dvi-am @@ -1267,7 +1295,8 @@ ps-am: uninstall-am: uninstall-libLTLIBRARIES uninstall-m4dataDATA \ uninstall-pkgincludeHEADERS \ - uninstall-pkginclude_internalHEADERS + uninstall-pkginclude_internalHEADERS \ + uninstall-pkginclude_internalcustomHEADERS .MAKE: check-am install-am install-strip @@ -1285,13 +1314,15 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-m4dataDATA \ install-libLTLIBRARIES install-m4dataDATA install-man \ install-pdf install-pdf-am install-pkgincludeHEADERS \ install-pkginclude_internalHEADERS install-ps install-ps-am \ + install-pkginclude_internalcustomHEADERS install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-libLTLIBRARIES \ uninstall-m4dataDATA uninstall-pkgincludeHEADERS \ - uninstall-pkginclude_internalHEADERS + uninstall-pkginclude_internalHEADERS \ + uninstall-pkginclude_internalcustomHEADERS # Build rules for putting fused Google Test files into the distribution @@ -1299,7 +1330,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-m4dataDATA \ # scripts/fuse_gtest_files.py. $(test_fused_gtest_test_SOURCES): fused-gtest -fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \ +fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) $(pkginclude_internalcustom_HEADERS)\ $(GTEST_SRC) src/gtest-all.cc src/gtest_main.cc \ scripts/fuse_gtest_files.py mkdir -p "$(srcdir)/fused-src" diff --git a/Makefile.am b/Makefile.am index 29797e4..dcfe2e8 100755 --- a/Makefile.am +++ b/Makefile.am @@ -208,7 +208,10 @@ pkginclude_internal_HEADERS = \ include/gtest/internal/gtest-port-arch.h \ include/gtest/internal/gtest-string.h \ include/gtest/internal/gtest-tuple.h \ - include/gtest/internal/gtest-type-util.h \ + include/gtest/internal/gtest-type-util.h + +pkginclude_internalcustomdir = $(pkgincludedir)/internal/custom +pkginclude_internalcustom_HEADERS = \ include/gtest/internal/custom/gtest.h \ include/gtest/internal/custom/gtest-port.h \ include/gtest/internal/custom/gtest-printers.h @@ -279,7 +282,7 @@ test_fused_gtest_test_CPPFLAGS = -I"$(srcdir)/fused-src" # scripts/fuse_gtest_files.py. $(test_fused_gtest_test_SOURCES): fused-gtest -fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \ +fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) $(pkginclude_internalcustom_HEADERS) \ $(GTEST_SRC) src/gtest-all.cc src/gtest_main.cc \ scripts/fuse_gtest_files.py mkdir -p "$(srcdir)/fused-src" diff --git a/Makefile.in b/Makefile.in index 9853797..1d2e1bf 100755 --- a/Makefile.in +++ b/Makefile.in @@ -46,7 +46,7 @@ check_PROGRAMS = samples/sample1_unittest$(EXEEXT) \ test/gtest_all_test$(EXEEXT) test/fused_gtest_test$(EXEEXT) subdir = . DIST_COMMON = README $(am__configure_deps) $(pkginclude_HEADERS) \ - $(pkginclude_internal_HEADERS) $(srcdir)/Makefile.am \ + $(pkginclude_internal_HEADERS) $(pkginclude_internalcustom_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/build-aux/config.h.in \ $(top_srcdir)/configure $(top_srcdir)/scripts/gtest-config.in \ COPYING build-aux/config.guess build-aux/config.sub \ @@ -88,7 +88,8 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(m4datadir)" \ "$(DESTDIR)$(pkgincludedir)" \ - "$(DESTDIR)$(pkginclude_internaldir)" + "$(DESTDIR)$(pkginclude_internaldir)" \ + "$(DESTDIR)$(pkginclude_internalcustomdir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) lib_libgtest_la_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp @@ -160,7 +161,7 @@ DIST_SOURCES = $(lib_libgtest_la_SOURCES) \ $(test_fused_gtest_test_SOURCES) \ $(test_gtest_all_test_SOURCES) DATA = $(m4data_DATA) -HEADERS = $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) +HEADERS = $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) $(pkginclude_internalcustom_HEADERS) ETAGS = etags CTAGS = ctags am__tty_colors = \ @@ -438,10 +439,17 @@ pkginclude_internal_HEADERS = \ include/gtest/internal/gtest-param-util-generated.h \ include/gtest/internal/gtest-param-util.h \ include/gtest/internal/gtest-port.h \ + include/gtest/internal/gtest-port-arch.h \ include/gtest/internal/gtest-string.h \ include/gtest/internal/gtest-tuple.h \ include/gtest/internal/gtest-type-util.h +pkginclude_internalcustomdir = $(pkgincludedir)/internal/custom +pkginclude_internalcustom_HEADERS = \ + include/gtest/internal/custom/gtest.h \ + include/gtest/internal/custom/gtest-port.h \ + include/gtest/internal/custom/gtest-printers.h + lib_libgtest_main_la_SOURCES = src/gtest_main.cc lib_libgtest_main_la_LIBADD = lib/libgtest.la @@ -854,6 +862,26 @@ uninstall-pkginclude_internalHEADERS: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(pkginclude_internaldir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(pkginclude_internaldir)" && rm -f $$files +install-pkginclude_internalcustomHEADERS: $(pkginclude_internalcustom_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkginclude_internalcustomdir)" || $(MKDIR_P) "$(DESTDIR)$(pkginclude_internalcustomdir)" + @list='$(pkginclude_internalcustom_HEADERS)'; test -n "$(pkginclude_internalcustomdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkginclude_internalcustomdir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkginclude_internalcustomdir)" || exit $$?; \ + done + +uninstall-pkginclude_internalcustomHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pkginclude_internalcustom_HEADERS)'; test -n "$(pkginclude_internalcustomdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkginclude_internalcustomdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkginclude_internalcustomdir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -1153,7 +1181,7 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkginclude_internaldir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkginclude_internaldir)" "$(DESTDIR)$(pkginclude_internalcustomdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1216,7 +1244,7 @@ info: info-am info-am: install-data-am: install-data-local install-m4dataDATA \ - install-pkgincludeHEADERS install-pkginclude_internalHEADERS + install-pkgincludeHEADERS install-pkginclude_internalHEADERS install-pkginclude_internalcustomHEADERS install-dvi: install-dvi-am @@ -1267,7 +1295,8 @@ ps-am: uninstall-am: uninstall-libLTLIBRARIES uninstall-m4dataDATA \ uninstall-pkgincludeHEADERS \ - uninstall-pkginclude_internalHEADERS + uninstall-pkginclude_internalHEADERS \ + uninstall-pkginclude_internalcustomHEADERS .MAKE: check-am install-am install-strip @@ -1285,13 +1314,15 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-m4dataDATA \ install-libLTLIBRARIES install-m4dataDATA install-man \ install-pdf install-pdf-am install-pkgincludeHEADERS \ install-pkginclude_internalHEADERS install-ps install-ps-am \ + install-pkginclude_internalcustomHEADERS install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-libLTLIBRARIES \ uninstall-m4dataDATA uninstall-pkgincludeHEADERS \ - uninstall-pkginclude_internalHEADERS + uninstall-pkginclude_internalHEADERS \ + uninstall-pkginclude_internalcustomHEADERS # Build rules for putting fused Google Test files into the distribution @@ -1299,7 +1330,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-m4dataDATA \ # scripts/fuse_gtest_files.py. $(test_fused_gtest_test_SOURCES): fused-gtest -fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \ +fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) $(pkginclude_internalcustom_HEADERS)\ $(GTEST_SRC) src/gtest-all.cc src/gtest_main.cc \ scripts/fuse_gtest_files.py mkdir -p "$(srcdir)/fused-src" diff --git a/codegear/gtest.cbproj b/codegear/gtest.cbproj index 95c3054..3aaf921 100755 --- a/codegear/gtest.cbproj +++ b/codegear/gtest.cbproj @@ -125,8 +125,20 @@ 17 - + 18 + + + 19 + + + 20 + + + 21 + + + 22 Cfg_1 diff --git a/make/Makefile b/make/Makefile index 9ac7449..2dc6e52 100755 --- a/make/Makefile +++ b/make/Makefile @@ -34,7 +34,8 @@ TESTS = sample1_unittest # All Google Test headers. Usually you shouldn't change this # definition. GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \ - $(GTEST_DIR)/include/gtest/internal/*.h + $(GTEST_DIR)/include/gtest/internal/*.h \ + $(GTEST_DIR)/include/gtest/internal/custom/*.h # House-keeping build targets. diff --git a/packaging/gtest.spec b/packaging/gtest.spec index b16b1e8..69434b8 100755 --- a/packaging/gtest.spec +++ b/packaging/gtest.spec @@ -51,6 +51,7 @@ make DESTDIR=$RPM_BUILD_ROOT install %manifest %{name}.manifest /usr/include/gtest/*.h /usr/include/gtest/internal/*.h +/usr/include/gtest/internal/custom/*.h %{_libdir}/libgtest_main.so %{_libdir}/libgtest.so %{_libdir}/libgtest_main.la -- 2.7.4