From 35d8d4d113fc34ee03e141a7c4c8eb3c7cd03672 Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Wed, 20 Jan 2021 06:46:47 +0000 Subject: [PATCH] libnetapi.so: move deprecated classes out into a libnetservices directory These classes have been moved to the public API too soon, and they need some more time to mature before they can be declared stable. In this first step the classes that are involved, are moved to a separate folder. They will still be linked to libnetapi.so, so that binaries that depend on them currently will not break. Change-Id: I6c16f17573d819314a27936f065ebe675846f763 Reviewed-on: https://review.haiku-os.org/c/haiku/+/3664 Reviewed-by: Adrien Destugues --- src/kits/network/Jamfile | 1 + src/kits/network/libnetapi/Jamfile | 31 +------------ .../DataRequest.cpp | 0 .../FileRequest.cpp | 0 .../GopherRequest.cpp | 0 .../HttpAuthentication.cpp | 0 .../HttpForm.cpp | 0 .../HttpHeaders.cpp | 0 .../HttpRequest.cpp | 0 .../HttpResult.cpp | 0 .../HttpTime.cpp | 0 src/kits/network/libnetservices/Jamfile | 43 +++++++++++++++++++ .../NetworkCookie.cpp | 0 .../NetworkCookieJar.cpp | 0 .../NetworkCookieJarPrivate.h | 0 .../NetworkRequest.cpp | 0 .../UrlContext.cpp | 0 .../UrlProtocolAsynchronousListener.cpp | 0 .../UrlProtocolDispatchingListener.cpp | 0 .../UrlProtocolListener.cpp | 0 .../UrlProtocolRoster.cpp | 0 .../UrlRequest.cpp | 0 .../UrlResult.cpp | 0 .../UrlSynchronousRequest.cpp | 0 24 files changed, 46 insertions(+), 29 deletions(-) rename src/kits/network/{libnetapi => libnetservices}/DataRequest.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/FileRequest.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/GopherRequest.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/HttpAuthentication.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/HttpForm.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/HttpHeaders.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/HttpRequest.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/HttpResult.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/HttpTime.cpp (100%) create mode 100644 src/kits/network/libnetservices/Jamfile rename src/kits/network/{libnetapi => libnetservices}/NetworkCookie.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/NetworkCookieJar.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/NetworkCookieJarPrivate.h (100%) rename src/kits/network/{libnetapi => libnetservices}/NetworkRequest.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/UrlContext.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/UrlProtocolAsynchronousListener.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/UrlProtocolDispatchingListener.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/UrlProtocolListener.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/UrlProtocolRoster.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/UrlRequest.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/UrlResult.cpp (100%) rename src/kits/network/{libnetapi => libnetservices}/UrlSynchronousRequest.cpp (100%) diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile index f05d77a72d..ea77dcc433 100644 --- a/src/kits/network/Jamfile +++ b/src/kits/network/Jamfile @@ -1,3 +1,4 @@ SubDir HAIKU_TOP src kits network ; SubInclude HAIKU_TOP src kits network libnetapi ; +SubInclude HAIKU_TOP src kits network libnetservices ; diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile index 52d2233c42..a08c92b93b 100644 --- a/src/kits/network/libnetapi/Jamfile +++ b/src/kits/network/libnetapi/Jamfile @@ -11,6 +11,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers os add-ons network_settings ] local architectureObject ; for architectureObject in [ MultiArchSubDirSetup ] { on $(architectureObject) { + local architecture = $(TARGET_PACKAGING_ARCH) ; local sslSources ; UsePrivateSystemHeaders ; @@ -41,8 +42,6 @@ for architectureObject in [ MultiArchSubDirSetup ] { NetworkAddress.cpp NetworkAddressResolver.cpp - NetworkCookie.cpp - NetworkCookieJar.cpp NetworkDevice.cpp NetworkInterface.cpp NetworkRoster.cpp @@ -56,36 +55,10 @@ for architectureObject in [ MultiArchSubDirSetup ] { Socket.cpp SocketMessenger.cpp - # TODO: another add-on for file:// (a much simpler one) - FileRequest.cpp - - # TODO: another add-on for gopher:// - GopherRequest.cpp - - # TODO: The HTTP stuff should all go into an add-on. It needs - # linking against libcrypto.so and only the add-on should link - # against it. - DataRequest.cpp - HttpAuthentication.cpp - HttpHeaders.cpp - HttpForm.cpp - HttpRequest.cpp - HttpResult.cpp - HttpTime.cpp - notifications.cpp - NetworkRequest.cpp - UrlContext.cpp - UrlProtocolAsynchronousListener.cpp - UrlProtocolDispatchingListener.cpp - UrlProtocolListener.cpp - UrlProtocolRoster.cpp - UrlRequest.cpp - UrlResult.cpp - UrlSynchronousRequest.cpp - : + netservices.o be shared $(TARGET_NETWORK_LIBS) [ TargetLibstdc++ ] [ TargetLibsupc++ ] [ BuildFeatureAttribute openssl : libraries ] [ BuildFeatureAttribute icu : libraries ] diff --git a/src/kits/network/libnetapi/DataRequest.cpp b/src/kits/network/libnetservices/DataRequest.cpp similarity index 100% rename from src/kits/network/libnetapi/DataRequest.cpp rename to src/kits/network/libnetservices/DataRequest.cpp diff --git a/src/kits/network/libnetapi/FileRequest.cpp b/src/kits/network/libnetservices/FileRequest.cpp similarity index 100% rename from src/kits/network/libnetapi/FileRequest.cpp rename to src/kits/network/libnetservices/FileRequest.cpp diff --git a/src/kits/network/libnetapi/GopherRequest.cpp b/src/kits/network/libnetservices/GopherRequest.cpp similarity index 100% rename from src/kits/network/libnetapi/GopherRequest.cpp rename to src/kits/network/libnetservices/GopherRequest.cpp diff --git a/src/kits/network/libnetapi/HttpAuthentication.cpp b/src/kits/network/libnetservices/HttpAuthentication.cpp similarity index 100% rename from src/kits/network/libnetapi/HttpAuthentication.cpp rename to src/kits/network/libnetservices/HttpAuthentication.cpp diff --git a/src/kits/network/libnetapi/HttpForm.cpp b/src/kits/network/libnetservices/HttpForm.cpp similarity index 100% rename from src/kits/network/libnetapi/HttpForm.cpp rename to src/kits/network/libnetservices/HttpForm.cpp diff --git a/src/kits/network/libnetapi/HttpHeaders.cpp b/src/kits/network/libnetservices/HttpHeaders.cpp similarity index 100% rename from src/kits/network/libnetapi/HttpHeaders.cpp rename to src/kits/network/libnetservices/HttpHeaders.cpp diff --git a/src/kits/network/libnetapi/HttpRequest.cpp b/src/kits/network/libnetservices/HttpRequest.cpp similarity index 100% rename from src/kits/network/libnetapi/HttpRequest.cpp rename to src/kits/network/libnetservices/HttpRequest.cpp diff --git a/src/kits/network/libnetapi/HttpResult.cpp b/src/kits/network/libnetservices/HttpResult.cpp similarity index 100% rename from src/kits/network/libnetapi/HttpResult.cpp rename to src/kits/network/libnetservices/HttpResult.cpp diff --git a/src/kits/network/libnetapi/HttpTime.cpp b/src/kits/network/libnetservices/HttpTime.cpp similarity index 100% rename from src/kits/network/libnetapi/HttpTime.cpp rename to src/kits/network/libnetservices/HttpTime.cpp diff --git a/src/kits/network/libnetservices/Jamfile b/src/kits/network/libnetservices/Jamfile new file mode 100644 index 0000000000..8f24667a46 --- /dev/null +++ b/src/kits/network/libnetservices/Jamfile @@ -0,0 +1,43 @@ +SubDir HAIKU_TOP src kits network libnetservices ; + +UsePrivateHeaders net shared support ; + +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + local architecture = $(TARGET_PACKAGING_ARCH) ; + + MergeObject netservices.o : + # FUTURE: The HTTP stuff should all go into an add-on. It needs + # linking against libcrypto.so and only the add-on should link + # against it. + DataRequest.cpp + HttpAuthentication.cpp + HttpHeaders.cpp + HttpForm.cpp + HttpRequest.cpp + HttpResult.cpp + + # FUTURE: another add-on for file:// (a much simpler one) + FileRequest.cpp + + # FUTURE: another add-on for gopher:// + GopherRequest.cpp + + HttpTime.cpp + NetworkCookie.cpp + NetworkCookieJar.cpp + + NetworkRequest.cpp + UrlContext.cpp + UrlProtocolAsynchronousListener.cpp + UrlProtocolDispatchingListener.cpp + UrlProtocolListener.cpp + UrlProtocolRoster.cpp + UrlRequest.cpp + UrlResult.cpp + UrlSynchronousRequest.cpp + : <$(architecture)>libshared.a + ; + } +} diff --git a/src/kits/network/libnetapi/NetworkCookie.cpp b/src/kits/network/libnetservices/NetworkCookie.cpp similarity index 100% rename from src/kits/network/libnetapi/NetworkCookie.cpp rename to src/kits/network/libnetservices/NetworkCookie.cpp diff --git a/src/kits/network/libnetapi/NetworkCookieJar.cpp b/src/kits/network/libnetservices/NetworkCookieJar.cpp similarity index 100% rename from src/kits/network/libnetapi/NetworkCookieJar.cpp rename to src/kits/network/libnetservices/NetworkCookieJar.cpp diff --git a/src/kits/network/libnetapi/NetworkCookieJarPrivate.h b/src/kits/network/libnetservices/NetworkCookieJarPrivate.h similarity index 100% rename from src/kits/network/libnetapi/NetworkCookieJarPrivate.h rename to src/kits/network/libnetservices/NetworkCookieJarPrivate.h diff --git a/src/kits/network/libnetapi/NetworkRequest.cpp b/src/kits/network/libnetservices/NetworkRequest.cpp similarity index 100% rename from src/kits/network/libnetapi/NetworkRequest.cpp rename to src/kits/network/libnetservices/NetworkRequest.cpp diff --git a/src/kits/network/libnetapi/UrlContext.cpp b/src/kits/network/libnetservices/UrlContext.cpp similarity index 100% rename from src/kits/network/libnetapi/UrlContext.cpp rename to src/kits/network/libnetservices/UrlContext.cpp diff --git a/src/kits/network/libnetapi/UrlProtocolAsynchronousListener.cpp b/src/kits/network/libnetservices/UrlProtocolAsynchronousListener.cpp similarity index 100% rename from src/kits/network/libnetapi/UrlProtocolAsynchronousListener.cpp rename to src/kits/network/libnetservices/UrlProtocolAsynchronousListener.cpp diff --git a/src/kits/network/libnetapi/UrlProtocolDispatchingListener.cpp b/src/kits/network/libnetservices/UrlProtocolDispatchingListener.cpp similarity index 100% rename from src/kits/network/libnetapi/UrlProtocolDispatchingListener.cpp rename to src/kits/network/libnetservices/UrlProtocolDispatchingListener.cpp diff --git a/src/kits/network/libnetapi/UrlProtocolListener.cpp b/src/kits/network/libnetservices/UrlProtocolListener.cpp similarity index 100% rename from src/kits/network/libnetapi/UrlProtocolListener.cpp rename to src/kits/network/libnetservices/UrlProtocolListener.cpp diff --git a/src/kits/network/libnetapi/UrlProtocolRoster.cpp b/src/kits/network/libnetservices/UrlProtocolRoster.cpp similarity index 100% rename from src/kits/network/libnetapi/UrlProtocolRoster.cpp rename to src/kits/network/libnetservices/UrlProtocolRoster.cpp diff --git a/src/kits/network/libnetapi/UrlRequest.cpp b/src/kits/network/libnetservices/UrlRequest.cpp similarity index 100% rename from src/kits/network/libnetapi/UrlRequest.cpp rename to src/kits/network/libnetservices/UrlRequest.cpp diff --git a/src/kits/network/libnetapi/UrlResult.cpp b/src/kits/network/libnetservices/UrlResult.cpp similarity index 100% rename from src/kits/network/libnetapi/UrlResult.cpp rename to src/kits/network/libnetservices/UrlResult.cpp diff --git a/src/kits/network/libnetapi/UrlSynchronousRequest.cpp b/src/kits/network/libnetservices/UrlSynchronousRequest.cpp similarity index 100% rename from src/kits/network/libnetapi/UrlSynchronousRequest.cpp rename to src/kits/network/libnetservices/UrlSynchronousRequest.cpp