From 2c26ad4b39516c9633a0753e2dee444d32ad2328 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 29 Dec 2016 16:30:40 +0100 Subject: [PATCH] move BUrl to the support kit It is used by the media kit, which created a dependency from libmedia to libbnetapi to openssl. It is not entirely specific to the network kit, there are some use cases that don't involve network at all. --- headers/os/{net => support}/Url.h | 0 src/build/libbe/Jamfile | 2 -- src/build/libbe/network/Jamfile | 14 -------------- src/build/libbe/support/Jamfile | 2 ++ src/kits/media/Jamfile | 2 +- src/kits/network/libnetapi/Jamfile | 6 ------ src/kits/support/Jamfile | 8 +++++++- src/kits/{network/libnetapi => support}/Url.cpp | 0 8 files changed, 10 insertions(+), 24 deletions(-) rename headers/os/{net => support}/Url.h (100%) delete mode 100644 src/build/libbe/network/Jamfile rename src/kits/{network/libnetapi => support}/Url.cpp (100%) diff --git a/headers/os/net/Url.h b/headers/os/support/Url.h similarity index 100% rename from headers/os/net/Url.h rename to headers/os/support/Url.h diff --git a/src/build/libbe/Jamfile b/src/build/libbe/Jamfile index 0429a29261..02f6d66456 100644 --- a/src/build/libbe/Jamfile +++ b/src/build/libbe/Jamfile @@ -11,7 +11,6 @@ BuildPlatformSharedLibrary libbe_build.so : app_kit.o icon_kit.o interface_kit.o - network_kit.o storage_kit.o support_kit.o @@ -23,6 +22,5 @@ BuildPlatformSharedLibrary libbe_build.so : SubInclude HAIKU_TOP src build libbe app ; SubInclude HAIKU_TOP src build libbe icon ; SubInclude HAIKU_TOP src build libbe interface ; -SubInclude HAIKU_TOP src build libbe network ; SubInclude HAIKU_TOP src build libbe storage ; SubInclude HAIKU_TOP src build libbe support ; diff --git a/src/build/libbe/network/Jamfile b/src/build/libbe/network/Jamfile deleted file mode 100644 index c621b59b9d..0000000000 --- a/src/build/libbe/network/Jamfile +++ /dev/null @@ -1,14 +0,0 @@ -SubDir HAIKU_TOP src build libbe network ; - -UseHeaders [ FDirName $(HAIKU_TOP) headers os net ] : true ; -UseHeaders [ FDirName $(HAIKU_TOP) headers private shared ] : true ; - -UsePrivateBuildHeaders app interface shared network ; - -USES_BE_API on network_kit.o = true ; - -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits network libnetapi ] ; - -BuildPlatformMergeObjectPIC network_kit.o : - Url.cpp -; diff --git a/src/build/libbe/support/Jamfile b/src/build/libbe/support/Jamfile index 7892cb0788..24ba9e4413 100644 --- a/src/build/libbe/support/Jamfile +++ b/src/build/libbe/support/Jamfile @@ -1,6 +1,7 @@ SubDir HAIKU_TOP src build libbe support ; UsePrivateBuildHeaders app interface shared support ; +UsePrivateObjectHeaders Url.cpp : locale ; USES_BE_API on support_kit.o = true ; @@ -22,5 +23,6 @@ BuildPlatformMergeObjectPIC support_kit.o : Referenceable.cpp String.cpp StringList.cpp + Url.cpp ZlibCompressionAlgorithm.cpp ; diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile index 7d2d0a42af..4e7f4708b4 100644 --- a/src/kits/media/Jamfile +++ b/src/kits/media/Jamfile @@ -99,7 +99,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { StreamerPlugin.cpp WriterPlugin.cpp : - be localestub shared bnetapi + be localestub shared [ TargetLibsupc++ ] [ TargetLibstdc++ ] ; } diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile index 85f508b8d6..999d82538a 100644 --- a/src/kits/network/libnetapi/Jamfile +++ b/src/kits/network/libnetapi/Jamfile @@ -36,11 +36,6 @@ for architectureObject in [ MultiArchSubDirSetup ] { SetupFeatureObjectsDir no-ssl ; } - # BUrl uses ICU to perform IDNA conversions (unicode domain names) - UseBuildFeatureHeaders icu ; - Includes [ FGristFiles Url.cpp ] - : [ BuildFeatureAttribute icu : headers ] ; - SharedLibrary [ MultiArchDefaultGristFiles libbnetapi.so ] : init.cpp DynamicBuffer.cpp @@ -91,7 +86,6 @@ for architectureObject in [ MultiArchSubDirSetup ] { $(md5Sources) NetworkRequest.cpp - Url.cpp UrlContext.cpp UrlProtocolAsynchronousListener.cpp UrlProtocolDispatchingListener.cpp diff --git a/src/kits/support/Jamfile b/src/kits/support/Jamfile index 39f536c654..397e86d309 100644 --- a/src/kits/support/Jamfile +++ b/src/kits/support/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src kits support ; SetSubDirSupportedPlatforms haiku libbe_test ; -UsePrivateHeaders app interface media shared support ; +UsePrivateHeaders app interface locale media shared support ; local architectureObject ; for architectureObject in [ MultiArchSubDirSetup ] { @@ -14,6 +14,11 @@ for architectureObject in [ MultiArchSubDirSetup ] { Includes [ FGristFiles ZlibCompressionAlgorithm.cpp ] : [ BuildFeatureAttribute zlib : headers ] ; + # BUrl uses ICU to perform IDNA conversions (unicode domain names) + UseBuildFeatureHeaders icu ; + Includes [ FGristFiles Url.cpp ] + : [ BuildFeatureAttribute icu : headers ] ; + MergeObject support_kit.o : Architecture.cpp Archivable.cpp @@ -38,6 +43,7 @@ for architectureObject in [ MultiArchSubDirSetup ] { StopWatch.cpp String.cpp StringList.cpp + Url.cpp Uuid.cpp ZlibCompressionAlgorithm.cpp ; diff --git a/src/kits/network/libnetapi/Url.cpp b/src/kits/support/Url.cpp similarity index 100% rename from src/kits/network/libnetapi/Url.cpp rename to src/kits/support/Url.cpp