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

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

src/kits/network/compat/libbind/Jamfile

@@ -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 ;

src/kits/network/compat/libnet/Jamfile

@@ -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 ;

src/kits/network/compat/libnetapi/Jamfile

@@ -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 ;

src/kits/network/compat/libsocket/Jamfile

@@ -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 ;

src/kits/network/compat/libsocket/socket.c

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

src/tests/add-ons/kernel/network/Jamfile

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

src/tests/add-ons/kernel/network/core/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/interfaces/Jamfile

@@ -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 ;
-
-

src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/ppp/modem/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/ppp/pap/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/protocols/icmp/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/protocols/raw/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/protocols/route/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/protocols/tcp/Jamfile

@@ -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
+;

src/tests/add-ons/kernel/network/protocols/udp/Jamfile

@@ -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
+;