Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- created a new pseudotarget 'install-userland-networking' that installs all

Browse Source 
userland-networking files into a convenient place for easier testing:
  + net_server_driver and net_stack_driver are installed to 
    /boot/home/config/add-ons/kernel/drivers/bin and ../dev/net
  + net_stack_tester, ifconfig, arp and route are installed to 
    $(HAIKU_TEST_DIR)/kits/net/userland
  + libsocket, libnet, libbind and libnetapi are installed to 
    $(HAIKU_TEST_DIR)/kits/net/userland/lib
  + userland add-ons are installed to
    $(HAIKU_TEST_DIR)/kits/net/userland/add-ons/obos_network


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17701 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe 2006-06-02 17:08:19 +00:00
parent 2252921311
commit b0623e48ef
21 changed files with 180 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/kits/network/compat/libbind/Jamfile
View File

@ -205,6 +205,11 @@ HaikuInstallRelSymLink install-networking
: libbind.so
: installed-networking-test ;
HaikuInstallRelSymLink install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland lib ]
: libbind.so
: installed-userland-networking ;
Package haiku-networkingkit-cvs :
libbind.so :
# boot home config lib ;

5
src/kits/network/compat/libnet/Jamfile
View File

@ -108,6 +108,11 @@ HaikuInstallRelSymLink install-networking
: libnet.so
: installed-networking-test ;
HaikuInstallRelSymLink install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland lib ]
: libnet.so
: installed-userland-networking ;
Package haiku-networkingkit-cvs :
libnet.so :
# boot home config lib ;

5
src/kits/network/compat/libnetapi/Jamfile
View File

@ -38,6 +38,11 @@ HaikuInstallRelSymLink install-networking
: libnetapi.so
: installed-networking-test ;
HaikuInstallRelSymLink install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland lib ]
: libnetapi.so
: installed-userland-networking ;
Package haiku-networkingkit-cvs :
libnetapi.so :
# boot home config lib ;

5
src/kits/network/compat/libsocket/Jamfile
View File

@ -27,6 +27,11 @@ HaikuInstallRelSymLink install-networking
: libsocket.so
: installed-networking-test ;
HaikuInstallRelSymLink install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland lib ]
: libsocket.so
: installed-userland-networking ;
Package haiku-networkingkit-cvs :
libsocket.so :
# boot home config lib ;

9
src/kits/network/compat/libsocket/socket.c
View File

@ -363,9 +363,8 @@ static char * stack_driver_path(void) {
// user-defined stack driver path?
path = getenv("NET_STACK_DRIVER_PATH");
if (path)
return path;
// use the default stack driver path
return NET_STACK_DRIVER_PATH;
if (!path)
path = NET_STACK_DRIVER_PATH;
printf("net-stack-driver-path = %s\n", path);
return path;
}

76
src/tests/add-ons/kernel/network/Jamfile
View File

@ -7,55 +7,53 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
UsePrivateHeaders net ;
# the network stack tester app
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system libroot os ] ;
SimpleTest <installed>net_stack_tester :
SimpleTest net_stack_tester :
net_stack_tester.cpp
userland_ipc.c
userland_modules.cpp
: be
;
{
# symlink the userland add-ons dir to the dir where the net_stack_tester
# lives
# TODO: We don't have a "distro" tree (including the add-on dir) anymore.
local dir = [ on net_stack_tester return $(LOCATE) ] ;
# MakeLocate <network-add-ons>userland : $(HAIKU_ADDON_DIR) ;
# MakeLocate <network-add-ons>add-ons : $(dir) ;
# RelSymLink <network-add-ons>add-ons : <network-add-ons>userland : false ;
# alias for the net_stack_tester the modules link against
LOCATE on <installed>net_stack_tester = $(dir) ;
# Depends <installed>net_stack_tester
# : net_stack_tester <network-add-ons>add-ons ;
}
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland ]
: net_stack_tester
: installed-userland-networking
;
# for convenience: this target builds all userland modules
NotFile userland_network_modules ;
Depends userland_network_modules :
# the stack main module
<userland>core
SEARCH_SOURCE = [ FDirName $(HAIKU_TOP) src bin arp ] ;
SimpleTest <userland>arp :
arp.c
: <installed-userland-networking>libbind.so
<installed-userland-networking>libsocket.so
$(SELECT_UNAME_ETC_LIB)
;
# interfaces modules
<userland>loopback
<userland>ethernet
<userland>ppp
SEARCH_SOURCE = [ FDirName $(HAIKU_TOP) src bin ifconfig ] ;
SimpleTest <userland>ifconfig :
ifconfig.c
: <installed-userland-networking>libbind.so
<installed-userland-networking>libsocket.so
;
# ppp modules
<userland>ipcp
<userland>modem
<userland>pap
<userland>pppoe
SEARCH_SOURCE = [ FDirName $(HAIKU_TOP) src bin route ] ;
SimpleTest <userland-bin>route :
keywords.c
route.c
show.c
: <installed-userland-networking>libbind.so
<installed-userland-networking>libnet.so
<installed-userland-networking>libsocket.so
$(SELECT_UNAME_ETC_LIB)
;
# protocols modules
<userland>raw
<userland>route
<userland>ipv4
<userland>icmp
<userland>udp
<userland>tcp
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland ]
: <userland>arp
<userland>ifconfig
<userland-bin>route
: installed-userland-networking-bin
;
SubInclude HAIKU_TOP src tests add-ons kernel network core ;

8
src/tests/add-ons/kernel/network/core/Jamfile
View File

@ -26,5 +26,11 @@ Addon <userland>core : userland obos_network :
socket.c
;
LinkAgainst <userland>core : <installed>net_stack_tester ;
LinkAgainst <userland>core : <installed-userland-networking>net_stack_tester ;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network ]
: <userland>core
: installed-userland-networking
;

2
src/tests/add-ons/kernel/network/interfaces/Jamfile
View File

@ -3,5 +3,3 @@ SubDir HAIKU_TOP src tests add-ons kernel network interfaces ;
SubInclude HAIKU_TOP src tests add-ons kernel network interfaces ethernet ;
SubInclude HAIKU_TOP src tests add-ons kernel network interfaces loopback ;
SubInclude HAIKU_TOP src tests add-ons kernel network interfaces ppp ;

8
src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile
View File

@ -12,5 +12,11 @@ Addon <userland>ethernet : userland obos_network interfaces :
ethernet.c
;
LinkAgainst <userland>ethernet : <installed>net_stack_tester ;
LinkAgainst <userland>ethernet : <installed-userland-networking>net_stack_tester ;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network interfaces ]
: <userland>ethernet
: installed-userland-networking
;

8
src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile
View File

@ -12,5 +12,11 @@ Addon <userland>loopback : userland obos_network interfaces :
loopback.c
;
LinkAgainst <userland>loopback : <installed>net_stack_tester ;
LinkAgainst <userland>loopback : <installed-userland-networking>net_stack_tester ;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network interfaces ]
: <userland>loopback
: installed-userland-networking
;

11
src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile
View File

@ -14,5 +14,14 @@ Addon <userland>ppp : userland obos_network interfaces :
PPPManager.cpp
;
LinkAgainst <userland>ppp : <userland>libkernelppp.a <installed>net_stack_tester be ;
LinkAgainst <userland>ppp
: <userland>libkernelppp.a
<installed-userland-networking>net_stack_tester be
;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network interfaces ]
: <userland>ppp
: installed-userland-networking
;

8
src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile
View File

@ -16,8 +16,14 @@ Addon <userland>ipcp : userland obos_network ppp :
LinkAgainst <userland>ipcp :
<userland>libkernelppp.a
<installed>net_stack_tester
<installed-userland-networking>net_stack_tester
be
libbind.so
;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network ppp ]
: <userland>ipcp
: installed-userland-networking
;

12
src/tests/add-ons/kernel/network/ppp/modem/Jamfile
View File

@ -15,5 +15,15 @@ Addon <userland>modem : userland obos_network ppp :
ACFCHandler.cpp
;
LinkAgainst <userland>modem : <userland>libkernelppp.a <installed>net_stack_tester be ;
LinkAgainst <userland>modem
: <userland>libkernelppp.a
<installed-userland-networking>net_stack_tester
be
;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network ppp ]
: <userland>modem
: installed-userland-networking
;

12
src/tests/add-ons/kernel/network/ppp/pap/Jamfile
View File

@ -14,5 +14,15 @@ Addon <userland>pap : userland obos_network ppp :
Protocol.cpp
;
LinkAgainst <userland>pap : <userland>libkernelppp.a <installed>net_stack_tester be ;
LinkAgainst <userland>pap
: <userland>libkernelppp.a
<installed-userland-networking>net_stack_tester
be
;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network ppp ]
: <userland>pap
: installed-userland-networking
;

12
src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile
View File

@ -15,5 +15,15 @@ Addon <userland>pppoe : userland obos_network ppp :
DiscoveryPacket.cpp
;
LinkAgainst <userland>pppoe : <userland>libkernelppp.a <installed>net_stack_tester be ;
LinkAgainst <userland>pppoe
: <userland>libkernelppp.a
<installed-userland-networking>net_stack_tester
be
;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network ppp ]
: <userland>pppoe
: installed-userland-networking
;

9
src/tests/add-ons/kernel/network/protocols/icmp/Jamfile
View File

@ -12,4 +12,11 @@ Addon <userland>icmp : userland obos_network protocols :
icmp.c
;
LinkAgainst <userland>icmp : <installed>net_stack_tester ;
LinkAgainst <userland>icmp : <installed-userland-networking>net_stack_tester ;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ]
: <userland>icmp
: installed-userland-networking
;

9
src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile
View File

@ -12,4 +12,11 @@ Addon <userland>ipv4 : userland obos_network protocols :
ipv4.c
;
LinkAgainst <userland>ipv4 : <installed>net_stack_tester ;
LinkAgainst <userland>ipv4 : <installed-userland-networking>net_stack_tester ;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ]
: <userland>ipv4
: installed-userland-networking
;

9
src/tests/add-ons/kernel/network/protocols/raw/Jamfile
View File

@ -12,4 +12,11 @@ Addon <userland>raw : userland obos_network protocols :
raw.c
;
LinkAgainst <userland>raw : <installed>net_stack_tester ;
LinkAgainst <userland>raw : <installed-userland-networking>net_stack_tester ;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ]
: <userland>raw
: installed-userland-networking
;

9
src/tests/add-ons/kernel/network/protocols/route/Jamfile
View File

@ -12,4 +12,11 @@ Addon <userland>route : userland obos_network protocols :
route.c
;
LinkAgainst <userland>route : <installed>net_stack_tester ;
LinkAgainst <userland>route : <installed-userland-networking>net_stack_tester ;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ]
: <userland>route
: installed-userland-networking
;

9
src/tests/add-ons/kernel/network/protocols/tcp/Jamfile
View File

@ -17,4 +17,11 @@ Addon <userland>tcp : userland obos_network protocols :
arc4random.c
;
LinkAgainst <userland>tcp : <installed>net_stack_tester ;
LinkAgainst <userland>tcp : <installed-userland-networking>net_stack_tester ;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ]
: <userland>tcp
: installed-userland-networking
;

9
src/tests/add-ons/kernel/network/protocols/udp/Jamfile
View File

@ -12,4 +12,11 @@ Addon <userland>udp : userland obos_network protocols :
udp.c
;
LinkAgainst <userland>udp : <installed>net_stack_tester ;
LinkAgainst <userland>udp : <installed-userland-networking>net_stack_tester ;
# Installation -- in the test directory for the time being
HaikuInstall install-userland-networking
: [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ]
: <userland>udp
: installed-userland-networking
;