[haiku-commits] r38220 - in haiku/branches/components/gallium3d: . 3rdparty/mmu_man 3rdparty/mmu_man/scripts build/config_headers build/jam ...
- From: aljen-mlists@xxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 18 Aug 2010 02:29:15 +0200 (CEST)
Author: aljen
Date: 2010-08-18 02:29:05 +0200 (Wed, 18 Aug 2010)
New Revision: 38220
Changeset: http://dev.haiku-os.org/changeset/38220
Added:
haiku/branches/components/gallium3d/3rdparty/mmu_man/scripts/bootstrap-haiku.sh
haiku/branches/components/gallium3d/build/jam/LocaleRules
haiku/branches/components/gallium3d/build/jam/board/beagle/
haiku/branches/components/gallium3d/build/jam/board/beagle/BoardSetup
haiku/branches/components/gallium3d/data/artwork/HAIKU Background Leaf
haiku/branches/components/gallium3d/data/artwork/HAIKU Background Leaf -
outline
haiku/branches/components/gallium3d/data/artwork/HAIKU Leaf
haiku/branches/components/gallium3d/data/artwork/HAIKU logo - black on white
- installer - development.png
haiku/branches/components/gallium3d/data/artwork/HAIKU logo - black on white
- installer.png
haiku/branches/components/gallium3d/data/artwork/HAIKU logo - black on white
- tiny - versioned
haiku/branches/components/gallium3d/data/artwork/HAIKU logo - black on white
- tiny - versioned.png
haiku/branches/components/gallium3d/data/artwork/HAIKU logo - white on black
- big
haiku/branches/components/gallium3d/data/artwork/HAIKU logo - white on black
- big.png
haiku/branches/components/gallium3d/data/artwork/HAIKU logo - white on black
- normal
haiku/branches/components/gallium3d/data/artwork/HAIKU logo - white on black
- normal.png
haiku/branches/components/gallium3d/data/artwork/HAIKU logo - white on black
- tiny
haiku/branches/components/gallium3d/data/artwork/HAIKU logo - white on black
- tiny.png
haiku/branches/components/gallium3d/data/artwork/boot_splash/splash_logo-alpha.png
haiku/branches/components/gallium3d/data/artwork/boot_splash/splash_logo-development.png
haiku/branches/components/gallium3d/data/artwork/boot_splash/splash_logo-versioned
haiku/branches/components/gallium3d/data/artwork/icons/App_Poorman_2
haiku/branches/components/gallium3d/data/artwork/icons/Device_Clipboard
haiku/branches/components/gallium3d/data/artwork/icons/File_WonderBrush
haiku/branches/components/gallium3d/data/artwork/icons/flags/Austria
haiku/branches/components/gallium3d/data/catalogs/add-ons/tracker/zipomatic/da.catkeys
haiku/branches/components/gallium3d/data/catalogs/add-ons/tracker/zipomatic/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/aboutsystem/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/aboutsystem/es.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/aboutsystem/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/aboutsystem/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/aboutsystem/zh-hans.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/bootman/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/bootman/zh-hans.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/deskbar/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/deskbar/es.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/deskbar/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/deskbar/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/deskbar/zh-hans.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/diskprobe/
haiku/branches/components/gallium3d/data/catalogs/apps/diskprobe/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/diskprobe/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/drivesetup/da.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/drivesetup/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/expander/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/expander/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/expander/zh-hans.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/installer/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/installer/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/mail/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/mail/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/midiplayer/es.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/midiplayer/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/midiplayer/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/midiplayer/zh-hans.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/networkstatus/
haiku/branches/components/gallium3d/data/catalogs/apps/networkstatus/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/networkstatus/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/networkstatus/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/networkstatus/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/pairs/da.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/pairs/ja.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/pairs/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/pairs/ro.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/pairs/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/pairs/zh-hans.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/pulse/
haiku/branches/components/gallium3d/data/catalogs/apps/pulse/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/pulse/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/pulse/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/readonlybootprompt/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/readonlybootprompt/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/screenshot/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/screenshot/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/showimage/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/showimage/zh-hans.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/soundrecorder/
haiku/branches/components/gallium3d/data/catalogs/apps/soundrecorder/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/stylededit/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/stylededit/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/text_search/
haiku/branches/components/gallium3d/data/catalogs/apps/text_search/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/text_search/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/tv/
[... truncated: 937 added files follow ...]
Removed:
haiku/branches/components/gallium3d/3rdparty/mmu_man/themes/
haiku/branches/components/gallium3d/build/jam/board/beagle/BoardSetup
haiku/branches/components/gallium3d/data/artwork/icons/flags/Austia
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/codycam/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/diskprobe/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/diskprobe/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/networkstatus/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/networkstatus/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/networkstatus/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/networkstatus/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/pulse/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/pulse/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/pulse/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/soundrecorder/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/terminal/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/text_search/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/text_search/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/tv/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/tv/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/tv/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/workspaces/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/workspaces/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/workspaces/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/workspaces/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/bin/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/bin/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/bin/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/bin/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/kits/tracker/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/kits/tracker/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/kits/tracker/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/shortcuts/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/shortcuts/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/shortcuts/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/shortcuts/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/sounds/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/sounds/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/sounds/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/sounds/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/sounds/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/sounds/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/sounds/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/servers/mount/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/servers/mount/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/servers/mount/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/servers/mount/ko.catkeys
haiku/branches/components/gallium3d/data/catalogs/servers/mount/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/servers/mount/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/servers/mount/pt_br.catkeys
haiku/branches/components/gallium3d/data/catalogs/servers/mount/ru.catkeys
haiku/branches/components/gallium3d/docs/images/
haiku/branches/components/gallium3d/docs/user/locale/Catalog.dox
haiku/branches/components/gallium3d/docs/user/locale/Collator.dox
haiku/branches/components/gallium3d/docs/user/locale/Country.dox
haiku/branches/components/gallium3d/docs/user/locale/Locale.dox
haiku/branches/components/gallium3d/docs/user/locale/LocaleRoster.dox
haiku/branches/components/gallium3d/docs/user/locale/TimeZone.cpp
haiku/branches/components/gallium3d/docs/user/locale/UnicodeChar.dox
haiku/branches/components/gallium3d/docs/user/locale/localeintro.dox
haiku/branches/components/gallium3d/docs/userguide/de/images/apps-images/screenshot-options.png
haiku/branches/components/gallium3d/docs/userguide/en/images/apps-images/screenshot-options.png
haiku/branches/components/gallium3d/docs/userguide/es/images/apps-images/screenshot-options.png
haiku/branches/components/gallium3d/docs/userguide/fr/images/apps-images/screenshot-options.png
haiku/branches/components/gallium3d/docs/userguide/it/images/apps-images/screenshot-options.png
haiku/branches/components/gallium3d/docs/userguide/jp/images/apps-images/screenshot-options.png
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/activitymonitor.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/bepdf.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/cdplayer.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/charactermap.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/cli-apps.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/codycam.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/deskcalc.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/diskprobe.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/diskusage.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/drivesetup.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/expander.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/icon-o-matic.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/installer.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/magnify.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/mail.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/mediaplayer.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/midiplayer.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/packageinstaller.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/pe.html
haiku/branches/components/gallium3d/docs/userguide/pt_PT/applications/people.html
[... truncated: 853 deleted files follow ...]
Modified:
haiku/branches/components/gallium3d/
haiku/branches/components/gallium3d/3rdparty/mmu_man/Jamfile
haiku/branches/components/gallium3d/Jamfile
haiku/branches/components/gallium3d/Jamrules
haiku/branches/components/gallium3d/build/config_headers/kernel_debug_config.h
haiku/branches/components/gallium3d/build/jam/BeOSRules
haiku/branches/components/gallium3d/build/jam/BuildSetup
haiku/branches/components/gallium3d/build/jam/HaikuImage
haiku/branches/components/gallium3d/build/jam/HelperRules
haiku/branches/components/gallium3d/build/jam/ImageRules
haiku/branches/components/gallium3d/build/jam/NetBootArchive
haiku/branches/components/gallium3d/build/jam/OptionalBuildFeatures
haiku/branches/components/gallium3d/build/jam/OptionalPackageDependencies
haiku/branches/components/gallium3d/build/jam/OptionalPackages
haiku/branches/components/gallium3d/build/jam/ReleaseBuildProfiles
haiku/branches/components/gallium3d/build/jam/UserBuildConfig.ReadMe
haiku/branches/components/gallium3d/build/jam/UserBuildConfig.sample
haiku/branches/components/gallium3d/build/jam/board/neo_freerunner/BoardSetup
haiku/branches/components/gallium3d/build/scripts/build_cross_tools_gcc4
haiku/branches/components/gallium3d/build/scripts/build_haiku_image
haiku/branches/components/gallium3d/configure
haiku/branches/components/gallium3d/data/artwork/HAIKU logo - black on white
- installer
haiku/branches/components/gallium3d/data/artwork/HAIKU logo - black.svg
haiku/branches/components/gallium3d/data/artwork/icons/Alert_Idea
haiku/branches/components/gallium3d/data/artwork/icons/App_BeHappy
haiku/branches/components/gallium3d/data/artwork/icons/App_BeVexed
haiku/branches/components/gallium3d/data/artwork/icons/App_Beacon
haiku/branches/components/gallium3d/data/artwork/icons/App_Beacon_2
haiku/branches/components/gallium3d/data/artwork/icons/App_Beacon_3
haiku/branches/components/gallium3d/data/artwork/icons/App_Beam_1_NewMail
haiku/branches/components/gallium3d/data/artwork/icons/App_Beam_2_NewMail
haiku/branches/components/gallium3d/data/artwork/icons/App_Beam_2_NoMail
haiku/branches/components/gallium3d/data/artwork/icons/App_Beam_3_NewMail
haiku/branches/components/gallium3d/data/artwork/icons/App_Beam_3_NoMail
haiku/branches/components/gallium3d/data/artwork/icons/App_Bikeshed
haiku/branches/components/gallium3d/data/artwork/icons/App_CharacterMap
haiku/branches/components/gallium3d/data/artwork/icons/App_DOS-Box
haiku/branches/components/gallium3d/data/artwork/icons/App_Debugger
haiku/branches/components/gallium3d/data/artwork/icons/App_DiskUsage
haiku/branches/components/gallium3d/data/artwork/icons/App_Finance
haiku/branches/components/gallium3d/data/artwork/icons/App_Generic_4
haiku/branches/components/gallium3d/data/artwork/icons/App_ImageEditor
haiku/branches/components/gallium3d/data/artwork/icons/App_Mail_None
haiku/branches/components/gallium3d/data/artwork/icons/App_Old
haiku/branches/components/gallium3d/data/artwork/icons/App_Poorman
haiku/branches/components/gallium3d/data/artwork/icons/App_TV_2
haiku/branches/components/gallium3d/data/artwork/icons/App_Transmission
haiku/branches/components/gallium3d/data/artwork/icons/App_XEmacs
haiku/branches/components/gallium3d/data/artwork/icons/App_YAB
haiku/branches/components/gallium3d/data/artwork/icons/Color_01_Black
haiku/branches/components/gallium3d/data/artwork/icons/Color_02_Dark_Grey
haiku/branches/components/gallium3d/data/artwork/icons/Color_03_Grey
haiku/branches/components/gallium3d/data/artwork/icons/Color_04_Light_Grey
haiku/branches/components/gallium3d/data/artwork/icons/Color_05_White
haiku/branches/components/gallium3d/data/artwork/icons/Color_06_Red
haiku/branches/components/gallium3d/data/artwork/icons/Color_07_Rose
haiku/branches/components/gallium3d/data/artwork/icons/Color_08_Orange
haiku/branches/components/gallium3d/data/artwork/icons/Color_09_Apricot
haiku/branches/components/gallium3d/data/artwork/icons/Color_10_Yellow
haiku/branches/components/gallium3d/data/artwork/icons/Color_11_Cream
haiku/branches/components/gallium3d/data/artwork/icons/Color_12_Green
haiku/branches/components/gallium3d/data/artwork/icons/Color_13_Lime
haiku/branches/components/gallium3d/data/artwork/icons/Color_14_Turquoise
haiku/branches/components/gallium3d/data/artwork/icons/Color_15_Aquamarine
haiku/branches/components/gallium3d/data/artwork/icons/Color_16_Blue
haiku/branches/components/gallium3d/data/artwork/icons/Color_17_Cyan
haiku/branches/components/gallium3d/data/artwork/icons/Color_18_Violet
haiku/branches/components/gallium3d/data/artwork/icons/Color_19_Mauve
haiku/branches/components/gallium3d/data/artwork/icons/Color_20_Magenta
haiku/branches/components/gallium3d/data/artwork/icons/Color_21_Pink
haiku/branches/components/gallium3d/data/artwork/icons/Color_22_Brown
haiku/branches/components/gallium3d/data/artwork/icons/Color_23_Beige
haiku/branches/components/gallium3d/data/artwork/icons/Device_Harddisk_development
haiku/branches/components/gallium3d/data/artwork/icons/Device_MemoryStick
haiku/branches/components/gallium3d/data/artwork/icons/Device_Mobile
haiku/branches/components/gallium3d/data/artwork/icons/Device_Pendrive
haiku/branches/components/gallium3d/data/artwork/icons/File_Archive_XZ
haiku/branches/components/gallium3d/data/artwork/icons/File_Broken_Link_2
haiku/branches/components/gallium3d/data/artwork/icons/File_Generic
haiku/branches/components/gallium3d/data/artwork/icons/File_Image_3
haiku/branches/components/gallium3d/data/artwork/icons/Misc_Atari2600jr.
haiku/branches/components/gallium3d/data/artwork/icons/Misc_AtariST
haiku/branches/components/gallium3d/data/artwork/icons/Misc_Bomb
haiku/branches/components/gallium3d/data/artwork/icons/Misc_Book
haiku/branches/components/gallium3d/data/artwork/icons/Misc_CF_LightBulb
haiku/branches/components/gallium3d/data/artwork/icons/Misc_ClassicMacintosh
haiku/branches/components/gallium3d/data/artwork/icons/Misc_Dragger
haiku/branches/components/gallium3d/data/artwork/icons/Misc_Facebook
haiku/branches/components/gallium3d/data/artwork/icons/Misc_Magic_Wand
haiku/branches/components/gallium3d/data/artwork/icons/Misc_Marker
haiku/branches/components/gallium3d/data/artwork/icons/Misc_NintendoGamecube
haiku/branches/components/gallium3d/data/artwork/icons/Misc_Paper_Plane
haiku/branches/components/gallium3d/data/artwork/icons/Misc_R.I.P.
haiku/branches/components/gallium3d/data/artwork/icons/Misc_Scroll
haiku/branches/components/gallium3d/data/artwork/icons/Misc_Speaker
haiku/branches/components/gallium3d/data/artwork/icons/Misc_TCF_LightBulb
haiku/branches/components/gallium3d/data/artwork/icons/Misc_YouTube
haiku/branches/components/gallium3d/data/artwork/icons/Misc_iMac
haiku/branches/components/gallium3d/data/artwork/icons/Overlay_hand
haiku/branches/components/gallium3d/data/artwork/icons/Prefs_Bluetooth
[... truncated: 2590 changed files follow ...]
Log:
Merged changes from trunk r36915-r38219
Property changes on: haiku/branches/components/gallium3d
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/trunk:33410-35313,35315-36914
+ /haiku/trunk:33410-35313,35315-38219
Modified: haiku/branches/components/gallium3d/3rdparty/mmu_man/Jamfile
===================================================================
--- haiku/branches/components/gallium3d/3rdparty/mmu_man/Jamfile
2010-08-17 23:48:47 UTC (rev 38219)
+++ haiku/branches/components/gallium3d/3rdparty/mmu_man/Jamfile
2010-08-18 00:29:05 UTC (rev 38220)
@@ -1,6 +1,14 @@
SubDir HAIKU_TOP 3rdparty mmu_man ;
-SubInclude HAIKU_TOP 3rdparty mmu_man themes ;
+# theme manager from osdrawer
+# to use it symlink it here.
+{
+ local subDir
+ = [ GLOB [ FDirName $(HAIKU_TOP) 3rdparty mmu_man ] : themes ] ;
+ if $(subDir) {
+ SubInclude HAIKU_TOP 3rdparty mmu_man themes ;
+ }
+}
# distro stuff located in my own branch,
# to use it symlink it here.
Copied:
haiku/branches/components/gallium3d/3rdparty/mmu_man/scripts/bootstrap-haiku.sh
(from rev 38213, haiku/trunk/3rdparty/mmu_man/scripts/bootstrap-haiku.sh)
===================================================================
---
haiku/branches/components/gallium3d/3rdparty/mmu_man/scripts/bootstrap-haiku.sh
(rev 0)
+++
haiku/branches/components/gallium3d/3rdparty/mmu_man/scripts/bootstrap-haiku.sh
2010-08-18 00:29:05 UTC (rev 38220)
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+cd "$(dirname "$0")"
+
+DESTVOL=/haiku
+LOOPVOL=/loopimg
+
+warn () {
+ alert --warning "$*" "Ok"
+}
+
+error () {
+ alert --stop "$*" "Ok"
+ exit 1
+}
+
+log () {
+ echo "$*"
+}
+
+
+if [ ! -d "$DESTVOL" ]; then
+ error "$DESTVOL not mounted"
+ exit 1
+fi
+
+
+find_current_revision () {
+ log "Getting url of latest revision..."
+ tf=/tmp/haiku-files.org_raw_$$
+ wget -O $tf http://haiku-files.org/raw/ >/dev/null 2>&1 || error "wget
error"
+ url="$(grep -m1 'http:.*nightly-.*gcc2hybrid-raw.zip' "$tf" | sed
's/.*href="//;s/".*//')"
+ test -n "$url" || error "cannot find latest build"
+ file="${url##*/}"
+ rm "$tf"
+}
+
+
+download_current_revision () {
+ #if [ ! -e "$file" ]; then
+ log "Downloading latest revision: $file"
+ wget -c "$url" || error "cannot download latest revision"
+ #fi
+}
+
+
+unzip_current_revision () {
+ if [ ! -e "haiku-nightly.image" ]; then
+ log "Unziping..."
+ unzip "$file"
+ fi
+}
+
+
+install_current_revision () {
+ mkdir -p "$LOOPVOL"
+ sync
+ mount -ro "$PWD/haiku-nightly.image" "$LOOPVOL" || error "mount"
+ sync
+
+ copyattr -r -d "$LOOPVOL"/* "$DESTVOL/"
+ sync
+ unmount "$LOOPVOL"
+}
+
+
+makebootable_install () {
+ log "Making the partition bootable..."
+ makebootable "$DESTVOL/"
+}
+
+
+customize_install () {
+ log "Copying files..."
+ copyattr -r -d files/* "$DESTVOL/"
+}
+
+
+
+find_current_revision
+download_current_revision
+#file=haiku-nightly-r37641-x86gcc2hybrid-raw.zip
+unzip_current_revision
+install_current_revision
+makebootable_install
+customize_install
Modified: haiku/branches/components/gallium3d/Jamfile
===================================================================
--- haiku/branches/components/gallium3d/Jamfile 2010-08-17 23:48:47 UTC (rev
38219)
+++ haiku/branches/components/gallium3d/Jamfile 2010-08-18 00:29:05 UTC (rev
38220)
@@ -29,27 +29,6 @@
spamdbm
;
-# Pseudo-target to build the network kit only
-NotFile NetworkingKit ;
-Depends NetworkingKit :
- net_stack_driver net_server_driver
- core
- ethernet loopback ppp
- raw route ipv4 icmp udp tcp
- libnet.so libnetapi.so libbind.so libsocket.so
- ping ifconfig <bin>route traceroute arp pppconfig
-
- # network drivers:
- sis900 rtl8139 rtl8169 via-rhine ipro1000 wb840 bcm440x bcm570x
-
- # PPP devices:
- modem pppoe
- # PPP protocols:
- ipcp
- # PPP authenticators:
- pap
-;
-
# Pseudo-target to build the media stuffs only
NotFile MediaKit ;
Depends MediaKit :
@@ -168,6 +147,8 @@
AddOptionalHaikuImagePackages OpenSSL ;
}
+AddOptionalHaikuImagePackages ICU ;
+
# Evaluate optional package dependencies
include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ;
Modified: haiku/branches/components/gallium3d/Jamrules
===================================================================
--- haiku/branches/components/gallium3d/Jamrules 2010-08-17 23:48:47 UTC
(rev 38219)
+++ haiku/branches/components/gallium3d/Jamrules 2010-08-18 00:29:05 UTC
(rev 38220)
@@ -34,6 +34,7 @@
include [ FDirName $(HAIKU_BUILD_RULES_DIR) HelperRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) MathRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) BeOSRules ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) LocaleRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) CommandLineArguments ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) ConfigRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) DocumentationRules ] ;
Modified:
haiku/branches/components/gallium3d/build/config_headers/kernel_debug_config.h
===================================================================
---
haiku/branches/components/gallium3d/build/config_headers/kernel_debug_config.h
2010-08-17 23:48:47 UTC (rev 38219)
+++
haiku/branches/components/gallium3d/build/config_headers/kernel_debug_config.h
2010-08-18 00:29:05 UTC (rev 38220)
@@ -99,10 +99,13 @@
#define ENABLE_SWAP_SUPPORT 1
// Use the slab allocator as generic memory allocator (malloc()/free()).
-#define USE_SLAB_ALLOCATOR_FOR_MALLOC 0
+#define USE_SLAB_ALLOCATOR_FOR_MALLOC 1
+// Enables additional sanity checks in the slab allocator's memory manager.
+#define DEBUG_SLAB_MEMORY_MANAGER_PARANOID_CHECKS 0
+
// When set limits the amount of available RAM (in MB).
-//#define LIMIT_AVAILABLE_MEMORY 256
+//#define LIMIT_AVAILABLE_MEMORY 256
#endif // KERNEL_DEBUG_CONFIG_H
Modified: haiku/branches/components/gallium3d/build/jam/BeOSRules
===================================================================
--- haiku/branches/components/gallium3d/build/jam/BeOSRules 2010-08-17
23:48:47 UTC (rev 38219)
+++ haiku/branches/components/gallium3d/build/jam/BeOSRules 2010-08-18
00:29:05 UTC (rev 38220)
@@ -268,140 +268,3 @@
fi
$(2[1]) -O -o "$(1)" "$(2[2-])"
}
-
-# Localization rules
-
-# Extract catalog entries from the sourcefile and put the output textfile in
-# target. This output file is then used to create the binary catalog with
-# linkcatkeys.
-rule ExtractCatalogEntries target : source : signature : regexp
-{
- # get compiler and defines for the platform
- local headers ;
- local sysHeaders ;
- local cc ;
- local defines ;
- local localIncludesOption ;
- local systemIncludesOption ;
-
- on $(target) { # use on $(target) variable values
- headers = $(HAIKU_CONFIG_HEADERS) $(SEARCH_SOURCE) $(SUBDIRHDRS)
- $(HDRS) ;
- sysHeaders = $(SUBDIRSYSHDRS) $(SYSHDRS) ;
- defines = $(DEFINES) ;
-
- if $(PLATFORM) = host {
- sysHeaders += $(HOST_HDRS) ;
- defines += $(HOST_DEFINES) ;
-
- if $(USES_BE_API) {
- sysHeaders += $(HOST_BE_API_HEADERS) ;
- }
-
- defines += $(HOST_DEFINES) ;
- cc = $(HOST_CC) ;
- localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
- systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
- } else {
- sysHeaders += $(TARGET_HDRS) ;
- defines += $(TARGET_DEFINES) ;
- defines += $(TARGET_DEFINES) ;
- cc = $(TARGET_CC) ;
- localIncludesOption = $(TARGET_LOCAL_INCLUDES_OPTION) ;
- systemIncludesOption = $(TARGET_SYSTEM_INCLUDES_OPTION)
;
- }
- }
-
- DEFINES on $(target) = $(defines) ;
- CCDEFS on $(target) = [ FDefines $(defines) ] ;
- HDRS on $(target) = [ FIncludes $(headers) : $(localIncludesOption) ]
- $(includesSeparator)
- [ FSysIncludes $(sysHeaders) : $(systemIncludesOption) ] ;
- CC on $(target) = $(cc) ;
-
- HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
- if $(regexp) = "" {
- HAIKU_CATALOG_REGEXP on $(target) = ;
- } else {
- HAIKU_CATALOG_REGEXP on $(target) = -r $(regexp) ;
- }
-
- SEARCH on $(source) += $(SEARCH_SOURCE) ;
-
- MakeLocatePlatform $(target) ;
- Depends $(target) : $(source) <build>collectcatkeys ;
- LocalClean clean : $(target).pre ;
- ExtractCatalogEntries1 $(target) : <build>collectcatkeys $(source) ;
-}
-
-actions ExtractCatalogEntries1
-{
- $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
- cat "$(2[2-])" | $(CC) -E $(CCDEFS) $(HDRS) - > "$(1)".pre
- $(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE)
-w -o "$(1)" "$(1)".pre
-}
-
-rule LinkApplicationCatalog target : sources : signature : language
-{
- # Link catalog entries from given catkey file into output compiled
catalog
- # file. Compiled catalog file will then be copied into the image, but
only
- # if the fingerprint matches the one from the untranslated catalog for
the
- # same file.
-
- MakeLocateArch $(target) ;
- Depends $(target) : $(sources) <build>linkcatkeys ;
- LocalClean clean : $(target) ;
-
- HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
- HAIKU_CATALOG_LANGUAGE on $(target) = $(language) ;
- LinkApplicationCatalog1 $(target) : <build>linkcatkeys $(sources) ;
-}
-
-actions LinkApplicationCatalog1
-{
- $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
- $(2[1]) "$(2[2-])" -l $(HAIKU_CATALOG_LANGUAGE) -v \
- -s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)"
-}
-
-rule DoCatalogs target : signature : sources : sourceLanguage : regexp
-{
- # DoCatalogs <target> : <signature> : <sources> [ : <sourceLanguage> ]
- # [ : <regexp> ]
- #
- # Extracts the catkeys from a target's source files, generates the
- # default catalog from them, and also generates catalogs for all
- # translations.
- #
- # target: The target.
- # signature: Application MIME signature (must match the one
- # declared in the sourcecode).
- # sources: List of cpp files where to search keys.
- # sourceLanguage Short name of the language of used for the
strings in
- # the sources. Optional: default
is "en".
- # regexp The regular expression used to parse the files.
- # Optional: default is matching be_catalog->GetString
-
- local generatedCatalog = [ FGristFiles
$(sourceLanguage:E=en:S=.catalog) ] ;
-
- # generate catkeys file from sources
- ExtractCatalogEntries $(generatedCatalog:S=.catkeys)
- : [ FGristFiles $(sources) ] : $(signature) : $(regexp) ;
-
- # find translations
- local translationsDir
- = [ FDirName $(HAIKU_TOP) data catalogs $(SUBDIR_TOKENS[2-]) ] ;
- local translations = [ Glob $(translationsDir) : *.catkeys ] ;
- translations = [ FGristFiles $(translations:BS) ] ;
- SEARCH on $(translations) += $(translationsDir) ;
-
- # generate catalogs from all catkeys files
- local catkeysFiles = $(generatedCatalog:S=.catkeys) $(translations) ;
- for catkeysFile in $(catkeysFiles) {
- LinkApplicationCatalog $(catkeysFile:S=.catalog) :
$(catkeysFile)
- : $(signature) : $(catkeysFile:B) ;
- }
-
- HAIKU_CATALOG_FILES on $(target) = $(catkeysFiles:S=.catalog) ;
- HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
-}
Modified: haiku/branches/components/gallium3d/build/jam/BuildSetup
===================================================================
--- haiku/branches/components/gallium3d/build/jam/BuildSetup 2010-08-17
23:48:47 UTC (rev 38219)
+++ haiku/branches/components/gallium3d/build/jam/BuildSetup 2010-08-18
00:29:05 UTC (rev 38220)
@@ -65,7 +65,7 @@
HAIKU_DEFAULT_IMAGE_DIR = $(HAIKU_OUTPUT_DIR) ;
HAIKU_DEFAULT_VMWARE_IMAGE_NAME = haiku.vmdk ;
HAIKU_DEFAULT_INSTALL_DIR = /Haiku ;
-HAIKU_DEFAULT_IMAGE_SIZE ?= 192 ; # 192 MB
+HAIKU_DEFAULT_IMAGE_SIZE ?= 220 ; # 220 MB
HAIKU_DEFAULT_IMAGE_LABEL ?= Haiku ;
# Haiku CD defaults
@@ -82,22 +82,19 @@
ProcessCommandLineArguments ;
-# include Timezones/libgccObjects
+# include libgccObjects
{
- local timezones = [ GLOB $(HAIKU_BUILD_OUTPUT_DIR) : Timezones ] ;
local libgccObjects = [ GLOB $(HAIKU_BUILD_OUTPUT_DIR) : libgccObjects
] ;
- if ! ( $(timezones) && $(libgccObjects) ) {
- ECHO "No `Timezones' or `libgccObjects' found in"
+ if ! $(libgccObjects) {
+ ECHO "No `libgccObjects' found in"
"$(HAIKU_BUILD_OUTPUT_DIR)!" ;
EXIT "Please run ./configure in the source tree's root
directory"
"again!" ;
}
- LOCATE on Timezones = $(HAIKU_BUILD_OUTPUT_DIR) ;
LOCATE on libgccObjects = $(HAIKU_BUILD_OUTPUT_DIR) ;
- include Timezones ;
include libgccObjects ;
}
@@ -177,9 +174,18 @@
# distro compatibility level defines
HAIKU_DISTRO_COMPATIBILITY ?= "default" ;
switch $(HAIKU_DISTRO_COMPATIBILITY) {
- case official : HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_OFFICIAL ;
- case compatible : HAIKU_DEFINES +=
HAIKU_DISTRO_COMPATIBILITY_COMPATIBLE ;
- case "default" : HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_DEFAULT ;
+ case official : {
+ HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_OFFICIAL ;
+ HAIKU_INCLUDE_TRADEMARKS = "" ;
+ }
+ case compatible : {
+ HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_COMPATIBLE ;
+ HAIKU_INCLUDE_TRADEMARKS = "" ;
+ }
+ case "default" : {
+ HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_DEFAULT ;
+ HAIKU_INCLUDE_TRADEMARKS = ;
+ }
case * : Exit "Invalid value for
HAIKU_DISTRO_COMPATIBILITY:"
$(HAIKU_DISTRO_COMPATIBILITY) ;
}
@@ -456,11 +462,17 @@
HAIKU_LIBSUPC++ = $(HAIKU_SHARED_LIBSUPC++) ;
}
+
# network libraries
HAIKU_NETWORK_LIBS = network ;
HAIKU_NETAPI_LIB = bnetapi ;
HAIKU_SELECT_UNAME_ETC_LIB = ; # libroot, against which we link anyway
+
+# locale libraries
+HAIKU_LOCALE_LIBS = liblocale.so liblocalestub.a ;
+
+
# library and executable glue code
local commonGlueCode =
<src!system!glue>init_term_dyn.o
@@ -1164,14 +1176,223 @@
}
if $(HAIKU_NO_WERROR) != 1 {
+ EnableWerror src add-ons accelerants 3dfx ;
+ EnableWerror src add-ons accelerants ati ;
+ EnableWerror src add-ons accelerants common ;
+ EnableWerror src add-ons accelerants et6x00 ;
+# EnableWerror src add-ons accelerants intel_extreme ;
+# EnableWerror src add-ons accelerants matrox ;
+ EnableWerror src add-ons accelerants neomagic ;
+# EnableWerror src add-ons accelerants nvidia ;
+ EnableWerror src add-ons accelerants nvidia_gpgpu ;
+# EnableWerror src add-ons accelerants radeon ;
+ EnableWerror src add-ons accelerants radeon_hd ;
+ EnableWerror src add-ons accelerants s3 ;
+ EnableWerror src add-ons accelerants skeleton ;
+ EnableWerror src add-ons accelerants vesa ;
+ EnableWerror src add-ons accelerants via ;
+ EnableWerror src add-ons accelerants vmware ;
+ EnableWerror src add-ons bluetooth ;
+ EnableWerror src add-ons decorators ;
+ EnableWerror src add-ons disk_systems ;
+ EnableWerror src add-ons input_server devices ;
+# EnableWerror src add-ons input_server filters ;
+# EnableWerror src add-ons input_server methods ;
+ EnableWerror src add-ons kernel bluetooth ;
+# EnableWerror src add-ons kernel bus_managers acpi ;
+ EnableWerror src add-ons kernel bus_managers agp_gart ;
+ EnableWerror src add-ons kernel bus_managers ata ;
+ EnableWerror src add-ons kernel bus_managers config_manager ;
+ EnableWerror src add-ons kernel bus_managers firewire ;
+ EnableWerror src add-ons kernel bus_managers isa ;
+ EnableWerror src add-ons kernel bus_managers pci ;
+# EnableWerror src add-ons kernel bus_managers ps2 ; # gcc2
+ EnableWerror src add-ons kernel bus_managers scsi ;
+ EnableWerror src add-ons kernel bus_managers usb ;
+ EnableWerror src add-ons kernel busses agp_gart ;
+ EnableWerror src add-ons kernel busses ata ;
+ EnableWerror src add-ons kernel busses scsi ;
+ EnableWerror src add-ons kernel busses usb ;
+ EnableWerror src add-ons kernel console ;
+ EnableWerror src add-ons kernel cpu ;
+# EnableWerror src add-ons kernel debugger ; # gcc2
+# EnableWerror src add-ons kernel drivers audio ;
+ EnableWerror src add-ons kernel drivers bluetooth ;
+ EnableWerror src add-ons kernel drivers bus ;
+ EnableWerror src add-ons kernel drivers common ;
+ EnableWerror src add-ons kernel drivers disk ;
+ EnableWerror src add-ons kernel drivers dvb ;
+# EnableWerror src add-ons kernel drivers graphics ;
+# EnableWerror src add-ons kernel drivers input ;
+ EnableWerror src add-ons kernel drivers joystick ;
+ EnableWerror src add-ons kernel drivers midi ;
+ EnableWerror src add-ons kernel drivers misc ;
+# EnableWerror src add-ons kernel drivers network ;
+ EnableWerror src add-ons kernel drivers ports ;
+# EnableWerror src add-ons kernel drivers power ;
+ EnableWerror src add-ons kernel drivers printer ;
+ EnableWerror src add-ons kernel drivers random ;
+ EnableWerror src add-ons kernel drivers tty ;
+ EnableWerror src add-ons kernel drivers video ;
EnableWerror src add-ons kernel file_systems bfs ;
+ EnableWerror src add-ons kernel file_systems cdda ;
+# EnableWerror src add-ons kernel file_systems ext2 ;
+# EnableWerror src add-ons kernel file_systems fat ;
+# EnableWerror src add-ons kernel file_systems googlefs ;
+ EnableWerror src add-ons kernel file_systems iso9660 ;
+ EnableWerror src add-ons kernel file_systems layers ;
+ EnableWerror src add-ons kernel file_systems netfs ;
+ EnableWerror src add-ons kernel file_systems nfs ;
+# EnableWerror src add-ons kernel file_systems ntfs ;
EnableWerror src add-ons kernel file_systems packagefs ;
+ EnableWerror src add-ons kernel file_systems ramfs ;
+# EnableWerror src add-ons kernel file_systems reiserfs ;
+ EnableWerror src add-ons kernel file_systems udf ;
EnableWerror src add-ons kernel file_systems userlandfs ;
+ EnableWerror src add-ons kernel generic ;
+ EnableWerror src add-ons kernel network atalink_protocols ;
+ EnableWerror src add-ons kernel network devices ;
+ EnableWerror src add-ons kernel network notifications ;
+ EnableWerror src add-ons kernel network ppp ;
+# EnableWerror src add-ons kernel network protocols ;
+# EnableWerror src add-ons kernel network stack ;
+ EnableWerror src add-ons kernel partitioning_systems ;
+ EnableWerror src add-ons locale ;
+ EnableWerror src add-ons mail_daemon ;
+ EnableWerror src add-ons media media-add-ons demultiplexer ;
+ EnableWerror src add-ons media media-add-ons dvb ;
+ EnableWerror src add-ons media media-add-ons esound_sink ;
+ EnableWerror src add-ons media media-add-ons finepix_webcam ;
+ EnableWerror src add-ons media media-add-ons firewire_dv ;
+ EnableWerror src add-ons media media-add-ons legacy ;
+ EnableWerror src add-ons media media-add-ons mixer ;
+ EnableWerror src add-ons media media-add-ons multi_audio ;
+ EnableWerror src add-ons media media-add-ons opensound ;
+ EnableWerror src add-ons media media-add-ons radeon ;
+ EnableWerror src add-ons media media-add-ons reader ;
+ EnableWerror src add-ons media media-add-ons tone_producer_demo ;
+ EnableWerror src add-ons media media-add-ons usb_vision ;
+# EnableWerror src add-ons media media-add-ons usb_webcam ;
+ EnableWerror src add-ons media media-add-ons video_mixer ;
+# EnableWerror src add-ons media media-add-ons video_producer_demo ;
+ EnableWerror src add-ons media media-add-ons videowindow ;
+ EnableWerror src add-ons media media-add-ons writer ;
+ EnableWerror src add-ons media plugins ac3_decoder ;
+ EnableWerror src add-ons media plugins aiff_reader ;
+ EnableWerror src add-ons media plugins ape_reader ;
+# EnableWerror src add-ons media plugins asf_reader ;
+ EnableWerror src add-ons media plugins au_reader ;
+# EnableWerror src add-ons media plugins avi_reader ;
+# EnableWerror src add-ons media plugins ffmpeg ;
+# EnableWerror src add-ons media plugins matroska ;
+# EnableWerror src add-ons media plugins mov_reader ;
+ EnableWerror src add-ons media plugins mp3_decoder ;
+# EnableWerror src add-ons media plugins mp3_reader ;
+ EnableWerror src add-ons media plugins mp4_reader ;
+ EnableWerror src add-ons media plugins musepack ;
+# EnableWerror src add-ons media plugins ogg ;
+# EnableWerror src add-ons media plugins raw_decoder ;
+# EnableWerror src add-ons media plugins speex ;
+ EnableWerror src add-ons media plugins theora ;
+ EnableWerror src add-ons media plugins vorbis ;
+# EnableWerror src add-ons media plugins wav_reader ;
+ EnableWerror src add-ons media plugins xvid_decoder ;
+# EnableWerror src add-ons opengl ;
+ EnableWerror src add-ons print ;
+ EnableWerror src add-ons screen_savers ;
+ EnableWerror src add-ons tracker ;
+ EnableWerror src add-ons translators bmp ;
+# EnableWerror src add-ons translators exr ;
+ EnableWerror src add-ons translators gif ;
+ EnableWerror src add-ons translators hpgs ;
+ EnableWerror src add-ons translators hvif ;
+ EnableWerror src add-ons translators ico ;
+# EnableWerror src add-ons translators jpeg ; # gcc2
+ EnableWerror src add-ons translators jpeg2000 ;
+ EnableWerror src add-ons translators pcx ;
+# EnableWerror src add-ons translators png ; # gcc2
+ EnableWerror src add-ons translators ppm ;
+ EnableWerror src add-ons translators raw ;
+ EnableWerror src add-ons translators rtf ;
+ EnableWerror src add-ons translators sgi ;
+ EnableWerror src add-ons translators shared ;
+ EnableWerror src add-ons translators stxt ;
+ EnableWerror src add-ons translators tga ;
+ EnableWerror src add-ons translators tiff ;
+# EnableWerror src add-ons translators wonderbrush ;
+# EnableWerror src add-ons print ;
EnableWerror src bin package ;
+ EnableWerror src apps aboutsystem ;
+ EnableWerror src apps activitymonitor ;
+ EnableWerror src apps bootman ;
+ EnableWerror src apps bsnow ;
+ EnableWerror src apps cdplayer ;
+# EnableWerror src apps charactermap ;
+ EnableWerror src apps clock ;
+ EnableWerror src apps codycam ;
+ EnableWerror src apps cortex ;
+ EnableWerror src apps deskbar ;
+ EnableWerror src apps deskcalc ;
+ EnableWerror src apps devices ;
+ EnableWerror src apps diskprobe ;
+# EnableWerror src apps diskusage ;
+ EnableWerror src apps drivesetup ;
+ EnableWerror src apps expander ;
+ EnableWerror src apps fontdemo ;
+ EnableWerror src apps glteapot ;
+ EnableWerror src apps haiku3d ;
+# EnableWerror src apps icon-o-matic ;
+ EnableWerror src apps installer ;
+ EnableWerror src apps launchbox ;
+ EnableWerror src apps magnify ;
+# EnableWerror src apps mail ;
+ EnableWerror src apps mandelbrot ;
+ EnableWerror src apps mediaconverter ;
+# EnableWerror src apps mediaplayer ;
+ EnableWerror src apps midiplayer ;
+ EnableWerror src apps networkstatus ;
+ EnableWerror src apps packageinstaller ;
+ EnableWerror src apps pairs ;
+ EnableWerror src apps people ;
+# EnableWerror src apps poorman ;
+ EnableWerror src apps powerstatus ;
+ EnableWerror src apps processcontroller ;
+ EnableWerror src apps pulse ;
+ EnableWerror src apps readonlybootprompt ;
+ EnableWerror src apps screenshot ;
+ EnableWerror src apps showimage ;
+ EnableWerror src apps soundrecorder ;
+ EnableWerror src apps stylededit ;
+ EnableWerror src apps sudoku ;
+ EnableWerror src apps terminal ;
+ EnableWerror src apps text_search ;
+ EnableWerror src apps tracker ;
+ EnableWerror src apps tv ;
+ EnableWerror src apps workspaces ;
EnableWerror src kits app ;
+ EnableWerror src kits bluetooth ;
+ EnableWerror src kits debug ;
+ EnableWerror src kits device ;
+ EnableWerror src kits game ;
EnableWerror src kits interface ;
+ EnableWerror src kits locale ;
+ EnableWerror src kits mail ;
+# EnableWerror src kits media ; # gcc2
+ EnableWerror src kits midi ;
+ EnableWerror src kits midi2 ;
+ EnableWerror src kits network ;
+ EnableWerror src kits notification ;
+# EnableWerror src kits opengl ;
+ EnableWerror src kits print ;
+ EnableWerror src kits screensaver ;
+ EnableWerror src kits shared ;
EnableWerror src kits storage ;
EnableWerror src kits support ;
+ EnableWerror src kits textencoding ;
+# EnableWerror src kits tracker ;
+ EnableWerror src kits translation ;
+ EnableWerror src preferences ;
+ EnableWerror src servers ;
EnableWerror src system kernel ;
EnableWerror src system runtime_loader ;
}
Modified: haiku/branches/components/gallium3d/build/jam/HaikuImage
===================================================================
--- haiku/branches/components/gallium3d/build/jam/HaikuImage 2010-08-17
23:48:47 UTC (rev 38219)
+++ haiku/branches/components/gallium3d/build/jam/HaikuImage 2010-08-18
00:29:05 UTC (rev 38220)
@@ -44,15 +44,16 @@
listport listres listsem listusb ln locate logger login logname ls
lsindex
mail2mbox makebootable mbox2mail md5sum merge message mimeset mkdos
mkdir
mkfifo mkfs mkindex mktemp modifiers mount mount_nfs mountvolume mv
- netcat netstat nl nohup nproc
+ netcat netstat nl nohup notify nproc
od open
- passwd paste patch pathchk pc ping play playfile playsound playwav pr
prio
- printenv printf profile ps ptx pwd
+ passwd paste patch pathchk pc ping ping6 play playfile playsound playwav
+ pr prio printenv printf profile ps ptx pwd
query quit
rc readlink ReadOnlyBootPrompt reindex release renice rlog rm rmattr
rmindex rmdir roster route
- safemode screen_blanker screenmode sdiff setdecor settype setversion
- setvolume setwep seq sha1sum shar shred shuf shutdown sleep sort spamdbm
+ safemode screen_blanker screenmode screenshot sdiff setdecor settype
+ setversion setvolume setwep seq sha1sum shar shred shuf shutdown sleep
sort
+ spamdbm
split stat strace stty su sum sync sysinfo
tac tail tcpdump tcptester tee telnet telnetd test timeout top touch
tput tr traceroute translate trash true truncate tsort tty
@@ -66,18 +67,16 @@
DiskProbe DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer
LaunchBox Magnify Mail MediaConverter MediaPlayer MidiPlayer
NetworkStatus
PackageInstaller People PoorMan PowerStatus ProcessController Screenshot
- ShowImage SoundRecorder StyledEdit Terminal TextSearch TV Workspaces
+ ShowImage SoundRecorder StyledEdit Terminal TextSearch TV
Workspaces
;
SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations
<preference>Deskbar E-mail FileTypes Fonts Keyboard Keymap Locale Media
- Mouse Network OpenGL Printers Screen ScreenSaver Shortcuts Sounds Time
+ Mouse Network Notifications OpenGL Printers Screen ScreenSaver
Shortcuts Sounds Time
Touchpad <preference>Tracker VirtualMemory
;
-SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo
- GLTeapot Haiku3d Mandelbrot Pairs Playground Pulse Sudoku
+SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo GLTeapot
+ $(HAIKU_INCLUDE_TRADEMARKS)Haiku3d Mandelbrot Pairs Playground Pulse
Sudoku
;
-ICU_LIBS = libicu-common.so libicu-data.so libicu-i18n.so
-;
SYSTEM_LIBS =
libbe.so libbsd.so libbnetapi.so
libdebug.so libdevice.so
@@ -88,7 +87,7 @@
libmail.so libmedia.so libmidi.so libmidi2.so
libnetwork.so
libpng.so
- <revisioned>libroot.so
+ <revisioned>libroot.so libroot-addon-icu.so
libscreensaver.so
libtextencoding.so libtiff.so libtracker.so libtranslation.so
libz.so
@@ -99,24 +98,24 @@
libfluidsynth.so
libilmimf.so
liblinprog.so liblpsolve55.so
- $(ICU_LIBS)
;
SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon
media_addon_server media_server midi_server mount_server net_server
- print_server registrar syslog_daemon
+ notification_server print_server registrar syslog_daemon
;
SYSTEM_NETWORK_DEVICES = ethernet loopback ;
-SYSTEM_NETWORK_DATALINK_PROTOCOLS = ethernet_frame <module>arp loopback_frame
- ipv4_datagram ;
+SYSTEM_NETWORK_DATALINK_PROTOCOLS = ethernet_frame <module>arp loopback_frame ;
+ #ipv6_datagram ;
#SYSTEM_NETWORK_PPP = ipcp modem pap pppoe ;
-SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp unix ;
+SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp unix ; # icmp6 ipv6 ;
SYSTEM_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant
$(X86_ONLY)nvidia.accelerant $(X86_ONLY)matrox.accelerant
$(X86_ONLY)neomagic.accelerant $(X86_ONLY)intel_extreme.accelerant
$(X86_ONLY)s3.accelerant $(X86_ONLY)vesa.accelerant
$(X86_ONLY)ati.accelerant
+ $(X86_ONLY)3dfx.accelerant
#$(X86_ONLY)via.accelerant
#$(X86_ONLY)vmware.accelerant
;
@@ -156,14 +155,15 @@
SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
Print\ To\ File Serial\ Port USB\ Port
;
-SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku Icons IFS Spider Message ;
+SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow Flurry
+ $(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Spider Message ;
SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ;
SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ;
SYSTEM_ADD_ONS_DRIVERS_DRM = drm_test drm_test2 ;
SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
$(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme
$(X86_ONLY)s3 $(X86_ONLY)vesa #$(X86_ONLY)via #$(X86_ONLY)vmware
- $(X86_ONLY)ati
+ $(X86_ONLY)ati $(X86_ONLY)3dfx
;
SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki usb_midi ;
SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
@@ -171,7 +171,7 @@
$(X86_ONLY)broadcom440x $(X86_ONLY)broadcom570x etherpci
$(X86_ONLY)ipro100 $(X86_ONLY)ipro1000 $(X86_ONLY)jmicron2x0
$(X86_ONLY)marvell_yukon $(X86_ONLY)nforce pegasus
- $(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900
+ $(X86_ONLY)rtl8139 $(X86_ONLY)rtl81xx sis900
$(X86_ONLY)syskonnect usb_asix usb_ecm $(X86_ONLY)via_rhine #vlance
$(X86_ONLY)vt612x wb840
@@ -224,9 +224,9 @@
AddFilesToHaikuImage system add-ons kernel debugger
: <kdebug>demangle $(X86_ONLY)<kdebug>disasm <kdebug>hangman
<kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>run_on_exit ;
+AddFilesToHaikuImage system add-ons kernel drm : drm ;
AddFilesToHaikuImage system add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
-AddFilesToHaikuImage system add-ons kernel drm : drm ;
AddFilesToHaikuImage system add-ons kernel generic
: $(ATA_ONLY)ata_adapter dpc $(IDE_ONLY)ide_adapter locked_pool mpu401
scsi_periph ;
@@ -253,7 +253,7 @@
AddDriversToHaikuImage bus : usb_raw fw_raw ;
AddDriversToHaikuImage disk floppy : $(X86_ONLY)pc_floppy ;
AddDriversToHaikuImage disk usb : usb_disk ;
-AddDriversToHaikuImage drm : $(SYSTEM_ADD_ONS_DRIVERS_DRM)
;
+AddDriversToHaikuImage drm : $(SYSTEM_ADD_ONS_DRIVERS_DRM) ;
AddDriversToHaikuImage printer usb : usb_printer ;
AddDriversToHaikuImage disk virtual : nbd ;
AddDriversToHaikuImage dvb : cx23882 ;
@@ -305,8 +305,8 @@
# dri libs
SYSTEM_DRI_LIBS =
-# <gallium>i915_dri.so
-# <gallium>vmwgfx_dri.so
+# <gallium>i915_dri.so
+# <gallium>vmwgfx_dri.so
;
#AddFilesToHaikuHybridImage system lib dri : $(SYSTEM_DRI_LIBS) : : true ;
@@ -327,6 +327,16 @@
SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToHaikuImage system bin :
install-wifi-firmwares.sh ;
+# Add the files to be used by installoptionalpackage.
+AddDirectoryToHaikuImage common data optional-packages ;
+local optional-pkg-files = OptionalBuildFeatures OptionalPackageDependencies
+ OptionalPackages ;
+for name in $(optional-pkg-files) {
+ local file = [ FDirName $(HAIKU_TOP) build jam $(name) ] ;
+ AddFilesToHaikuImage common data optional-packages : $(file) ;
+}
+AddInstalledPackagesFileToHaikuImage ;
+
AddSymlinkToHaikuImage system bin : bash : sh ;
AddSymlinkToHaikuImage system bin : trash : untrash ;
@@ -400,8 +410,9 @@
# Add boot launch directory
AddDirectoryToHaikuImage home config boot launch ;
-local logoArtwork = "HAIKU logo - white on blue - big.png"
- "HAIKU logo - white on blue - normal.png" ;
+local logoArtwork =
+ $(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - big.png"
+ $(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - normal.png" ;
SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ;
AddFilesToHaikuImage system data artwork : $(logoArtwork) ;
@@ -418,17 +429,12 @@
= [ FDirName $(HAIKU_TOP) src apps mail ] ;
AddFilesToHaikuImage system data spell_check word_dictionary : $(spellFiles) ;
-local etcFiles = bash_completion inputrc profile ;
+local etcFiles = inputrc profile ;
etcFiles = $(etcFiles:G=etc) ;
SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;
etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
AddFilesToHaikuImage common etc : $(etcFiles) ;
-SEARCH on <bash_completion>subversion =
- [ FDirName $(HAIKU_TOP) data etc bash_completion.d ] ;
-AddFilesToHaikuImage common etc bash_completion.d :
- <bash_completion>subversion ;
-
local dataFiles = teapot.data ;
dataFiles = $(dataFiles:G=data) ;
SEARCH on $(dataFiles) = [ FDirName $(HAIKU_TOP) data system data ] ;
@@ -469,12 +475,6 @@
local keyboardLayouts = [ Glob $(keyboardLayoutsDir) : [^.]* ] ;
AddFilesToHaikuImage system data KeyboardLayouts : $(keyboardLayouts) ;
-local timezones = [ FTimeZoneBinaries $(HAIKU_TIME_ZONE_SOURCES) : : true ] ;
-for timezone in $(timezones) {
- local dir = [ on $(timezone) return $(RELATIVE_TIMEZONE_DIR) ] ;
- AddFilesToHaikuImage system data timezones $(dir) : $(timezone) ;
-}
-
local driverSettingsFiles = <driver-settings>kernel ;
SEARCH on $(driverSettingsFiles)
= [ FDirName $(HAIKU_TOP) data settings kernel drivers ] ;
@@ -516,12 +516,14 @@
# add-ons
AddFilesToHaikuImage system add-ons accelerants
: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
-#AddFilesToHaikuImage system add-ons opengl
-# : SoftPipe ;
+AddFilesToHaikuImage system add-ons opengl
+ : SoftPipe ;
AddFilesToHaikuHybridImage system add-ons Translators
: $(SYSTEM_ADD_ONS_TRANSLATORS) : : true ;
AddFilesToHaikuImage system add-ons locale catalogs
: $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
+AddFilesToHaikuHybridImage system add-ons locale catalogs
+ : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) : : true ;
AddFilesToHaikuImage system add-ons mail_daemon inbound_protocols : POP3 IMAP ;
AddFilesToHaikuImage system add-ons mail_daemon outbound_protocols : SMTP ;
AddFilesToHaikuImage system add-ons mail_daemon inbound_filters
@@ -564,6 +566,10 @@
AddFilesToHaikuImage system add-ons disk_systems
: <disk_system>intel <disk_system>bfs ;
+# decorators
+AddFilesToHaikuImage home config add-ons decorators :
+ MacDecorator WinDecorator ClassicBe ;
+
# create directories that will remain empty
AddDirectoryToHaikuImage common bin ;
AddDirectoryToHaikuImage common include ;
@@ -597,11 +603,21 @@
AddDirectoryToHaikuImage home config settings printers "Save as PDF"
: home-config-settings-printers-save-as-pdf.rdef ;
+# PDF Writer enconding files
+CopyDirectoryToHaikuImage system data
+ : [ FDirName $(HAIKU_TOP) src add-ons print drivers pdf encoding ]
+ : "PDF Writer" : -x .svn -x Jamfile ;
+
# licenses
CopyDirectoryToHaikuImage system data
: [ FDirName $(HAIKU_TOP) data system data licenses ]
: licenses : -x .svn ;
+# Copy documentation as per DiskUsage's license requirement.
+CopyDirectoryToHaikuImage system documentation
+ : [ FDirName $(HAIKU_TOP) docs apps diskusage ]
+ : diskusage : -x .svn ;
+
# Copy documentation as per PDFlib Lite's license requirement.
CopyDirectoryToHaikuImage system documentation
: [ FDirName $(HAIKU_TOP) src libs pdflib doc ]
@@ -718,7 +734,7 @@
HAIKU_IMAGE_NAME ?= $(HAIKU_DEFAULT_IMAGE_NAME) ;
HAIKU_IMAGE_DIR ?= $(HAIKU_DEFAULT_IMAGE_DIR) ;
HAIKU_IMAGE = $(HAIKU_IMAGE_NAME) ;
-HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 192 MB
+HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 220 MB
HAIKU_IMAGE_LABEL ?= $(HAIKU_DEFAULT_IMAGE_LABEL) ;
MakeLocate $(HAIKU_IMAGE) : $(HAIKU_IMAGE_DIR) ;
Modified: haiku/branches/components/gallium3d/build/jam/HelperRules
===================================================================
--- haiku/branches/components/gallium3d/build/jam/HelperRules 2010-08-17
23:48:47 UTC (rev 38219)
+++ haiku/branches/components/gallium3d/build/jam/HelperRules 2010-08-18
00:29:05 UTC (rev 38220)
@@ -96,48 +96,6 @@
return $(components) ;
}
-rule FTimeZoneBinaries
-{
- local sources = $(1:G=timezone-source) ;
- local locate = $(2) ;
- local setRelativeTimezoneDir = $(3) ;
-
- local gristedBinaries ;
-
- local source ;
- for source in $(sources) {
- local binaries = [ on $(source) return $(TZ_OBJECTS) ] ;
-
- local targetDir = [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR)
- data timezones ] ;
-
- local binary ;
- for binary in $(binaries) {
- local dir = $(binary:D) ;
- if $(dir) {
- binary = $(binary:BSG=timezone!$(dir)) ;
- if $(locate) {
- LOCATE on $(binary) = [ FDirName
$(targetDir) $(dir) ] ;
- }
- } else {
- binary = $(binary:BSG=timezone) ;
- if $(locate) {
- LOCATE on $(binary) = $(targetDir) ;
- }
- }
-
- if $(setRelativeTimezoneDir) {
- RELATIVE_TIMEZONE_DIR on $(binary) = $(dir) ;
- }
-
- gristedBinaries += $(binary) ;
- }
- }
-
- return $(gristedBinaries) ;
-}
-
-
rule SetPlatformCompatibilityFlagVariables
{
# SetPlatformCompatibilityFlagVariables <platform var> : <var prefix>
Modified: haiku/branches/components/gallium3d/build/jam/ImageRules
===================================================================
--- haiku/branches/components/gallium3d/build/jam/ImageRules 2010-08-17
23:48:47 UTC (rev 38219)
+++ haiku/branches/components/gallium3d/build/jam/ImageRules 2010-08-18
00:29:05 UTC (rev 38220)
@@ -785,6 +785,16 @@
}
}
+rule SuppressOptionalHaikuImagePackages packages
+{
+ local package ;
+ for package in $(packages) {
+ if ! [ on $(package) return
$(HAIKU_OPTIONAL_PACKAGE_SUPPRESSED) ] {
+ HAIKU_OPTIONAL_PACKAGE_SUPPRESSED on $(package) = 1 ;
+ }
+ }
+}
+
rule IsOptionalHaikuImagePackageAdded package
{
if ! [ on $(package) return $(HAIKU_OPTIONAL_PACKAGE_EXISTS) ] {
@@ -792,7 +802,8 @@
HAIKU_EXISTING_OPTIONAL_PACKAGES += $(package) ;
}
- if [ on $(package) return $(HAIKU_OPTIONAL_PACKAGE_ADDED) ] {
+ if [ on $(package) return $(HAIKU_OPTIONAL_PACKAGE_ADDED) ] &&
+ ! [ on $(package) return
$(HAIKU_OPTIONAL_PACKAGE_SUPPRESSED) ] {
return 1 ;
}
@@ -926,6 +937,22 @@
: $(entry) ;
Other related posts:
- » [haiku-commits] r38220 - in haiku/branches/components/gallium3d: . 3rdparty/mmu_man 3rdparty/mmu_man/scripts build/config_headers build/jam ... - aljen-mlists
