i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network prefs: fix jamfiles and include into image.

Browse Source 
* There are some rough edges, but the functions from the existing
preflet are all available now.
This commit is contained in:
Adrien Destugues
2014-10-30 15:49:08 +01:00
parent a0c8a64b47
commit 1508dc5c41
8 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/packages/Haiku
+2
View File
@@ -214,6 +214,8 @@ AddFilesToPackage add-ons mail_daemon outbound_filters : Fortune ;
AddFilesToPackage add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ; AddFilesToPackage add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
AddFilesToPackage add-ons media plugins : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ; AddFilesToPackage add-ons media plugins : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
AddFilesToPackage add-ons Network\ Setup : Interfaces Services ;
AddFilesToPackage add-ons Tracker AddFilesToPackage add-ons Tracker
: FileType Mark\ as… Mark\ as\ Read Open\ Target\ Folder : FileType Mark\ as… Mark\ as\ Read Open\ Target\ Folder
Open\ Terminal ZipOMatic ; Open\ Terminal ZipOMatic ;
src/preferences/network/DialUpAddOn/Jamfile
+2 -2
View File
@@ -1,4 +1,4 @@
SubDir HAIKU_TOP src tests kits net preflet DialUpAddOn ; SubDir HAIKU_TOP src preferences network DialUpAddOn ;
# set some additional defines # set some additional defines
{ {
@@ -15,7 +15,7 @@ SubDir HAIKU_TOP src tests kits net preflet DialUpAddOn ;
UsePrivateHeaders net ; UsePrivateHeaders net ;
# For NetworkSetupAddOn.h, to be moved to private once... # For NetworkSetupAddOn.h, to be moved to private once...
UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libppp headers ] ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libppp headers ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ;
src/preferences/network/DummyAddOn/Jamfile
+3 -3
View File
@@ -1,9 +1,9 @@
SubDir HAIKU_TOP src tests kits net preflet DummyAddOn ; SubDir HAIKU_TOP src preferences network DummyAddOn ;
UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] ;
Addon Dummy : Addon Dummy :
DummyAddOn.cpp DummyAddOn.cpp
: be <nogrist>NetworkSetup [ TargetLibstdc++ ] # $(HAIKU_NETWORK_LIBS) : be <nogrist>Network [ TargetLibstdc++ ] # $(HAIKU_NETWORK_LIBS)
; ;
src/preferences/network/InterfacesAddOn/Jamfile
+3 -3
View File
@@ -1,8 +1,8 @@
SubDir HAIKU_TOP src tests kits net preflet InterfacesAddOn ; SubDir HAIKU_TOP src preferences network InterfacesAddOn ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps networkstatus ] ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps networkstatus ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ;
UsePrivateHeaders net shared ; UsePrivateHeaders net shared ;
@@ -26,7 +26,7 @@ Addon Interfaces :
WirelessNetworkMenuItem.cpp WirelessNetworkMenuItem.cpp
: :
be be
<nogrist>NetworkSetup <nogrist>Network
$(TARGET_NETWORK_LIBS) $(TARGET_NETWORK_LIBS)
libbnetapi.so libbnetapi.so
[ TargetLibsupc++ ] [ TargetLibsupc++ ]
src/preferences/network/Jamfile
+7 -7
View File
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src tests kits net preflet ; SubDir HAIKU_TOP src preferences network ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps networkstatus ] ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps networkstatus ] ;
Preference NetworkSetup : Preference Network :
NetworkSetup.cpp NetworkSetup.cpp
NetworkSetupWindow.cpp NetworkSetupWindow.cpp
NetworkSetupProfile.cpp NetworkSetupProfile.cpp
@@ -15,8 +15,8 @@ Preference NetworkSetup :
: NetworkSetup.rdef : NetworkSetup.rdef
; ;
SubInclude HAIKU_TOP src tests kits net preflet InterfacesAddOn ; SubInclude HAIKU_TOP src preferences network InterfacesAddOn ;
SubInclude HAIKU_TOP src tests kits net preflet ServicesAddOn ; SubInclude HAIKU_TOP src preferences network ServicesAddOn ;
#SubInclude HAIKU_TOP src tests kits net preflet DummyAddOn ; #SubInclude HAIKU_TOP src preferences network DummyAddOn ;
#SubInclude HAIKU_TOP src tests kits net preflet MultipleAddOns ; #SubInclude HAIKU_TOP src preferences network MultipleAddOns ;
#SubInclude HAIKU_TOP src tests kits net preflet DialUpAddOn ; #SubInclude HAIKU_TOP src preferences network DialUpAddOn ;
src/preferences/network/MultipleAddOns/Jamfile
+3 -3
View File
@@ -1,9 +1,9 @@
SubDir HAIKU_TOP src tests kits net preflet MultipleAddOns ; SubDir HAIKU_TOP src preferences network MultipleAddOns ;
UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] ;
Addon Multiple : Addon Multiple :
MultipleAddOn.cpp MultipleAddOn.cpp
: be <nogrist>NetworkSetup [ TargetLibstdc++ ] # $(HAIKU_NETWORK_LIBS) : be <nogrist>Network [ TargetLibstdc++ ] # $(HAIKU_NETWORK_LIBS)
; ;
src/preferences/network/ServicesAddOn/Jamfile
+3 -3
View File
@@ -1,11 +1,11 @@
SubDir HAIKU_TOP src tests kits net preflet ServicesAddOn ; SubDir HAIKU_TOP src preferences network ServicesAddOn ;
UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; UseHeaders [ FDirName $(HAIKU_TOP) src preferences network ] ;
Addon Services : Addon Services :
ServicesAddOn.cpp ServicesAddOn.cpp
DNSSettingsView.cpp DNSSettingsView.cpp
: be <nogrist>NetworkSetup network [ TargetLibstdc++ ] : be <nogrist>Network network [ TargetLibstdc++ ]
; ;
src/tests/kits/net/Jamfile
-1
View File
@@ -39,7 +39,6 @@ SubInclude HAIKU_TOP src tests kits net ipv6 ;
HaikuSubInclude libnetapi ; HaikuSubInclude libnetapi ;
SubInclude HAIKU_TOP src tests kits net multicast ; SubInclude HAIKU_TOP src tests kits net multicast ;
SubInclude HAIKU_TOP src tests kits net netperf ; SubInclude HAIKU_TOP src tests kits net netperf ;
SubInclude HAIKU_TOP src tests kits net preflet ;
SubInclude HAIKU_TOP src tests kits net service ; SubInclude HAIKU_TOP src tests kits net service ;
SubInclude HAIKU_TOP src tests kits net sock ; SubInclude HAIKU_TOP src tests kits net sock ;
SubInclude HAIKU_TOP src tests kits net tcp_shell ; SubInclude HAIKU_TOP src tests kits net tcp_shell ;