Index: head/devel/android-tools-adb/Makefile =================================================================== --- head/devel/android-tools-adb/Makefile (revision 397251) +++ head/devel/android-tools-adb/Makefile (revision 397252) @@ -1,47 +1,47 @@ # $FreeBSD$ PORTNAME= android-tools-adb DISTVERSIONPREFIX= android- DISTVERSION?= 5.1.1_r4 PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:bashcomp DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ bash_completion.d/adb?id=2b8cfec:bashcomp EXTRACT_ONLY= ${DISTFILES:N*\:bashcomp:C/:.*//} MAINTAINER= kevlo@FreeBSD.org COMMENT= Android debug bridge command line tool LICENSE= APACHE20 USE_GITHUB= yes GH_ACCOUNT= android GH_PROJECT= platform_system_core CONFLICTS_INSTALL?= ${PORTNAME}-devel-* USES+= uidfix .ifndef BUILD_WRKSRC WRKSRC_SUBDIR= adb .endif MAKEFILE= ${FILESDIR}/Makefile MAKE_ENV+= BINDIR="${PREFIX}/bin" PLIST_FILES= bin/adb \ %%BASH%%etc/bash_completion.d/adb PORTDOCS= *.txt *.TXT -OPTIONS_DEFINE= BASH DOCS +OPTIONS_DEFINE+=BASH DOCS OPTIONS_SUB= yes BASH_VARS= LICENSE+=MIT LICENSE_COMB=multi # debian/copyright post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//:H} ${INSTALL_DATA} ${_DISTDIR}/${DISTFILES:M*\:bashcomp:C/:.*//} \ ${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//} (cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include Index: head/devel/android-tools-adb-devel/Makefile =================================================================== --- head/devel/android-tools-adb-devel/Makefile (revision 397251) +++ head/devel/android-tools-adb-devel/Makefile (revision 397252) @@ -1,22 +1,31 @@ # $FreeBSD$ DISTVERSION= m-preview-1112 DISTVERSIONSUFFIX= -ge4c1bb5 PORTREVISION= 0 PKGNAMESUFFIX= -devel CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* MASTERDIR= ${.CURDIR}/../android-tools-adb DISTINFO_FILE= ${.CURDIR}/distinfo MAKEFILE= ${.CURDIR}/files/Makefile FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files USES= compiler:c++11-lib BUILD_WRKSRC= ${WRKSRC}/adb INSTALL_WRKSRC= ${BUILD_WRKSRC} MAKE_ENV= FILESDIR="${FILESDIR}" CFLAGS+= -DADB_REVISION='\"${DISTVERSIONFULL}\"' +ALL_TARGET= all + +OPTIONS_DEFINE= TEST + +TEST_BUILD_DEPENDS=googletest>=1.6.0:${PORTSDIR}/devel/googletest +TEST_ALL_TARGET=adb_test + +pre-install-TEST-on: + ${BUILD_WRKSRC}/adb_test .include "${MASTERDIR}/Makefile" Index: head/devel/android-tools-adb-devel/files/Makefile =================================================================== --- head/devel/android-tools-adb-devel/files/Makefile (revision 397251) +++ head/devel/android-tools-adb-devel/files/Makefile (revision 397252) @@ -1,71 +1,95 @@ # $FreeBSD$ PROG_CXX=adb NO_MAN= BINDIR?=/usr/bin SRCS+= adb.cpp SRCS+= adb_auth.cpp SRCS+= adb_auth_host.cpp SRCS+= adb_client.cpp SRCS+= adb_io.cpp SRCS+= adb_listeners.cpp SRCS+= adb_utils.cpp SRCS+= commandline.cpp SRCS+= console.cpp SRCS+= fdevent.cpp SRCS+= file_sync_client.cpp SRCS+= services.cpp SRCS+= shell_service_protocol.cpp SRCS+= sockets.cpp SRCS+= transport.cpp SRCS+= transport_local.cpp SRCS+= transport_usb.cpp +TEST_SRCS+= adb_io_test.cpp +TEST_SRCS+= adb_utils_test.cpp +TEST_SRCS+= fdevent_test.cpp +TEST_SRCS+= shell_service_protocol_test.cpp +TEST_SRCS+= transport_test.cpp +CFLAGS.shell_service_protocol_test.cpp+= -Dsighandler_t=sig_t + .PATH: ${.CURDIR}/client SRCS+= main.cpp .PATH: ${FILESDIR} SRCS+= get_my_path_freebsd.cpp SRCS+= usb_libusb.cpp .PATH: ${.CURDIR}/../base SRCS+= file.cpp SRCS+= logging.cpp SRCS+= strings.cpp SRCS+= stringprintf.cpp +TEST_SRCS+= file_test.cpp +TEST_SRCS+= logging_test.cpp +TEST_SRCS+= stringprintf_test.cpp +TEST_SRCS+= strings_test.cpp +TEST_SRCS+= test_main.cpp +TEST_SRCS+= test_utils.cpp .PATH: ${.CURDIR}/../libcutils SRCS+= socket_inaddr_any_server.c SRCS+= socket_local_client.c SRCS+= socket_local_server.c SRCS+= socket_loopback_client.c SRCS+= socket_loopback_server.c SRCS+= socket_network_client.c SRCS+= load_file.c SRCS+= threads.c # required by base/file.cpp .PATH: ${.CURDIR}/../liblog SRCS+= fake_log_device.c SRCS+= logd_write.c CFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1 CFLAGS+= -DADB_HOST=1 CFLAGS+= -DHAVE_FORKEXEC=1 CFLAGS+= -DHAVE_SYMLINKS CFLAGS+= -DHAVE_TERMIO_H CFLAGS+= -DHAVE_SYS_SOCKET_H CFLAGS+= -D_FILE_OFFSET_BITS=64 CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../include CFLAGS+= -I${.CURDIR}/../base/include CFLAGS+=${CFLAGS.${.IMPSRC:T}} CXXFLAGS+= -std=gnu++11 CXXFLAGS+= ${CFLAGS:N-std*} +TEST_CFLAGS+= $$(${GTEST_CONFIG} --cppflags) +.for f in ${TEST_SRCS} +CFLAGS.${f}+= ${TEST_CFLAGS} +.endfor + LDADD+= -lcrypto -lpthread -lusb -lz DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ} +TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags) + +GTEST_CONFIG?= gtest-config + +adb_test: ${SRCS:R:S/$/.o/:Nmain.o:Ncommandline.o} ${TEST_SRCS:R:S/$/.o/} + ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD} .include Index: head/devel/android-tools-adb-devel/files/patch-adb_adb__io__test.cpp =================================================================== --- head/devel/android-tools-adb-devel/files/patch-adb_adb__io__test.cpp (nonexistent) +++ head/devel/android-tools-adb-devel/files/patch-adb_adb__io__test.cpp (revision 397252) @@ -0,0 +1,10 @@ +--- adb/adb_io_test.cpp.orig 2015-09-05 00:01:27 UTC ++++ adb/adb_io_test.cpp +@@ -18,6 +18,7 @@ + + #include + ++#include + #include + #include + #include Property changes on: head/devel/android-tools-adb-devel/files/patch-adb_adb__io__test.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/android-tools-adb-devel/files/patch-base_logging__test.cpp =================================================================== --- head/devel/android-tools-adb-devel/files/patch-base_logging__test.cpp (nonexistent) +++ head/devel/android-tools-adb-devel/files/patch-base_logging__test.cpp (revision 397252) @@ -0,0 +1,10 @@ +--- base/logging_test.cpp.orig 2015-09-17 22:58:36 UTC ++++ base/logging_test.cpp +@@ -16,6 +16,7 @@ + + #include "base/logging.h" + ++#include + #include + + #include Property changes on: head/devel/android-tools-adb-devel/files/patch-base_logging__test.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/android-tools-adb-devel/files/patch-base_stringprintf__test.cpp =================================================================== --- head/devel/android-tools-adb-devel/files/patch-base_stringprintf__test.cpp (nonexistent) +++ head/devel/android-tools-adb-devel/files/patch-base_stringprintf__test.cpp (revision 397252) @@ -0,0 +1,10 @@ +--- base/stringprintf_test.cpp.orig 2015-09-17 22:58:36 UTC ++++ base/stringprintf_test.cpp +@@ -18,6 +18,7 @@ + + #include + ++#include + #include + + TEST(StringPrintfTest, HexSizeT) { Property changes on: head/devel/android-tools-adb-devel/files/patch-base_stringprintf__test.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property