hrev50799 adds 1 changeset to branch 'master'
old head: 05d0fc8ec3a05b962ab597a657dff8e6dd0dc9f7
new head: 2c26ad4b39516c9633a0753e2dee444d32ad2328
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=2c26ad4b3951+%5E05d0fc8ec3a0
----------------------------------------------------------------------------
2c26ad4b3951: 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.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev50799
Commit: 2c26ad4b39516c9633a0753e2dee444d32ad2328
URL: http://cgit.haiku-os.org/haiku/commit/?id=2c26ad4b3951
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Thu Dec 29 15:30:40 2016 UTC
----------------------------------------------------------------------------
8 files changed, 10 insertions(+), 24 deletions(-)
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
----------------------------------------------------------------------------
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 0429a29..02f6d66 100644
--- a/src/build/libbe/Jamfile
+++ b/src/build/libbe/Jamfile
@@ -11,7 +11,6 @@ BuildPlatformSharedLibrary libbe_build.so :
<libbe_build>app_kit.o
<libbe_build>icon_kit.o
<libbe_build>interface_kit.o
- <libbe_build>network_kit.o
<libbe_build>storage_kit.o
<libbe_build>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 c621b59..0000000
--- 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 <libbe_build>network_kit.o = true ;
-
-SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits network libnetapi ] ;
-
-BuildPlatformMergeObjectPIC <libbe_build>network_kit.o :
- Url.cpp
-;
diff --git a/src/build/libbe/support/Jamfile b/src/build/libbe/support/Jamfile
index 7892cb0..24ba9e4 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 <libbe_build>support_kit.o = true ;
@@ -22,5 +23,6 @@ BuildPlatformMergeObjectPIC <libbe_build>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 7d2d0a4..4e7f470 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 85f508b..999d825 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 39f536c..397e86d 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 <libbe!$(architecture)>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
