added a resource parameter to Preference rule

updated Jamfiles to take this into account


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12993 a95241bf-73f2-0310-859d-f6bbb57e9c96

Jamrules

@@ -505,9 +505,10 @@ rule StdBinCommands
 
 rule Preference
 {
-	# Preference <name> : <sources> : <libraries> ;
+	# Preference <name> : <sources> : <libraries> : <res> ;
 	SetupIncludes ;
 	SetupObjectsDir ;
+	AddResources $(1) : $(4) ;
 	Main $(1) : $(2) ;
 	MakeLocate $(1) : $(OBOS_PREFS_DIR) ;
 	LinkSharedOSLibs $(1) : $(3) ;

src/prefs/appearance/Jamfile

@@ -2,7 +2,6 @@ SubDir OBOS_TOP src prefs appearance ;
 
 UseFreeTypeHeaders ;
 UsePrivateHeaders app [ FDirName servers app ] ;
-AddResources Appearance : Appearance.rdef ;
 
 Preference Appearance :
 	APRMain.cpp
@@ -17,6 +16,7 @@ Preference Appearance :
 	ColorWell.cpp
 	ColorWhichItem.cpp
 	CursorWhichItem.cpp
- ;
+	: libbe.so libtracker.so libtranslation.so libappserver.so libopenbeos.so
+	: Appearance.rdef
+	;
 
-LinkSharedOSLibs Appearance : be tracker translation libappserver.so libopenbeos.so ;

src/prefs/backgrounds/Jamfile

@@ -2,12 +2,11 @@ SubDir OBOS_TOP src prefs backgrounds ;
 
 UsePrivateHeaders shared ;
 
-AddResources Backgrounds : Backgrounds.rdef ;
-
 Preference Backgrounds : 
 	BackgroundImage.cpp 
 	BGMain.cpp 
 	BGView.cpp 
 	BGWindow.cpp 
 	: libbe.so libtracker.so libtranslation.so
+	: Backgrounds.rdef
 	;

src/prefs/datatranslations/Jamfile

@@ -1,12 +1,12 @@
 SubDir OBOS_TOP src prefs datatranslations ;
 
-AddResources DataTranslations : DataTranslations.rdef ;
-
 Preference DataTranslations :
 	DataTranslations.cpp
 	DataTranslationsWindow.cpp
 	DataTranslationsView.cpp
 	DataTranslationsSettings.cpp
-	IconView.cpp ;
+	IconView.cpp 
+	: libbe.so libtranslation.so
+	: DataTranslations.rdef
+	;
 
-LinkSharedOSLibs DataTranslations : be translation ;

src/prefs/devices/Jamfile

@@ -1,7 +1,5 @@
 SubDir OBOS_TOP src prefs devices ;
 
-AddResources Devices : Devices.rdef ;
-
 rule ISAPnPHeaderGen
 {
 	SetupObjectsDir ;
@@ -50,6 +48,7 @@ Preference Devices :
 	DevicesInfo.cpp
 	ConfigurationWindow.cpp
 	: libbe.so
+	: Devices.rdef
 ;
 
 Includes [ FGristFiles DevicesInfo.cpp ] : [ FGristFiles isapnpids.h usbdevs.h usbdevs_data.h ] ;

src/prefs/filetypes/Jamfile

@@ -1,14 +1,11 @@
 SubDir OBOS_TOP src prefs filetypes ;
 
-AddResources FileTypes :
-	FileTypes.rdef FileTypes.icons.rdef FileTypes.version.rdef
-	;
-
 Preference FileTypes :
 	main.cpp
 	FileTypesApp.cpp
 	FileTypesView.cpp
 	FileTypesWindow.cpp
+	: libbe.so libtracker.so
+	: FileTypes.rdef FileTypes.icons.rdef FileTypes.version.rdef
 	;
 
-LinkSharedOSLibs FileTypes : be tracker ;

src/prefs/fonts/Fonts.rdef

@@ -1,7 +1,7 @@
 
-resource(1, "BEOS:FILE_TYPES") message;
+resource file_types message;
 
-resource(101, "BEOS:L:STD_ICON") #'ICON' array
+resource large_icon
 {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF008C8C0000FFFFFFFFFFFFFFFFFFFFFFFF"
@@ -37,7 +37,7 @@ resource(101, "BEOS:L:STD_ICON") #'ICON' array
 	$"FFFFFFFF0000000E0F0F0F0F0F0F0F0E0F0F0F0F0F0000000F0F0E0FFFFFFFFF"
 };
 
-resource(101, "BEOS:M:STD_ICON") #'MICN' array
+resource mini_icon
 {
 	$"FFFFFFFFFFFF0000FFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFF008C8C0000FFFFFFFFFFFF"
@@ -57,32 +57,13 @@ resource(101, "BEOS:M:STD_ICON") #'MICN' array
 	$"FFFF00000E0F0F0F0000000E0F0FFFFF"
 };
 
-resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.MSM-FontPrefPanel";
+resource app_signature "application/x-vnd.Haiku-FNPL";
 
-resource(1, "BEOS:APP_VERSION") #'APPV' array
+resource app_version
 {
-	$"0000000000000000090000000000000000000000466F6E745F50726566000000"
+	short_info = "Haiku-Fonts",
-	$"0000000000000000000000000000000000000000000000000000000000000000"
+	long_info  = "Haiku version of Fonts"
-	$"0000000000000000000000000000000000000000466F6E747320507265666572"
-	$"656E636573204170706C65740000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000010000000100000001000000"
-	$"0100000001000000010000000100000001000000680200007202000001000000"
-	$"3600000020000000200000002000000020000000200000002000000020000000"
-	$"2000000020000000200000002000000020000000200000002000000020000000"
-	$"FC000000420000008000000046000000480000004A000000BC0000004C000000"
-	$"540000005000000052000000BE00000056000000100000000A00000002000000"
-	$"16000000010000005E000000540000005A00000012000000E2000000EE000000"
-	$"CA000000E4000000E8000000F2000000EA000000D2000000DE000000E0000000"
-	$"F6000000FA000000F8000000FE00000008000000180000006E00000070000000"
-	$"720000005600000001000000C2000000E6000000C8000000CC000000CE000000"
-	$"D0000000D4000000D6000000D800000074000000440000001400000068000000"
-	$"6A0000006C000000"
 };
 
-resource(1, "BEOS:APP_FLAGS") #'APPF' $"00000000";
+resource app_flags B_SINGLE_LAUNCH;
+

src/prefs/fonts/Jamfile

@@ -1,7 +1,5 @@
 SubDir OBOS_TOP src prefs fonts ;
 
-AddResources Fonts : Fonts.rdef ;
-
 Preference Fonts :
 	ButtonView.cpp
 	CacheView.cpp
@@ -10,6 +8,8 @@ Preference Fonts :
 	FontView.cpp
 	main.cpp
 	MainWindow.cpp
-	Pref_Utils.cpp ;
+	Pref_Utils.cpp 
+	: libbe.so
+	: Fonts.rdef
+	;
 
-LinkSharedOSLibs Fonts : be ;

src/prefs/keyboard/Jamfile

@@ -7,12 +7,11 @@ if $(TARGET_PLATFORM) != haiku {
 
 UsePrivateHeaders input ;
 
-AddResources Keyboard : Keyboard.rdef ;
-
 Preference Keyboard : 
 	Keyboard.cpp 
 	KeyboardSettings.cpp 
 	KeyboardView.cpp 
 	KeyboardWindow.cpp
 	: libtranslation.so libbe.so
+	: Keyboard.rdef
 	;

src/prefs/keymap/Jamfile

@@ -2,12 +2,12 @@ SubDir OBOS_TOP src prefs keymap ;
 
 UsePrivateHeaders interface ;
 
-AddResources Keymap : Keymap.rdef ;
-
 Preference Keymap :
 	KeymapApplication.cpp
 	KeymapWindow.cpp
 	KeymapListItem.cpp
 	Keymap.cpp
 	KeymapTextView.cpp
-	: libbe.so libtracker.so ;
+	: libbe.so libtracker.so 
+	: Keymap.rdef
+	;

src/prefs/mail/Jamfile

@@ -1,7 +1,5 @@
 SubDir OBOS_TOP src prefs mail ;
 
-AddResources E-mail : e-mail.rdef ;
-
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
 
@@ -10,9 +8,10 @@ Preference E-mail :
 	CenterContainer.cpp
 	ConfigViews.cpp
 	ConfigWindow.cpp
-	main.cpp ;
+	main.cpp 
-
+	: libbe.so libmail.so
-LinkSharedOSLibs E-mail : be libmail.so ;
+	: e-mail.rdef
+	;
 
 Package haiku-maildaemon-cvs :
 	E-mail : 

src/prefs/media/Jamfile

@@ -1,7 +1,5 @@
 SubDir OBOS_TOP src prefs media ;
 
-AddResources Media : media.rdef ;
-
 UsePrivateHeaders media ;
 
 Preference Media :
@@ -9,6 +7,8 @@ Preference Media :
 	MediaWindow.cpp
 	MediaViews.cpp
 	MediaListItem.cpp
-	MediaAlert.cpp ;
+	MediaAlert.cpp 
+	: libmedia.so be 
+	: media.rdef 
+	;
 
-LinkSharedOSLibs Media : media be ;

src/prefs/menu/Jamfile

@@ -2,6 +2,16 @@ SubDir OBOS_TOP src prefs menu ;
 
 AddResources Menu : Menu.rdef ;
 
-Preference Menu : BitmapMenuItem.cpp ColorPicker.cpp ColorWindow.cpp FontMenu.cpp FontSizeMenu.cpp MenuApp.cpp MenuBar.cpp MenuWindow.cpp ;
+Preference Menu : 
+	BitmapMenuItem.cpp 
+	ColorPicker.cpp 
+	ColorWindow.cpp 
+	FontMenu.cpp 
+	FontSizeMenu.cpp 
+	MenuApp.cpp 
+	MenuBar.cpp 
+	MenuWindow.cpp 
+	: libtranslation.so libbe.so
+	: Menu.rdef
+	;
 
-LinkSharedOSLibs Menu : translation be root ;

src/prefs/mouse/Jamfile

@@ -7,8 +7,6 @@ if $(TARGET_PLATFORM) != haiku {
 
 UsePrivateHeaders input ;
 
-AddResources Mouse : Mouse.rdef ;
-
 Preference Mouse : 
 	Mouse.cpp 
 	MouseSettings.cpp 
@@ -16,5 +14,6 @@ Preference Mouse :
 	MouseView.cpp 
 	SettingsView.cpp
 	: libtranslation.so libbe.so
+	: Mouse.rdef
 	;
 

src/prefs/print/Jamfile

@@ -2,8 +2,6 @@ SubDir OBOS_TOP src prefs print ;
 
 UsePrivateHeaders interface shared print ;
 
-AddResources Printers : Printers.FileTypes.rdef ;
-
 Preference Printers :
 	AddPrinterDialog.cpp
 	Printers.cpp
@@ -11,16 +9,12 @@ Preference Printers :
 	PrinterListView.cpp
 	JobListView.cpp
 	SpoolFolder.cpp
-	Globals.cpp ;
+	Globals.cpp 
+	: libbe.so libtranslation.so libprint.a
+	: Printers.FileTypes.rdef
+	;
 
 # TODO remove dependency to libtranslation (BeUtils) 
-LinkSharedOSLibs 
-	Printers 
-	: 
-	be 
-	translation 
-	libprint.a 
-	;
 
 Package haiku-printingkit-cvs :
 	Printers :

src/prefs/screen/Jamfile

@@ -2,8 +2,18 @@ SubDir OBOS_TOP src prefs screen ;
 
 SubDirC++Flags [ FDefines BEOS_R5_COMPATIBLE ] ;
 
-AddResources Screen : Screen.rdef ;
+Preference Screen : 
+	AlertView.cpp 
+	AlertWindow.cpp 
+	RefreshSlider.cpp 
+	RefreshView.cpp 
+	RefreshWindow.cpp 
+	Screen.cpp 
+	ScreenDrawView.cpp 
+	ScreenSettings.cpp 
+	ScreenWindow.cpp 
+	Utility.cpp 
+	: libbe.so
+	: Screen.rdef
+	;
 
-Preference Screen : AlertView.cpp AlertWindow.cpp RefreshSlider.cpp RefreshView.cpp RefreshWindow.cpp Screen.cpp ScreenDrawView.cpp ScreenSettings.cpp ScreenWindow.cpp Utility.cpp ;
-
-LinkSharedOSLibs Screen : be root ;

src/prefs/screensaver/Jamfile

@@ -2,17 +2,13 @@ SubDir OBOS_TOP src prefs screensaver ;
 
 UsePrivateHeaders screen_saver ;
 
-AddResources ScreenSaver : ScreenSaver.rdef ;
+Preference ScreenSaver : 
-
-local sources =
 	ScreenSaverPrefsApp.cpp
 	ScreenSaverWindow.cpp
 	passwordWindow.cpp
 	PreviewView.cpp
 	MouseAreaView.cpp
-;
+	: libtracker.so libscreensaver.so libbe.so libstdc++.r4.so
-
+	: ScreenSaver.rdef 
-Preference ScreenSaver : $(sources) ;
+	;
-
-LinkSharedOSLibs ScreenSaver : tracker libscreensaver.so be stdc++.r4 ;
 

src/prefs/scrollbar/Jamfile

@@ -1,7 +1,12 @@
 SubDir OBOS_TOP src prefs scrollbar ;
 
-AddResources ScrollBar : ScrollBar.rdef ;
+Preference ScrollBar : 
+	ScrollBarApp.cpp 
+	ScrollBarWindow.cpp 
+	ScrollBarView.cpp 
+	knobsizeadjuster.cpp 
+	fakescrollbar.cpp 
+	: libbe.so
+	: ScrollBar.rdef
+	;
 
-Preference ScrollBar : ScrollBarApp.cpp ScrollBarWindow.cpp ScrollBarView.cpp knobsizeadjuster.cpp fakescrollbar.cpp ;
-
-LinkSharedOSLibs ScrollBar : be root ;

src/prefs/sounds/Jamfile

@@ -4,12 +4,11 @@ if $(TARGET_PLATFORM) != haiku {
         SubDirC++Flags -fmultiple-symbol-spaces ;
 }
 
-AddResources Sounds : Sounds.rdef ;
-
 Preference Sounds : 
 	HApp.cpp 
 	HEventItem.cpp 
 	HWindow.cpp 
 	HEventList.cpp 
 	: libbe.so libmedia.so libgame.so libtracker.so
-;
+	: Sounds.rdef
+	;

src/prefs/time/Jamfile

@@ -1,7 +1,21 @@
 SubDir OBOS_TOP src prefs time ;
 
-AddResources Time : Time.rdef ;
+Preference Time : 
+	AnalogClock.cpp 
+	BaseView.cpp 
+	Bitmaps.cpp 
+	CalendarView.cpp 
+	DateTimeEdit.cpp 
+	DateUtils.cpp 
+	SectionEdit.cpp 
+	SettingsView.cpp 
+	Time.cpp 
+	TimeSettings.cpp 
+	TimeView.cpp 
+	TimeWindow.cpp 
+	TZDisplay.cpp 
+	ZoneView.cpp 
+	: libbe.so
+	: Time.rdef
+	;
 
-Preference Time : AnalogClock.cpp BaseView.cpp Bitmaps.cpp CalendarView.cpp DateTimeEdit.cpp DateUtils.cpp SectionEdit.cpp SettingsView.cpp Time.cpp TimeSettings.cpp TimeView.cpp TimeWindow.cpp TZDisplay.cpp ZoneView.cpp ;
-
-LinkSharedOSLibs Time : be root ;

src/prefs/virtualmemory/Jamfile

@@ -1,7 +1,10 @@
 SubDir OBOS_TOP src prefs virtualmemory ;
 
-AddResources VirtualMemory : VirtualMemory.rdef ;
+Preference VirtualMemory : 
-
+	main.cpp 
-Preference VirtualMemory : main.cpp Pref_Utils.cpp MainWindow.cpp VMSettings.cpp ;
+	Pref_Utils.cpp 
-
+	MainWindow.cpp 
-LinkSharedOSLibs VirtualMemory : be root libstdc++.r4.so ;
+	VMSettings.cpp 
+	: libbe.so libstdc++.r4.so
+	: VirtualMemory.rdef
+	;

src/prefs/workspaces/Jamfile

@@ -1,7 +1,8 @@
 SubDir OBOS_TOP src prefs workspaces ;
 
-AddResources Workspaces : Workspaces.rdef ;
+Preference Workspaces : 
+	Workspaces.cpp 
+	: libbe.so 
+	: Workspaces.rdef 
+	;
 
-Preference Workspaces : Workspaces.cpp ;
-
-LinkSharedOSLibs Workspaces : be root ;

src/prefs/workspaces/Workspaces.rdef

@@ -1,5 +1,5 @@
 
-resource(101, "BEOS:L:STD_ICON") #'ICON' array
+resource large_icon
 {
 	$"FFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFFFF00D9D90000FFFF0037360000FFFFFFFFFFFFFFFFFFFF"
@@ -35,7 +35,7 @@ resource(101, "BEOS:L:STD_ICON") #'ICON' array
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000E0F0FFFFFFFFFFFFFFFFFFFFFFF"
 };
 
-resource(101, "BEOS:M:STD_ICON") #'MICN' array
+resource mini_icon
 {
 	$"FFFFFFFFFF0000FFFF0000FFFFFFFFFF"
 	$"FFFFFFFF00D9D9000037360000FFFFFF"
@@ -55,34 +55,13 @@ resource(101, "BEOS:M:STD_ICON") #'MICN' array
 	$"FFFFFFFFFFFFFF0000000EFFFFFFFFFF"
 };
 
-resource(2, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-elfexecutable";
+resource app_signature "application/x-vnd.Be-WORK";
 
-resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Be-WORK";
+resource app_version
-
-resource(1, "BEOS:APP_VERSION") #'APPV' array
 {
-	$"0100000000000000000000000500000000000000576F726B7370616365730000"
+	short_info = "Haiku-Workspaces",
-	$"0000000000000000000000000000000000000000000000000000000000000000"
+	long_info  = "Haiku version of Workspaces"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000010000000000000000000000"
-	$"00000000000000004F70656E42654F5320523100000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000"
 };
 
-resource(1, "BEOS:APP_FLAGS") #'APPF' $"00000000";
+resource app_flags B_SINGLE_LAUNCH;
+