Jam: Remove BinCommand, Executable, Server and Preference rules

They are all equivalent to the Application rule. Let's make things simpler.

Change-Id: I71f8518dae275542019d95fbdd7548b2129eeca8
Reviewed-on: https://review.haiku-os.org/c/haiku/+/9237
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>

build/jam/MainBuildRules

@@ -41,9 +41,9 @@ rule AddSharedObjectGlueCode
 	}
 }
 
-rule Executable
+rule Application
 {
-	# Executable <name> : <sources> : <libraries> : <res> ;
+	# Application <name> : <sources> : <libraries> : <res> ;
 	#
 	if ! [ IsPlatformSupportedForTarget $(1) ] {
 		return ;
@@ -60,18 +60,6 @@ rule Executable
 	AddSharedObjectGlueCode $(1) : true ;
 }
 
-rule Application
-{
-	# Application <name> : <sources> : <libraries> : <res> ;
-	Executable $(1) : $(2) : $(3) : $(4) ;
-}
-
-rule BinCommand
-{
-	# BinCommand <name> : <sources> : <libraries> : <res> ;
-	Executable $(1) : $(2) : $(3) : $(4) ;
-}
-
 rule StdBinCommands
 {
 	# StdBinCommands <sources> : <libs> : <res> ;
@@ -82,23 +70,10 @@ rule StdBinCommands
 	{
 		local target = $(source:S=) ;
 
-		BinCommand $(target) : $(source) : $(libs) : $(ress) ;
+		Application $(target) : $(source) : $(libs) : $(ress) ;
 	}
 }
 
-rule Preference
-{
-	# Preference <name> : <sources> : <libraries> : <res> ;
-	Executable $(1) : $(2) : $(3) : $(4) ;
-}
-
-rule Server
-{
-	# Server <name> : <sources> : <libraries> : <res> ;
-
-	Executable $(1) : $(2) : $(3) : $(4) ;
-}
-
 rule Addon target : sources : libraries : isExecutable
 {
 	# Addon <target> : <sources> : <is executable> : <libraries> ;

build/jam/TestsRules

@@ -98,7 +98,7 @@ rule SimpleTest
 		DEBUG on $(1) [ FGristFiles $(2:S=$(SUFOBJ)) ] ?= 1 ;
 	}
 
-	Executable $(1) : $(2) : $(3) : $(4) ;
+	Application $(1) : $(2) : $(3) : $(4) ;
 }
 
 

src/apps/drivesetup/Jamfile

@@ -4,7 +4,7 @@ AddSubDirSupportedPlatforms libbe_test ;
 
 UsePrivateHeaders interface shared storage tracker ;
 
-Preference DriveSetup :
+Application DriveSetup :
 	AbstractParametersPanel.cpp
 	ChangeParametersPanel.cpp
 	CreateParametersPanel.cpp

src/bin/acpi_call/Jamfile

@@ -3,6 +3,6 @@ SubDir HAIKU_TOP src bin acpi_call ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) add-ons kernel bus_managers acpi acpica include ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) add-ons kernel bus_managers acpi acpica include platform ] ;
 
-BinCommand acpi_call :
+Application acpi_call :
 	acpi_call.cpp
 	;

src/bin/addattr/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src bin addattr ;
 
-BinCommand addattr :
+Application addattr :
 	main.cpp
 	addAttr.cpp
 	: be

src/bin/cddb_lookup/Jamfile

@@ -4,7 +4,7 @@ UsePrivateHeaders drivers ;
 
 AddResources cddb_lookup : cddb_lookup.rdef ;
 
-BinCommand cddb_lookup :
+Application cddb_lookup :
 	cddb_lookup.cpp
 	cddb_server.cpp
 	: be bnetapi [ TargetLibsupc++ ]

src/bin/debug/Jamfile

@@ -7,7 +7,7 @@ UsePrivateSystemHeaders ;
 
 StaticLibrary <bin>debug_utils.a : debug_utils.cpp ;
 
-BinCommand kernel_debugger : kernel_debugger.cpp
+Application kernel_debugger : kernel_debugger.cpp
 	:
 	[ TargetLibsupc++ ]
 ;

src/bin/debug/ltrace/Jamfile

@@ -6,7 +6,7 @@ UsePrivateHeaders runtime_loader ;
 UsePrivateHeaders shared ;
 UsePrivateSystemHeaders ;
 
-BinCommand ltrace
+Application ltrace
 	:
 	ltrace.cpp
 ;

src/bin/debug/profile/Jamfile

@@ -8,7 +8,7 @@ UsePrivateSystemHeaders ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
 
-BinCommand profile
+Application profile
 	:
 	BasicProfileResult.cpp
 	CallgrindProfileResult.cpp

src/bin/debug/scheduling_recorder/Jamfile

@@ -5,7 +5,7 @@ UsePrivateSystemHeaders ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
 
-BinCommand scheduling_recorder
+Application scheduling_recorder
 	:
 	scheduling_recorder.cpp
 	:

src/bin/debug/strace/Jamfile

@@ -57,7 +57,7 @@ for i in $(straceSyscallsIndices) {
 		: GET_SYSCALLS=get_syscalls$(i) SYSCALLS_CHUNK_$(i) ;
 }
 
-BinCommand strace : $(straceSources)
+Application strace : $(straceSources)
 	:
 	$(straceSyscallsObjects)
 	<bin>debug_utils.a

src/bin/debug/time_stats/Jamfile

@@ -7,7 +7,7 @@ UsePrivateSystemHeaders ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
 
-BinCommand time_stats
+Application time_stats
 	:
 	scheduling_analysis.cpp
 	time_stats.cpp

src/bin/desklink/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin desklink ;
 
 UsePrivateHeaders app interface shared ;
 
-BinCommand desklink :
+Application desklink :
 	desklink.cpp
 	DeskButton.cpp
 	MediaReplicant.cpp

src/bin/fwcontrol/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src bin fwcontrol ;
 UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
 UsePrivateHeaders firewire ;
 
-BinCommand fwcontrol :
+Application fwcontrol :
 	eui64.c
 	fwcrom.c
 	fwdv.c

src/bin/hid_decode/Jamfile

@@ -9,7 +9,7 @@ SubDirC++Flags $(defines) ;
 UsePrivateHeaders drivers ;
 UseHeaders $(driverDir) ;
 
-BinCommand hid_decode :
+Application hid_decode :
 	HIDCollection.cpp
 	HIDParser.cpp
 	HIDReport.cpp

src/bin/i2c/Jamfile

@@ -2,6 +2,6 @@ SubDir HAIKU_TOP src bin i2c ;
 
 UsePrivateHeaders i2c shared ;
 
-BinCommand <bin>i2c :
+Application <bin>i2c :
 	i2c.cpp
 ;

src/bin/keymap/Jamfile

@@ -4,7 +4,7 @@ UsePrivateHeaders shared storage ;
 
 SubDirSysHdrs $(HAIKU_TOP) headers compatibility bsd ;
 
-BinCommand keymap :
+Application keymap :
 	main.cpp
 	Keymap.cpp
 	: be shared [ TargetLibsupc++ ]

src/bin/keystore/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src bin keystore ;
 
-BinCommand keystore :
+Application keystore :
 	keystore.cpp
 	: be
 	: keystore.rdef ;

src/bin/listdev/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src bin listdev ;
 UsePrivateHeaders shared ;
 UsePrivateSystemHeaders ;
 
-BinCommand listdev :
+Application listdev :
 	dm_wrapper.c
 	listdev.cpp
 ;

src/bin/listusb/Jamfile

@@ -4,7 +4,7 @@ UsePrivateHeaders shared usb ;
 UsePrivateHeaders drivers ;
 UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers usb ] ;
 
-BinCommand listusb :
+Application listusb :
 	listusb.cpp
 	usb_audio.cpp
 	usb_video.cpp

src/bin/locale/Jamfile

@@ -5,11 +5,11 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits tracker ] ;
 UsePublicHeaders locale ;
 UsePrivateHeaders locale shared ;
 
-BinCommand collectcatkeys : collectcatkeys.cpp RegExp.cpp 
+Application collectcatkeys : collectcatkeys.cpp RegExp.cpp 
 	: be localestub [ TargetLibsupc++ ] ;
 
-BinCommand linkcatkeys : linkcatkeys.cpp : be  [ TargetLibstdc++ ] ;
+Application linkcatkeys : linkcatkeys.cpp : be  [ TargetLibstdc++ ] ;
 
-BinCommand dumpcatalog : dumpcatalog.cpp : be  [ TargetLibsupc++ ] ;
+Application dumpcatalog : dumpcatalog.cpp : be  [ TargetLibsupc++ ] ;
 
-BinCommand locale : locale.cpp : be [ TargetLibsupc++ ] ;
+Application locale : locale.cpp : be [ TargetLibsupc++ ] ;

src/bin/makebootable/platform/atari_m68k/Jamfile

@@ -1,3 +1,3 @@
 SubDir HAIKU_TOP src bin makebootable platform atari_m68k ;
 
-BinCommand makebootable : makebootable.cpp ;
+Application makebootable : makebootable.cpp ;

src/bin/makebootable/platform/bios_ia32/Jamfile

@@ -8,4 +8,4 @@ UsePrivateSystemHeaders ;
 # write the stage 1 boot loader into the makebootable resources
 AddFileDataResource makebootable : RAWT:666:BootCode : stage1.bin ;
 
-BinCommand makebootable : makebootable.cpp : be [ TargetLibsupc++ ] ;
+Application makebootable : makebootable.cpp : be [ TargetLibsupc++ ] ;

src/bin/makebootable/platform/efi/Jamfile

@@ -1,3 +1,3 @@
 SubDir HAIKU_TOP src bin makebootable platform efi ;
 
-BinCommand makebootable : makebootable.cpp ;
+Application makebootable : makebootable.cpp ;

src/bin/makebootable/platform/openfirmware/Jamfile

@@ -1,3 +1,3 @@
 SubDir HAIKU_TOP src bin makebootable platform openfirmware ;
 
-BinCommand makebootable : makebootable.cpp ;
+Application makebootable : makebootable.cpp ;

src/bin/makebootable/platform/pxe_ia32/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src bin makebootable platform pxe_ia32 ;
 # write the stage 1 boot loader into the makebootable resources
 AddFileDataResource makebootable : RAWT:666:BootCode : stage1.bin ;
 
-BinCommand makebootable : makebootable.cpp : be [ TargetLibsupc++ ] ;
+Application makebootable : makebootable.cpp : be [ TargetLibsupc++ ] ;
 
 SEARCH on [ FGristFiles makebootable.cpp ]
 	= [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ;

src/bin/makebootable/platform/u-boot/Jamfile

@@ -1,3 +1,3 @@
 SubDir HAIKU_TOP src bin makebootable platform u-boot ;
 
-BinCommand makebootable : makebootable.cpp ;
+Application makebootable : makebootable.cpp ;

src/bin/mkfs/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src bin mkfs ;
 UsePrivateHeaders shared ;
 UsePrivateHeaders storage ;
 
-BinCommand mkfs :
+Application mkfs :
 	   main.cpp
 	   FsCreator.cpp
 	   : be [ TargetLibstdc++ ] ;

src/bin/multiuser/Jamfile

@@ -10,21 +10,21 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
 
 StaticLibrary libmultiuser_utils.a : multiuser_utils.cpp ;
 
-BinCommand login : login.cpp : libmultiuser_utils.a libbsd.so ;
+Application login : login.cpp : libmultiuser_utils.a libbsd.so ;
 
-BinCommand su : su.cpp : libmultiuser_utils.a libbsd.so ;
+Application su : su.cpp : libmultiuser_utils.a libbsd.so ;
 
-BinCommand passwd : passwd.cpp : libmultiuser_utils.a libbsd.so ;
+Application passwd : passwd.cpp : libmultiuser_utils.a libbsd.so ;
 
-BinCommand useradd : useradd.cpp ;
+Application useradd : useradd.cpp ;
 
-BinCommand userdel : userdel.cpp ;
+Application userdel : userdel.cpp ;
 
-BinCommand groupadd : groupadd.cpp ;
+Application groupadd : groupadd.cpp ;
 
-BinCommand groupdel : groupdel.cpp ;
+Application groupdel : groupdel.cpp ;
 
-BinCommand groupmod : groupmod.cpp : [ TargetLibstdc++ ] ;
+Application groupmod : groupmod.cpp : [ TargetLibstdc++ ] ;
 
 # set set-uid bit on passwd, su
 MODE on passwd = 04755 ;

src/bin/network/arp/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src bin network arp ;
 UsePrivateHeaders net ;
 UsePrivateSystemHeaders ;
 
-BinCommand arp :
+Application arp :
 	arp.cpp
 	: $(TARGET_NETWORK_LIBS) $(TARGET_SELECT_UNAME_ETC_LIB) ;
 

src/bin/network/ftpd/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src bin network ftpd ;
 UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
 UseHeaders $(SUBDIR) : true ;
 
-BinCommand ftpd :
+Application ftpd :
 	ftpd.c
 	ftpcmd.y
 	logwtmp.c

src/bin/network/ifconfig/Jamfile

@@ -5,7 +5,7 @@ UsePrivateHeaders net ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat ] : true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
 
-BinCommand ifconfig :
+Application ifconfig :
 	ifconfig.cpp
 	MediaTypes.cpp
 	: be network bnetapi [ TargetLibstdc++ ]

src/bin/network/mount_nfs/Jamfile

@@ -4,7 +4,7 @@ UsePrivateHeaders net ;
 
 #AddResources mount_nfs : mount_nfs.rdef ;
 
-BinCommand mount_nfs :
+Application mount_nfs :
 	mount_nfs.cpp
 	: libnetwork.so [ TargetLibsupc++ ]
 ;

src/bin/network/netstat/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src bin network netstat ;
 UsePrivateHeaders net ;
 UsePrivateSystemHeaders ;	# for syscalls.h
 
-BinCommand netstat :
+Application netstat :
 	netstat.cpp
 	: libnetwork.so
 ;

src/bin/network/ping/Jamfile

@@ -4,7 +4,7 @@ SubDirSysHdrs $(HAIKU_TOP) headers compatibility bsd ;
 
 DEFINES += INET INET6 ;
 
-BinCommand ping :
+Application ping :
 	main.c
 	ping.c
 	ping6.c

src/bin/network/ppp_up/Jamfile

@@ -11,7 +11,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared
 
 AddResources ppp_up : ppp_up.rdef ;
 
-BinCommand ppp_up :
+Application ppp_up :
 	ConnectionView.cpp
 	ConnectionWindow.cpp
 	PPPDeskbarReplicant.cpp

src/bin/network/pppconfig/Jamfile

@@ -7,7 +7,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libppp
 UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared
 	libkernelppp headers ] : true ;
 
-BinCommand pppconfig :
+Application pppconfig :
 	pppconfig.cpp
 	:
 	be libppp.a [ TargetLibsupc++ ] libbsd.so $(TARGET_NETWORK_LIBS)

src/bin/network/route/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin network route ;
 
 UsePrivateHeaders net ;
 
-BinCommand route :
+Application route :
 	route.cpp
 	: be libnetwork.so libbnetapi.so
 ;

src/bin/network/telnet/Jamfile

@@ -24,7 +24,7 @@ Includes [ FGristFiles $(sources) ]
 	: [ BuildFeatureAttribute ncurses : headers ] ;
 
 
-BinCommand telnet :
+Application telnet :
 	$(sources)
 	: [ BuildFeatureAttribute ncurses : library ] libtelnet.a libutil.a
 	libbsd.so $(TARGET_NETWORK_LIBS)

src/bin/network/telnetd/Jamfile

@@ -23,7 +23,7 @@ Includes [ FGristFiles $(sources) ]
 	: [ BuildFeatureAttribute ncurses : headers ] ;
 
 
-BinCommand telnetd :
+Application telnetd :
 	$(sources)
 	: [ BuildFeatureAttribute ncurses : library ] libtelnet.a libutil.a
 	libbsd.so $(TARGET_NETWORK_LIBS)

src/bin/network/traceroute/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin network traceroute ;
 
 SubDirSysHdrs $(HAIKU_TOP) headers compatibility bsd ;
 
-BinCommand traceroute :
+Application traceroute :
 	as.c
 	findsaddr-haiku.c
 	ifaddrlist.c

src/bin/package/Jamfile

@@ -6,7 +6,7 @@ if [ FIsBuildFeatureEnabled zstd ] {
 	SubDirC++Flags -DZSTD_DEFAULT ;
 }
 
-BinCommand package :
+Application package :
 	command_add.cpp
 	command_checksum.cpp
 	command_create.cpp

src/bin/package_repo/Jamfile

@@ -4,7 +4,7 @@ UsePrivateHeaders kernel shared ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) src bin package ] ;
 
-BinCommand package_repo :
+Application package_repo :
 	command_create.cpp
 	command_list.cpp
 	command_update.cpp

src/bin/pc/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src bin pc ;
 
-BinCommand pc :
+Application pc :
 	pc.c
 ;
 

src/bin/pcmcia-cs/Jamfile

@@ -13,7 +13,7 @@ StdBinCommands
 	dump_cisreg.c
 	: root ;
 
-BinCommand pack_cis :
+Application pack_cis :
 	pack_cis.c
 	lex_cis.l
 	yacc_cis.y

src/bin/pkgman/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src bin pkgman ;
 
 UsePrivateHeaders shared storage support ;
 
-BinCommand pkgman :
+Application pkgman :
 	Command.cpp
 	command_add_repo.cpp
 	command_drop_repo.cpp

src/bin/query/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src bin query ;
 
-BinCommand query :
+Application query :
 	query.cpp FilteredQuery.cpp
 	: be [ TargetLibstdc++ ] : $(haiku-utils_rsrc) ;
 

src/bin/rc/Jamfile

@@ -7,7 +7,7 @@ SubDirC++Flags -Wno-sign-compare -Wno-unused ;
 StaticLibrary librdef.a :
 	compile.cpp decompile.cpp lexer.l parser.y rdef.cpp ;
 
-BinCommand rc :
+Application rc :
 	rc.cpp
 	: librdef.a [ TargetLibstdc++ ] be
 ;

src/bin/screen_blanker/Jamfile

@@ -5,7 +5,7 @@ UseHeaders [ FDirName headers os add-ons screen_saver ] ;
 
 UsePrivateHeaders interface screen_saver ;
 
-BinCommand screen_blanker :
+Application screen_blanker :
 	ScreenBlanker.cpp
 	ScreenSaverWindow.cpp
 	PasswordWindow.cpp

src/bin/screenmode/Jamfile

@@ -6,7 +6,7 @@ UsePrivateHeaders [ FDirName graphics radeon ] ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src preferences screen ] ;
 
-BinCommand screenmode :
+Application screenmode :
 	screenmode.cpp
 
 	# from Screen preferences

src/preferences/appearance/Jamfile

@@ -4,7 +4,7 @@ AddSubDirSupportedPlatforms libbe_test ;
 
 UsePrivateHeaders shared app interface [ FDirName servers app ] ;
 
-Preference Appearance :
+Application Appearance :
 	AntialiasingSettingsView.cpp
 	Appearance.cpp
 	AppearanceWindow.cpp

src/preferences/backgrounds/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences backgrounds ;
 
 UsePrivateHeaders preferences shared ;
 
-Preference Backgrounds :
+Application Backgrounds :
 	BackgroundImage.cpp
 	Backgrounds.cpp
 	BackgroundsView.cpp

src/preferences/bluetooth/Jamfile

@@ -5,7 +5,7 @@ UsePrivateHeaders shared ;
 
 AddResources Bluetooth : Bluetooth.rdef ;
 
-Preference Bluetooth :
+Application Bluetooth :
 	BluetoothDeviceView.cpp
 	BluetoothMain.cpp
 	BluetoothSettings.cpp

src/preferences/datatranslations/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences datatranslations ;
 
 UsePrivateHeaders shared ;
 
-Preference DataTranslations :
+Application DataTranslations :
 	DataTranslations.cpp
 	DataTranslationsWindow.cpp
 	DataTranslationsSettings.cpp

src/preferences/deskbar/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences deskbar ;
 
 SubDirSysHdrs $(HAIKU_TOP) src apps deskbar ;
 
-Preference <preference>Deskbar
+Application <preference>Deskbar
 	:
 	DeskbarPreferences.cpp
 	:

src/preferences/filetypes/Jamfile

@@ -6,7 +6,7 @@ UseLibraryHeaders icon ;
 UsePrivateHeaders shared tracker ;
 SubDirSysHdrs $(HAIKU_TOP) src kits tracker ;
 
-Preference FileTypes :
+Application FileTypes :
 	FileTypes.cpp
 	FileTypesWindow.cpp
 	ApplicationTypesWindow.cpp

src/preferences/input/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences input ;
 
 UsePrivateHeaders input ;
 
-Preference Input :
+Application Input :
 	Input.cpp
 	InputDeviceView.cpp
 	InputIcons.cpp

src/preferences/joysticks/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src preferences joysticks ;
 
-Preference Joysticks :
+Application Joysticks :
 	CalibWin.cpp
 	JoyWin.cpp
 	Joysticks.cpp

src/preferences/keymap/Jamfile

@@ -10,7 +10,7 @@ Includes [ FGristFiles KeymapWindow.cpp ] : <keymap-locale>KeymapNames.h ;
 Includes [ FGristFiles KeymapWindow.cpp ]
 	: <keyboard-layout-locale>KeyboardLayoutNames.h ;
 
-Preference Keymap :
+Application Keymap :
 	KeyboardLayout.cpp
 	KeyboardLayoutView.cpp
 	Keymap.cpp

src/preferences/locale/Jamfile

@@ -9,7 +9,7 @@ local sources =
 	FormatSettingsView.cpp
 ;
 
-Preference Locale
+Application Locale
 	: $(sources)
 	: be [ TargetLibstdc++ ] [ TargetLibsupc++ ] shared
 		localestub

src/preferences/mail/Jamfile

@@ -19,7 +19,7 @@ local sources =
 
 AddResources E-mail : e-mail.rdef ;
 
-Preference E-mail
+Application E-mail
 	:
 	$(sources)
 	:

src/preferences/media/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences media ;
 
 UsePrivateHeaders media midi shared ;
 
-Preference Media :
+Application Media :
 	Media.cpp
 	MediaIcons.cpp
 	MediaListItem.cpp

src/preferences/network/Jamfile

@@ -6,7 +6,7 @@ UsePrivateHeaders net shared storage ;
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps networkstatus ]
 	[ FDirName $(HAIKU_TOP) src bin network ifconfig ] ;
 
-Preference Network :
+Application Network :
 	Network.cpp
 	NetworkWindow.cpp
 	NetworkProfile.cpp

src/preferences/printers/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences printers ;
 
 UsePrivateHeaders shared print ;
 
-Preference Printers :
+Application Printers :
 	AddPrinterDialog.cpp
 	Printers.cpp
 	PrintersWindow.cpp

src/preferences/repositories/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src preferences repositories ;
 UsePrivateHeaders interface ;
 UsePrivateHeaders package ;
 
-Preference Repositories :
+Application Repositories :
 	AddRepoWindow.cpp
 	RepoRow.cpp
 	Repositories.cpp

src/preferences/screen/Jamfile

@@ -6,7 +6,7 @@ UsePrivateHeaders [ FDirName graphics common ] ;
 UsePrivateHeaders [ FDirName graphics radeon ] ;
 UsePrivateHeaders interface preferences ;
 
-Preference Screen :
+Application Screen :
 	AlertWindow.cpp
 	MonitorView.cpp
 	multimon.cpp

src/preferences/screensaver/Jamfile

@@ -6,7 +6,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers os add-ons screen_saver ] : true ;
 UsePrivateHeaders screen_saver ;
 SubDirSysHdrs $(SUBDIR) ;
 
-Preference ScreenSaver :
+Application ScreenSaver :
 	ScreenSaverApp.cpp
 	ScreenSaverWindow.cpp
 	PasswordWindow.cpp

src/preferences/shortcuts/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src preferences shortcuts ;
 UsePrivateHeaders interface ;
 UseHeaders [ FDirName $(HAIKU_TOP) src add-ons input_server filters shortcut_catcher ] ;
 
-Preference Shortcuts :
+Application Shortcuts :
 	main.cpp
 	MetaKeyStateMap.cpp
 	ShortcutsApp.cpp

src/preferences/sounds/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences sounds ;
 
 UsePrivateHeaders interface ;
 
-Preference Sounds :
+Application Sounds :
 	HApp.cpp
 	HWindow.cpp
 	HEventList.cpp

src/preferences/time/Jamfile

@@ -25,7 +25,7 @@ Includes [ FGristFiles $(sources) ] : [ BuildFeatureAttribute icu : headers ] ;
 	# Dependency needed to trigger downloading/unzipping the package before
 	# compiling the files.
 
-Preference Time
+Application Time
 	: $(sources)
 	: be bnetapi network shared [ TargetLibstdc++ ] localestub
 	: Time.rdef

src/preferences/tracker/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src preferences tracker ;
 
-Preference <preference>Tracker
+Application <preference>Tracker
 	:
 	TrackerPreferences.cpp
 	:

src/preferences/virtualmemory/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences virtualmemory ;
 
 UsePrivateHeaders shared system ;
 
-Preference VirtualMemory :
+Application VirtualMemory :
 	VirtualMemory.cpp
 	SettingsWindow.cpp
 	Settings.cpp

src/servers/app/Jamfile

@@ -55,7 +55,7 @@ if [ FIsBuildFeatureEnabled fontconfig ] {
 	: [ BuildFeatureAttribute freetype : headers ] ;
 }
 
-Server app_server :
+Application app_server :
 	Angle.cpp
 	AppServer.cpp
 	#BitfieldRegion.cpp

src/servers/bluetooth/Jamfile

@@ -4,7 +4,7 @@ UsePrivateHeaders shared bluetooth net kernel ;
 
 AddResources bluetooth_server : bluetooth_server.rdef ;
 
-Server bluetooth_server
+Application bluetooth_server
  	:
 	BluetoothServer.cpp
 	DeskbarReplicant.cpp

src/servers/debug/Jamfile

@@ -8,7 +8,7 @@ UsePrivateHeaders storage ;
 
 AddResources debug_server : debug_server.rdef ;
 
-Server debug_server
+Application debug_server
  	:
  	DebugServer.cpp
 	DebugWindow.cpp

src/servers/index/Jamfile

@@ -5,7 +5,7 @@ AddResources index_server : index_server.rdef ;
 UsePrivateHeaders index_server shared storage kernel app ;
 UsePrivateSystemHeaders ;
 
-Server index_server :
+Application index_server :
 	CatchUpManager.cpp
 	main.cpp
 	IndexServer.cpp

src/servers/input/Jamfile

@@ -39,7 +39,7 @@ if $(TARGET_PLATFORM) != haiku {
 	APPSERVER_TEST_MODE = 0 ;
 }
 
-Server input_server :
+Application input_server :
 	InputServer.cpp
 	InputServerDevice.cpp
 	InputServerFilter.cpp

src/servers/keystore/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src servers keystore ;
 UsePrivateHeaders app ;
 UsePrivateHeaders shared ;
 
-Server keystore_server :
+Application keystore_server :
 	AppAccessRequestWindow.cpp
 	KeyRequestWindow.cpp
 	Keyring.cpp

src/servers/launch/Jamfile

@@ -5,7 +5,7 @@ UsePrivateSystemHeaders ;
 
 UseHeaders [ FDirName $(HAIKU_TOP) src bin multiuser ] ;
 
-Server launch_daemon
+Application launch_daemon
 	:
 	LaunchDaemon.cpp
 

src/servers/mail/Jamfile

@@ -10,7 +10,7 @@ SubDirHdrs $(HAIKU_TOP) src kits tracker ;
 
 AddResources mail_daemon : mail_daemon.rdef DeskbarViewIcons.rdef ;
 
-Server mail_daemon :
+Application mail_daemon :
 	DeskbarView.cpp
 	ErrorLogWindow.cpp
 	LEDAnimation.cpp

src/servers/media/Jamfile

@@ -5,7 +5,7 @@ UsePrivateSystemHeaders ;
 
 AddResources media_server : media_server.rdef ;
 
-Server media_server :
+Application media_server :
 	media_server.cpp
 	AppManager.cpp
 	BufferManager.cpp

src/servers/media_addon/Jamfile

@@ -5,7 +5,7 @@ UsePrivateSystemHeaders ;
 
 AddResources media_addon_server : media_addon_server.rdef ;
 
-Server media_addon_server :
+Application media_addon_server :
 	MediaAddonServer.cpp
 	MediaFilePlayer.cpp
 	SystemTimeSource.cpp

src/servers/midi/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src servers midi ;
 
 UsePrivateHeaders app interface locale midi shared storage ;
 
-Server midi_server :
+Application midi_server :
 	MidiServerApp.cpp
 	DeviceWatcher.cpp
 	PortDrivers.cpp

src/servers/mount/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src servers mount ;
 UsePrivateHeaders app mount shared storage ;
 SubDirHdrs $(HAIKU_TOP) src kits tracker ;
 
-Server mount_server
+Application mount_server
 	:
 	AutoMounter.cpp
 	:

src/servers/net/Jamfile

@@ -16,7 +16,7 @@ SubDirC++Flags $(defines) ;
 
 AddResources net_server : net_server.rdef ;
 
-Server net_server :
+Application net_server :
 	NetServer.cpp
 	AutoconfigClient.cpp
 	AutoconfigLooper.cpp

src/servers/notification/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src servers notification ;
 
 UsePrivateHeaders app notification ;
 
-Server notification_server :
+Application notification_server :
 	AppGroupView.cpp
 	NotificationServer.cpp
 	NotificationView.cpp

src/servers/package/Jamfile

@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src servers package ;
 UsePrivateSystemHeaders ;
 UsePrivateHeaders app interface kernel shared storage ;
 
-Server package_daemon
+Application package_daemon
 	:
 	CommitTransactionHandler.cpp
 	Constants.cpp

src/servers/power/Jamfile

@@ -4,7 +4,7 @@ UsePrivateHeaders app ;
 
 AddResources power_daemon : power_daemon.rdef ;
 
-Server power_daemon :
+Application power_daemon :
 	lid_monitor.cpp
 	power_daemon.cpp
 	power_button_monitor.cpp

src/servers/print/Jamfile

@@ -7,7 +7,7 @@ AddResources print_server :
 	print_server.rdef
 ;
 
-Server print_server :
+Application print_server :
 	PrintServerApp.cpp
 	PrintServerApp.R5.cpp
 	PrintServerApp.Scripting.cpp

src/servers/registrar/Jamfile

@@ -11,7 +11,7 @@ UsePrivateSystemHeaders ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) mime ] ;
 
-Server registrar
+Application registrar
  	:
 	AppInfoList.cpp
 	AppInfoListMessagingTargetSet.cpp

src/servers/syslog_daemon/Jamfile

@@ -5,7 +5,7 @@ UsePrivateSystemHeaders ;
 
 AddResources syslog_daemon : SyslogDaemon.rdef ;
 
-Server syslog_daemon :
+Application syslog_daemon :
 	SyslogDaemon.cpp
 	syslog_output.cpp
 	listener_output.cpp

src/tests/add-ons/kernel/file_systems/shared/Jamfile

@@ -10,7 +10,7 @@ SimpleTest random_read
 	: be
 ;
 
-BinCommand fragmenter :
+Application fragmenter :
 	fragmenter.cpp
 ;
 

src/tests/kits/media/playsound/Jamfile

@@ -1,16 +1,16 @@
 SubDir HAIKU_TOP src tests kits media playsound ;
 
-BinCommand playfile :
+Application playfile :
 	playfile.cpp
 	: be bnetapi media [ TargetLibsupc++ ]
 ;
 
-BinCommand playsound :
+Application playsound :
 	playsound.cpp
 	: be media game
 ;
 
-BinCommand playwav :
+Application playwav :
 	playwav.cpp
 	: be media [ TargetLibsupc++ ]
 ;

src/tests/kits/opengl/glinfo/Jamfile

@@ -22,7 +22,7 @@ Includes [ FGristFiles $(sources) ] :
 	# Dependency needed to trigger downloading/unzipping the package before
 	# compiling the files.
 
-Preference GLInfo :
+Application GLInfo :
 	$(sources)
 	:
 	be libglut.so

src/tests/servers/debug/Jamfile

@@ -5,7 +5,7 @@ AddSubDirSupportedPlatforms libbe_test ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers debug ] ;
 UsePrivateHeaders shared ;
 
-BinCommand crashing_app : crashing_app.cpp ;
+Application crashing_app : crashing_app.cpp ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src servers debug ] ;
 SimpleTest DebugWindow :

src/tests/servers/launch/tools/Jamfile

@@ -36,7 +36,7 @@ Server test_launch_daemon :
 	LaunchDaemon.rdef
 ;
 
-BinCommand test_launch_roster :
+Application test_launch_roster :
 	LaunchRoster.cpp
 	launch_roster.cpp
 	:

src/tests/system/kernel/device_manager/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src tests system kernel device_manager ;
 
-BinCommand <test>listdev :
+Application <test>listdev :
 	dm_wrapper.c
 	listdev.c
 ;

src/tests/system/kernel/slab/Jamfile

@@ -3,6 +3,6 @@ SubDir HAIKU_TOP src tests system kernel slab ;
 UsePrivateHeaders kernel ;
 UseHeaders $(TARGET_PRIVATE_KERNEL_HEADERS) : true ;
 
-BinCommand test_slab
+Application test_slab
 	: Slab.cpp
 	;

src/tests/system/network/multicast/Jamfile

@@ -1,10 +1,10 @@
 SubDir HAIKU_TOP src tests system network multicast ;
 
-BinCommand multicast :
+Application multicast :
 	multicast.cpp
 	: libnetwork.so
 ;
 
 
-BinCommand multicat : multicat.c : libnetwork.so ;
+Application multicat : multicat.c : libnetwork.so ;
-BinCommand multisend : multisend.c : libnetwork.so ;
+Application multisend : multisend.c : libnetwork.so ;

src/tests/system/network/tcptester/Jamfile

@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src tests system network tcptester ;
 
-BinCommand tcptester :
+Application tcptester :
 	tcptester.cpp
 	: libnetwork.so [ TargetLibsupc++ ]
 ;