diff --git a/build/fbcode_builder/specs/proxygen.py b/build/fbcode_builder/specs/proxygen.py index b937e425a..182cd551c 100644 --- a/build/fbcode_builder/specs/proxygen.py +++ b/build/fbcode_builder/specs/proxygen.py @@ -7,14 +7,17 @@ from __future__ import unicode_literals import specs.folly as folly import specs.fizz as fizz +import specs.mvfst as mvfst import specs.sodium as sodium import specs.wangle as wangle +import specs.zstd as zstd def fbcode_builder_spec(builder): + builder.add_option( + "proxygen/proxygen:cmake_defines", {"BUILD_QUIC": "OFF", "BUILD_TESTS": "ON"} + ) return { - 'depends_on': [folly, wangle, fizz, sodium], - 'steps': [ - builder.fb_github_autoconf_install('proxygen/proxygen'), - ], + "depends_on": [folly, wangle, fizz, sodium, zstd, mvfst], + "steps": [builder.fb_github_cmake_install("proxygen/proxygen", "..")], } diff --git a/build/fbcode_builder/specs/proxygen_quic.py b/build/fbcode_builder/specs/proxygen_quic.py index 8918bd2d4..5c27ee54c 100644 --- a/build/fbcode_builder/specs/proxygen_quic.py +++ b/build/fbcode_builder/specs/proxygen_quic.py @@ -14,7 +14,9 @@ import specs.zstd as zstd def fbcode_builder_spec(builder): - builder.add_option("proxygen/proxygen:cmake_defines", {"BUILD_QUIC": "ON"}) + builder.add_option( + "proxygen/proxygen:cmake_defines", {"BUILD_QUIC": "ON", "BUILD_TESTS": "ON"} + ) return { "depends_on": [folly, wangle, fizz, sodium, zstd, mvfst], "steps": [builder.fb_github_cmake_install("proxygen/proxygen", "..")], diff --git a/build/fbcode_builder_config.py b/build/fbcode_builder_config.py index 9ad4ddaba..d216fe991 100644 --- a/build/fbcode_builder_config.py +++ b/build/fbcode_builder_config.py @@ -5,7 +5,6 @@ from __future__ import absolute_import, division, print_function, unicode_litera import specs.fizz as fizz import specs.folly as folly import specs.mvfst as mvfst -import specs.proxygen as proxygen import specs.proxygen_quic as proxygen_quic import specs.sodium as sodium import specs.wangle as wangle @@ -18,20 +17,11 @@ from shell_quoting import ShellQuoted def fbcode_builder_spec(builder): return { - "depends_on": [ - folly, - wangle, - fizz, - sodium, - zstd, - mvfst, - proxygen_quic, - proxygen, - ], + "depends_on": [folly, wangle, fizz, sodium, zstd, mvfst, proxygen_quic], "steps": [ - # Tests for the legacy build with no QUIC/HTTP3 + # Tests for the full build with no QUIC/HTTP3 # Proxygen is the last step, so we are still in its working dir. - builder.step("Run proxygen tests", [builder.run(ShellQuoted("make check"))]) + builder.step("Run proxygen tests", [builder.run(ShellQuoted("make test"))]) ], } diff --git a/proxygen/Makefile.am b/proxygen/Makefile.am deleted file mode 100644 index 3515c6251..000000000 --- a/proxygen/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = lib httpserver httpclient external diff --git a/proxygen/external/Makefile.am b/proxygen/external/Makefile.am deleted file mode 100644 index d04d2577a..000000000 --- a/proxygen/external/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -externalincludedir = $(pkgincludedir)/external -externallibdir = $(pkglibdir)/external - -externallib_LTLIBRARIES = libhttpparser.la - -libhttpparser_la_SOURCES = \ - http_parser/http_parser_cpp.cpp -nobase_externalinclude_HEADERS = \ - http_parser/http_parser.h diff --git a/proxygen/httpclient/Makefile.am b/proxygen/httpclient/Makefile.am deleted file mode 100644 index 010a0ea81..000000000 --- a/proxygen/httpclient/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = samples diff --git a/proxygen/httpclient/samples/Makefile.am b/proxygen/httpclient/samples/Makefile.am deleted file mode 100644 index 598431ef9..000000000 --- a/proxygen/httpclient/samples/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = curl diff --git a/proxygen/httpclient/samples/curl/Makefile.am b/proxygen/httpclient/samples/curl/Makefile.am deleted file mode 100644 index 7e17bbe2d..000000000 --- a/proxygen/httpclient/samples/curl/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -lib_LTLIBRARIES = libproxygencurl.la - -libproxygencurldir = $(includedir)/proxygen/httpclient/samples/curl -nobase_libproxygencurl_HEADERS = \ - CurlClient.h - -libproxygencurl_la_SOURCES = \ - CurlClient.cpp - -libproxygencurl_la_LIBADD = \ - ../../../lib/libproxygenlib.la \ - ../../../lib/http/libproxygenhttp.la - -libproxygencurl_la_LDFLAGS=-static - -noinst_PROGRAMS = curl - -curl_SOURCES = \ - CurlClientMain.cpp - -curl_LDADD = \ - libproxygencurl.la diff --git a/proxygen/httpserver/Makefile.am b/proxygen/httpserver/Makefile.am deleted file mode 100644 index aa1b7ae53..000000000 --- a/proxygen/httpserver/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . samples tests - -lib_LTLIBRARIES = libproxygenhttpserver.la - -libproxygenhttpserverdir = $(includedir)/proxygen/httpserver -nobase_libproxygenhttpserver_HEADERS = \ - filters/CompressionFilter.h \ - filters/DirectResponseHandler.h \ - filters/RejectConnectFilter.h \ - Filters.h \ - HTTPServer.h \ - HTTPServerAcceptor.h \ - HTTPServerOptions.h \ - Mocks.h \ - PushHandler.h \ - RequestHandler.h \ - RequestHandlerAdaptor.h \ - RequestHandlerFactory.h \ - ResponseBuilder.h \ - ResponseHandler.h \ - ScopedHTTPServer.h \ - SignalHandler.h - -libproxygenhttpserver_la_SOURCES = \ - HTTPServer.cpp \ - HTTPServerAcceptor.cpp \ - RequestHandlerAdaptor.cpp \ - SignalHandler.cpp - -libproxygenhttpserver_la_LIBADD = \ - ../lib/libproxygenlib.la diff --git a/proxygen/httpserver/filters/tests/Makefile.am b/proxygen/httpserver/filters/tests/Makefile.am deleted file mode 100644 index 56b045443..000000000 --- a/proxygen/httpserver/filters/tests/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -check_PROGRAMS = HTTPServerFilterTests -HTTPServerTests_SOURCES = \ - ZlibServerFilterTest.cpp - -HTTPServerTests_LDADD = \ - ../libproxygenhttpserver.la \ - ../../lib/test/libtestmain.la - -TESTS = HTTPServerFilterTests diff --git a/proxygen/httpserver/samples/Makefile.am b/proxygen/httpserver/samples/Makefile.am deleted file mode 100644 index ea3cae14e..000000000 --- a/proxygen/httpserver/samples/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = echo proxy push static diff --git a/proxygen/httpserver/samples/echo/Makefile.am b/proxygen/httpserver/samples/echo/Makefile.am deleted file mode 100644 index f09a3ccfa..000000000 --- a/proxygen/httpserver/samples/echo/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -noinst_PROGRAMS = echo_server - -echo_server_SOURCES = \ - EchoHandler.cpp \ - EchoServer.cpp - -echo_server_LDADD = \ - ../../libproxygenhttpserver.la diff --git a/proxygen/httpserver/samples/proxy/Makefile.am b/proxygen/httpserver/samples/proxy/Makefile.am deleted file mode 100644 index c98529963..000000000 --- a/proxygen/httpserver/samples/proxy/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -noinst_PROGRAMS = proxy_server - -proxy_server_SOURCES = \ - ProxyHandler.cpp \ - ProxyServer.cpp - -proxy_server_LDADD = \ - ../../libproxygenhttpserver.la \ - ../../../lib/http/libproxygenhttp.la diff --git a/proxygen/httpserver/samples/push/Makefile.am b/proxygen/httpserver/samples/push/Makefile.am deleted file mode 100644 index 57b5670a3..000000000 --- a/proxygen/httpserver/samples/push/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -noinst_PROGRAMS = push_server - -push_server_SOURCES = \ - PushRequestHandler.cpp \ - PushServer.cpp - -push_server_LDADD = \ - ../../libproxygenhttpserver.la diff --git a/proxygen/httpserver/samples/static/Makefile.am b/proxygen/httpserver/samples/static/Makefile.am deleted file mode 100644 index dd105c5a5..000000000 --- a/proxygen/httpserver/samples/static/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -noinst_PROGRAMS = static_server - -static_server_SOURCES = \ - StaticHandler.cpp \ - StaticServer.cpp - -static_server_LDADD = \ - ../../libproxygenhttpserver.la diff --git a/proxygen/httpserver/tests/Makefile.am b/proxygen/httpserver/tests/Makefile.am deleted file mode 100644 index fa3027f69..000000000 --- a/proxygen/httpserver/tests/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -check_PROGRAMS = HTTPServerTests -HTTPServerTests_SOURCES = \ - HTTPServerTest.cpp - -HTTPServerTests_LDADD = \ - ../libproxygenhttpserver.la \ - ../../lib/test/libtestmain.la \ - ../../httpclient/samples/curl/libproxygencurl.la - -TESTS = HTTPServerTests diff --git a/proxygen/lib/Makefile.am b/proxygen/lib/Makefile.am deleted file mode 100644 index b4ef11972..000000000 --- a/proxygen/lib/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = test utils services http - -lib_LTLIBRARIES = libproxygenlib.la - -libproxygenlib_la_SOURCES = -nodist_EXTRA_libproxygenlib_la_SOURCES = dummy.cpp -libproxygenlib_la_LIBADD = \ - http/libproxygenhttp.la \ - services/libproxygenservices.la \ - utils/libutils.la - -libproxygenlib_la_LDFLAGS=-static diff --git a/proxygen/lib/http/Makefile.am b/proxygen/lib/http/Makefile.am deleted file mode 100644 index fd456caf6..000000000 --- a/proxygen/lib/http/Makefile.am +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . codec connpool session test - -BUILT_SOURCES = HTTPCommonHeaders.h HTTPCommonHeaders.cpp - -HTTPCommonHeaders.h: HTTPCommonHeaders.template.h HTTPCommonHeaders.txt - FBCODE_DIR=$(top_srcdir)/.. INSTALL_DIR=$(srcdir) HEADERS_LIST=$(srcdir)/HTTPCommonHeaders.txt ./gen_HTTPCommonHeaders.h.sh - -HTTPCommonHeaders.cpp: HTTPCommonHeaders.template.gperf HTTPCommonHeaders.txt - FBCODE_DIR=$(top_srcdir)/.. INSTALL_DIR=$(srcdir) HEADERS_LIST=$(srcdir)/HTTPCommonHeaders.txt ./gen_HTTPCommonHeaders.cpp.sh - -noinst_LTLIBRARIES = libproxygenhttp.la - -libproxygenhttpdir = $(includedir)/proxygen/lib/http -nobase_libproxygenhttp_HEADERS = \ - HTTPCommonHeaders.h \ - HTTPConnector.h \ - HTTPConstants.h \ - HTTPException.h \ - HTTPHeaderSize.h \ - HTTPHeaders.h \ - HTTPMessage.h \ - HTTPMessageFilters.h \ - HTTPMethod.h \ - ProxygenErrorEnum.h \ - experimental/RFC1867.h \ - RFC2616.h \ - Window.h \ - codec/CodecDictionaries.h \ - codec/CodecProtocol.h \ - codec/DefaultHTTPCodecFactory.h \ - codec/ErrorCode.h \ - codec/FlowControlFilter.h \ - codec/HTTP1xCodec.h \ - codec/HTTPChecks.h \ - codec/HTTPCodec.h \ - codec/HTTPCodecFactory.h \ - codec/HTTPCodecFilter.h \ - codec/HTTPCodecPrinter.h \ - codec/HTTPSettings.h \ - codec/SPDYCodec.h \ - codec/HTTPParallelCodec.h \ - codec/SPDYConstants.h \ - codec/CodecUtil.h \ - codec/SPDYVersion.h \ - codec/SPDYVersionSettings.h \ - codec/SettingsId.h \ - codec/TransportDirection.h \ - codec/compress/CompressionInfo.h \ - codec/compress/GzipHeaderCodec.h \ - codec/compress/HeaderIndexingStrategy.h \ - codec/compress/HPACKCodec.h \ - codec/compress/HPACKConstants.h \ - codec/compress/HPACKContext.h \ - codec/compress/HPACKDecodeBuffer.h \ - codec/compress/HPACKDecoder.h \ - codec/compress/HPACKDecoderBase.h \ - codec/compress/HPACKEncodeBuffer.h \ - codec/compress/HPACKEncoder.h \ - codec/compress/HPACKEncoderBase.h \ - codec/compress/HPACKHeader.h \ - codec/compress/HPACKHeaderName.h \ - codec/compress/HPACKStreamingCallback.h \ - codec/compress/Header.h \ - codec/compress/HeaderCodec.h \ - codec/compress/HeaderPiece.h \ - codec/compress/HeaderTable.h \ - codec/compress/Huffman.h \ - codec/compress/Logging.h \ - codec/compress/NoPathIndexingStrategy.h \ - codec/compress/QPACKCodec.h \ - codec/compress/QPACKContext.h \ - codec/compress/QPACKDecoder.h \ - codec/compress/QPACKEncoder.h \ - codec/compress/QPACKHeaderTable.h \ - codec/compress/QPACKStaticHeaderTable.h \ - codec/compress/StaticHeaderTable.h \ - codec/HeaderConstants.h \ - codec/HeaderDecodeInfo.h \ - codec/HTTPRequestVerifier.h \ - codec/HTTP2Codec.h \ - codec/HTTP2Constants.h \ - codec/HTTP2Framer.h \ - connpool/ServerIdleSessionController.h \ - connpool/SessionHolder.h \ - connpool/SessionPool.h \ - connpool/ThreadIdleSessionController.h \ - session/AckLatencyEvent.h \ - session/ByteEventTracker.h \ - session/ByteEvents.h \ - session/CodecErrorResponseHandler.h \ - session/HTTPDefaultSessionCodecFactory.h \ - session/HTTPDirectResponseHandler.h \ - session/HTTPDownstreamSession.h \ - session/HTTPErrorPage.h \ - session/HTTPEvent.h \ - session/HTTPSession.h \ - session/HTTPSessionAcceptor.h \ - session/HTTPSessionBase.h \ - session/HTTPSessionController.h \ - session/HTTPSessionStats.h \ - session/HTTPTransaction.h \ - session/HTTPTransactionEgressSM.h \ - session/HTTPTransactionIngressSM.h \ - session/HTTPUpstreamSession.h \ - session/HTTP2PriorityQueue.h \ - session/SecondaryAuthManager.h \ - session/SecondaryAuthManagerBase.h \ - session/SimpleController.h \ - session/TTLBAStats.h \ - session/TransportFilter.h - -libproxygenhttp_la_SOURCES = \ - HTTPCommonHeaders.cpp \ - codec/CodecProtocol.cpp \ - codec/DefaultHTTPCodecFactory.cpp \ - codec/compress/GzipHeaderCodec.cpp \ - codec/compress/HeaderIndexingStrategy.cpp \ - codec/compress/HeaderTable.cpp \ - codec/compress/HPACKCodec.cpp \ - codec/compress/HPACKContext.cpp \ - codec/compress/HPACKDecodeBuffer.cpp \ - codec/compress/HPACKDecoder.cpp \ - codec/compress/HPACKDecoderBase.cpp \ - codec/compress/HPACKEncodeBuffer.cpp \ - codec/compress/HPACKEncoder.cpp \ - codec/compress/HPACKEncoderBase.cpp \ - codec/compress/HPACKHeader.cpp \ - codec/compress/Huffman.cpp \ - codec/compress/NoPathIndexingStrategy.cpp \ - codec/compress/Logging.cpp \ - codec/compress/QPACKCodec.cpp \ - codec/compress/QPACKContext.cpp \ - codec/compress/QPACKDecoder.cpp \ - codec/compress/QPACKEncoder.cpp \ - codec/compress/QPACKHeaderTable.cpp \ - codec/compress/QPACKStaticHeaderTable.cpp \ - codec/compress/StaticHeaderTable.cpp \ - codec/ErrorCode.cpp \ - codec/HeaderConstants.cpp \ - codec/HeaderDecodeInfo.cpp \ - codec/HTTP2Codec.cpp \ - codec/HTTP2Constants.cpp \ - codec/HTTP2Framer.cpp \ - codec/FlowControlFilter.cpp \ - codec/HTTP1xCodec.cpp \ - codec/HTTPChecks.cpp \ - codec/HTTPCodecFactory.cpp \ - codec/HTTPCodecFilter.cpp \ - codec/HTTPCodecPrinter.cpp \ - codec/HTTPSettings.cpp \ - codec/SPDYCodec.cpp \ - codec/HTTPParallelCodec.cpp \ - codec/SPDYConstants.cpp \ - codec/CodecUtil.cpp \ - codec/TransportDirection.cpp \ - connpool/ServerIdleSessionController.cpp \ - connpool/SessionHolder.cpp \ - connpool/SessionPool.cpp \ - connpool/ThreadIdleSessionController.cpp \ - HTTPConnector.cpp \ - HTTPConstants.cpp \ - HTTPException.cpp \ - HTTPHeaders.cpp \ - HTTPMessage.cpp \ - HTTPMethod.cpp \ - ProxygenErrorEnum.cpp \ - experimental/RFC1867.cpp \ - RFC2616.cpp \ - session/ByteEvents.cpp \ - session/CodecErrorResponseHandler.cpp \ - session/HTTPDefaultSessionCodecFactory.cpp \ - session/HTTPDirectResponseHandler.cpp \ - session/HTTPDownstreamSession.cpp \ - session/HTTPErrorPage.cpp \ - session/HTTPEvent.cpp \ - session/HTTPSessionAcceptor.cpp \ - session/HTTPSessionBase.cpp \ - session/HTTPSession.cpp \ - session/HTTPTransaction.cpp \ - session/HTTPTransactionEgressSM.cpp \ - session/HTTPTransactionIngressSM.cpp \ - session/HTTPUpstreamSession.cpp \ - session/HTTP2PriorityQueue.cpp \ - session/ByteEventTracker.cpp \ - session/SecondaryAuthManager.cpp \ - session/SimpleController.cpp \ - session/TransportFilter.cpp \ - Window.cpp - -libproxygenhttp_la_LIBADD = \ - ../services/libproxygenservices.la \ - ../utils/libutils.la - -noinst_PROGRAMS = CompressionSimulator - -CompressionSimulator_SOURCES = \ - codec/compress/test/HTTPArchive.cpp \ - codec/compress/experimental/simulator/Main.cpp \ - codec/compress/experimental/simulator/CompressionSimulator.cpp \ - codec/compress/experimental/simulator/CompressionUtils.cpp - -CompressionSimulatordir = $(includedir)/proxygen/lib/http/codec/compress/experimental/simulator -CompressionSimulator_HEADERS = \ - codec/compress/test/HTTPArchive.h \ - codec/compress/experimental/simulator/CompressionScheme.h \ - codec/compress/experimental/simulator/CompressionSimulator.h \ - codec/compress/experimental/simulator/CompressionTypes.h \ - codec/compress/experimental/simulator/CompressionUtils.h \ - codec/compress/experimental/simulator/HPACKScheme.h \ - codec/compress/experimental/simulator/QPACKScheme.h \ - codec/compress/experimental/simulator/SimStreamingCallback.h - -CompressionSimulator_LDADD = \ - libproxygenhttp.la \ - ../services/libproxygenservices.la diff --git a/proxygen/lib/http/codec/Makefile.am b/proxygen/lib/http/codec/Makefile.am deleted file mode 100644 index 7d676466c..000000000 --- a/proxygen/lib/http/codec/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . compress test diff --git a/proxygen/lib/http/codec/compress/Makefile.am b/proxygen/lib/http/codec/compress/Makefile.am deleted file mode 100644 index 5b42223fa..000000000 --- a/proxygen/lib/http/codec/compress/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . test diff --git a/proxygen/lib/http/codec/compress/test/Makefile.am b/proxygen/lib/http/codec/compress/test/Makefile.am deleted file mode 100644 index 6e45d1055..000000000 --- a/proxygen/lib/http/codec/compress/test/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -check_LTLIBRARIES = libhpacktestutils.la -libhpacktestutils_la_SOURCES = TestUtil.cpp - -libhpacktestutilsdir = $(includedir)/proxygen/lib/http/codec/compress/test -nobase_libhpacktestutils_HEADERS = TestUtil.h - -check_PROGRAMS = HPACKTests -HPACKTests_SOURCES = \ - HPACKBufferTests.cpp \ - HPACKCodecTests.cpp \ - HPACKContextTests.cpp \ - HPACKHeaderTests.cpp \ - HeaderPieceTests.cpp \ - HeaderTableTests.cpp \ - HuffmanTests.cpp \ - LoggingTests.cpp \ - QPACKCodecTests.cpp \ - QPACKContextTests.cpp \ - QPACKHeaderTableTests.cpp \ - RFCExamplesTests.cpp - -HPACKTests_LDADD = \ - ../../../libproxygenhttp.la \ - ../../../../utils/libutils.la \ - libhpacktestutils.la \ - ../../../../test/libtestmain.la - -TESTS = HPACKTests diff --git a/proxygen/lib/http/codec/test/Makefile.am b/proxygen/lib/http/codec/test/Makefile.am deleted file mode 100644 index 52d3449e7..000000000 --- a/proxygen/lib/http/codec/test/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -check_LTLIBRARIES = libcodectestutils.la -libcodectestutils_la_SOURCES = TestUtils.cpp - -libcodectestutilsdir = $(includedir)/proxygen/lib/http/codec/test -nobase_libcodectestutils_HEADERS = TestUtils.h - -check_PROGRAMS = CodecTests -CodecTests_SOURCES = \ - FilterTests.cpp \ - SPDYCodecTest.cpp \ - HTTP1xCodecTest.cpp \ - HTTP2CodecTest.cpp \ - HTTP2FramerTest.cpp \ - DefaultHTTPCodecFactoryTest.cpp - -CodecTests_LDADD = \ - ../../libproxygenhttp.la \ - ../../../utils/libutils.la \ - libcodectestutils.la \ - ../../../test/libtestmain.la - -TESTS = CodecTests diff --git a/proxygen/lib/http/connpool/Makefile.am b/proxygen/lib/http/connpool/Makefile.am deleted file mode 100644 index 5b42223fa..000000000 --- a/proxygen/lib/http/connpool/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . test diff --git a/proxygen/lib/http/connpool/test/Makefile.am b/proxygen/lib/http/connpool/test/Makefile.am deleted file mode 100644 index df5f354f6..000000000 --- a/proxygen/lib/http/connpool/test/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -check_PROGRAMS = SessionPoolTest -SessionPoolTest_SOURCES = SessionPoolTest.cpp - -SessionPoolTest_LDADD = \ - ../../libproxygenhttp.la \ - ../../../services/libproxygenservices.la \ - ../../../test/libtesttransport.la \ - ../../../test/libgmockgtest.la \ - ../../../utils/libutils.la - -TESTS = SessionPoolTest diff --git a/proxygen/lib/http/session/Makefile.am b/proxygen/lib/http/session/Makefile.am deleted file mode 100644 index 5b42223fa..000000000 --- a/proxygen/lib/http/session/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . test diff --git a/proxygen/lib/http/session/test/Makefile.am b/proxygen/lib/http/session/test/Makefile.am deleted file mode 100644 index 4dbb47be8..000000000 --- a/proxygen/lib/http/session/test/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -check_PROGRAMS = SessionTests -SessionTests_SOURCES = \ - HTTPTransactionSMTest.cpp \ - DownstreamTransactionTest.cpp \ - HTTPDownstreamSessionTest.cpp \ - HTTPSessionAcceptorTest.cpp \ - HTTPUpstreamSessionTest.cpp \ - HTTP2PriorityQueueTest.cpp \ - MockCodecDownstreamTest.cpp \ - HTTPDefaultSessionCodecFactoryTest.cpp \ - TestUtils.cpp - -SessionTests_LDADD = \ - ../../../services/libproxygenservices.la \ - ../../../test/libtestmain.la \ - ../../../test/libtesttransport.la \ - ../../../utils/libutils.la \ - ../../codec/test/libcodectestutils.la \ - ../../libproxygenhttp.la - -TESTS = SessionTests diff --git a/proxygen/lib/http/test/Makefile.am b/proxygen/lib/http/test/Makefile.am deleted file mode 100644 index f96f7c6d4..000000000 --- a/proxygen/lib/http/test/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -check_PROGRAMS = LibHTTPTests -LibHTTPTests_SOURCES = \ - HTTPCommonHeadersTests.cpp \ - HTTPMessageTest.cpp \ - RFC2616Test.cpp \ - WindowTest.cpp - -LibHTTPTests_LDADD = \ - ../libproxygenhttp.la \ - ../../utils/libutils.la \ - ../../test/libtestmain.la - -TESTS = LibHTTPTests diff --git a/proxygen/lib/services/Makefile.am b/proxygen/lib/services/Makefile.am deleted file mode 100644 index aa4c0d657..000000000 --- a/proxygen/lib/services/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -noinst_LTLIBRARIES = libproxygenservices.la - -libproxygenservicesdir = $(includedir)/proxygen/lib/services -nobase_libproxygenservices_HEADERS = \ - AcceptorConfiguration.h \ - HTTPAcceptor.h \ - RequestWorkerThread.h \ - Service.h \ - ServiceConfiguration.h \ - ServiceWorker.h \ - WorkerThread.h - -libproxygenservices_la_SOURCES = \ - RequestWorkerThread.cpp \ - Service.cpp \ - WorkerThread.cpp diff --git a/proxygen/lib/test/Makefile.am b/proxygen/lib/test/Makefile.am deleted file mode 100644 index e638f7b58..000000000 --- a/proxygen/lib/test/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -BUILT_SOURCES = googletest-release-1.8.0/googletest/src/gtest-all.cc - -release-1.8.0.zip: - wget https://github.com/google/googletest/archive/release-1.8.0.zip - -# The SHA1 test is in a separate rule from the fetch, because otherwise -# `make` would run `sha1sum` **before** wget. We'd re-extract the archive -# without `touch`, since the contents' timestamps are older than the zip's. -googletest-release-1.8.0/googletest/src/gtest-all.cc: release-1.8.0.zip - [ "$(shell sha1sum release-1.8.0.zip | awk '{print $$1}')" == \ - "667f873ab7a4d246062565fad32fb6d8e203ee73" ] - unzip release-1.8.0.zip - touch googletest-release-1.8.0/googletest/src/gtest-all.cc - - -check_LTLIBRARIES = libtesttransport.la -libtesttransport_la_SOURCES = TestAsyncTransport.cpp - -libtesttransportdir = $(includedir)/proxygen/lib/test -nobase_libtesttransport_HEADERS = TestAsyncTransport.h - -# libgmockgtest.la is gmock + gtest - -check_LTLIBRARIES += libgmockgtest.la -libgmockgtest_la_CPPFLAGS = -Igoogletest-release-1.8.0/googletest -Igoogletest-release-1.8.0/googlemock -Igoogletest-release-1.8.0/googletest/include -Igoogletest-release-1.8.0/googlemock/include -lglog - -libgmockgtest_la_SOURCES = \ - googletest-release-1.8.0/googletest/src/gtest-all.cc \ - googletest-release-1.8.0/googlemock/src/gmock-all.cc - -check_LTLIBRARIES += libtestmain.la -libtestmain_la_SOURCES = TestMain.cpp -libtestmain_la_LIBADD = libgmockgtest.la diff --git a/proxygen/lib/utils/Makefile.am b/proxygen/lib/utils/Makefile.am deleted file mode 100644 index cfd746548..000000000 --- a/proxygen/lib/utils/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . test - -BUILT_SOURCES = TraceEventType.h TraceEventType.cpp TraceFieldType.h TraceFieldType.cpp - -TraceGen: samples/TraceEventType.txt samples/TraceFieldType.txt - python gen_trace_event_constants.py \ - --output_type=cpp \ - --input_files=samples/TraceEventType.txt,samples/TraceFieldType.txt \ - --output_scope=proxygen \ - --header_path=proxygen/lib/utils \ - --install_dir=$(srcdir) \ - --fbcode_dir=$(srcdir) - touch TraceGen - -TraceEventType.h: TraceGen - -TraceEventType.cpp: TraceGen - -TraceFieldType.h: TraceGen - -TraceFieldType.cpp: TraceGen - -noinst_LTLIBRARIES = libutils.la - -# We put the generated files first so that we create them first -libutilsdir = $(includedir)/proxygen/lib/utils -nobase_libutils_HEADERS = \ - AsyncTimeoutSet.h \ - Base64.h \ - CobHelper.h \ - CryptUtil.h \ - Exception.h \ - Export.h \ - FilterChain.h \ - HTTPTime.h \ - ParseURL.h \ - StateMachine.h \ - TestUtils.h \ - Time.h \ - TraceEvent.h \ - TraceEventContext.h \ - TraceEventObserver.h \ - TraceEventType.h \ - TraceFieldType.h \ - RendezvousHash.h \ - ConsistentHash.h \ - URL.h \ - UtilInl.h \ - Logging.h \ - ZlibStreamCompressor.h \ - ZlibStreamDecompressor.h \ - WheelTimerInstance.h - -# We put the generated files first so that we create them first -libutils_la_SOURCES = \ - ../../external/http_parser/http_parser_cpp.cpp \ - AsyncTimeoutSet.cpp \ - Base64.cpp \ - Exception.cpp \ - HTTPTime.cpp \ - TraceEventContext.cpp \ - ParseURL.cpp \ - TraceEvent.cpp \ - TraceEventType.cpp \ - TraceFieldType.cpp \ - RendezvousHash.cpp \ - Logging.cpp \ - CryptUtil.cpp \ - ZlibStreamCompressor.cpp \ - ZlibStreamDecompressor.cpp \ - WheelTimerInstance.cpp diff --git a/proxygen/lib/utils/test/Makefile.am b/proxygen/lib/utils/test/Makefile.am deleted file mode 100644 index 0d78470d6..000000000 --- a/proxygen/lib/utils/test/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -SUBDIRS = . - -check_PROGRAMS = UtilTests TraceEventTest AsyncTimeoutSetTest - -UtilTests_SOURCES = \ - GenericFilterTest.cpp \ - HTTPTimeTest.cpp \ - ParseURLTest.cpp \ - UtilTest.cpp - -UtilTests_LDADD = \ - ../libutils.la \ - ../../test/libtestmain.la - -TraceEventTest_SOURCES = \ - TraceEventTest.cpp - -TraceEventTest_LDADD = \ - ../libutils.la \ - ../../test/libtestmain.la - -AsyncTimeoutSetTest_SOURCES = \ - AsyncTimeoutSetTest.cpp - -AsyncTimeoutSetTest_LDADD = \ - ../libutils.la \ - ../../test/libtestmain.la - -TESTS = UtilTests TraceEventTest AsyncTimeoutSetTest