[haiku-commits] r37179 - in haiku/branches/developer/zooey/posix-locale: . 3rdparty/mmu_man/scripts 3rdparty/mmu_man/themes 3rdparty/mmu_man/themes/addons build/config_headers ...
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 19 Jun 2010 23:11:53 +0200 (CEST)
Author: zooey
Date: 2010-06-19 23:11:40 +0200 (Sat, 19 Jun 2010)
New Revision: 37179
Changeset: http://dev.haiku-os.org/changeset/37179/haiku
Added:
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/themes/addons/PulseAddon.cpp
haiku/branches/developer/zooey/posix-locale/build/jam/AnybootImage
haiku/branches/developer/zooey/posix-locale/build/scripts/build_archive
haiku/branches/developer/zooey/posix-locale/data/artwork/GET HAIKU -
download box
haiku/branches/developer/zooey/posix-locale/data/artwork/GET HAIKU -
download box 2
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU Background
Leaf
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU Background
Leaf - outline
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU Leaf
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU alpha 2 logo
- white on blue - big
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU logo - black
on white - installer
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU logo - white
on black - big
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU logo - white
on black - big.png
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU logo - white
on black - normal
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU logo - white
on black - normal.png
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU logo - white
on black - tiny
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU logo - white
on black - tiny.png
haiku/branches/developer/zooey/posix-locale/data/artwork/Mixed Leaf
Background
haiku/branches/developer/zooey/posix-locale/data/artwork/alpha-numbers-stamp
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ContextMenu
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/Copy
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/CreateLink
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/Cross
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/FollowLink
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/Grab
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/Grabbing
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/Help
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/IBeam
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/Move
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/NotAllowed
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/Pointer
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/Progress
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ResizeEast
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ResizeEastWest
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ResizeNorth
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ResizeNorthEast
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ResizeNorthEastSouthWest
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ResizeNorthSouth
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ResizeNorthWest
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ResizeNorthWestSouthEast
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ResizeSouth
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ResizeSouthEast
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ResizeSouthWest
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ResizeWest
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/VerticalText
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ZoomIn
haiku/branches/developer/zooey/posix-locale/data/artwork/cursors/ZoomOut
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Action_Download
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Action_GoHome
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Action_GoHome_2
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Action_GoHome_3
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Poorman_2
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_bootman
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Device_Clipboard
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Device_FlatbedScanner
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/File_Image_1
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/File_Plugin
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/File_Spool_2
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/File_WonderBrush
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_Atari2600jr.
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_AtariST
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_ClassicMacintosh
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_Facebook
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_NintendoGamecube
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_YouTube
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_iMac
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Prefs_Locale
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Prefs_OpenGL
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Prefs_Printer_PDF
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Prefs_Printer_PDF_2
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Prefs_Touchpad
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Prefs_Touchpad2
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Tracker_copy
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Afghanistan
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Albania
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Algeria
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Angola
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Anguilla
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Antigua_and_Barbuda
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Argentina
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Armenia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Austia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Australia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Azerbaijan
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Bahrain
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Bangladesh
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Barbados
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Belarus
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Belgium
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Benin
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Bolivia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Bulgaria
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Burkina
Faso
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Cameroon
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Canada
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Chad
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Chile
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/China
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Colombia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Czech
Republic
[... truncated: 1300 added files follow ...]
Removed:
haiku/branches/developer/zooey/posix-locale/build/scripts/build_haiku_cd
haiku/branches/developer/zooey/posix-locale/build/scripts/build_tgz_archive
haiku/branches/developer/zooey/posix-locale/build/scripts/build_zip_archive
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Afghanistan
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Albania
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Algeria
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Angola
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Anguilla
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Antigua_and_Barbuda
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Argentina
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Armenia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Austia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Australia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Azerbaijan
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Bahrain
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Bangladesh
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Barbados
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Belarus
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Belgium
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Benin
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Bolivia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Bulgaria
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Burkina
Faso
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Cameroon
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Canada
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Chad
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Chile
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/China
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Colombia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Czech
Republic
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Denmark
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Djibouti
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Estonia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Finland
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/France
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Gabon
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Germany
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Ghana
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Guinea
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Guinea
Bissau
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Haiti
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Hungary
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Iceland
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Indonesia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Ireland
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Israel
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Italy
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Ivory
Coast
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Japan
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Kuwait
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Laos
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Latvia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Libya
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Lithuania
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Luxembourg
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Madagascar
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Mali
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Mauritius
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Monaco
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Netherlands
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Niger
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Nigeria
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Norway
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Palau
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Peru
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Poland
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Republic
of the Congo
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Romania
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Russia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Senegal
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Serbia
and Montenegro
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Sierra
Leone
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Somalia
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Sudan
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Sweden
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Switzerland
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Ukraine
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/United
Arab Emirates
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Vietnam
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/flags/Yemen
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/pt_BR.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/de.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/es.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/fi.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/fr.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/ja.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/lt.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/pt.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/pt_br.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/ru.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/uk.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/da.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/fi.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/fr.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/ja.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/lt.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/pt.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/pt_br.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/ro.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/ru.catkeys
[... truncated: 997 deleted files follow ...]
Modified:
haiku/branches/developer/zooey/posix-locale/
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/scripts/dev-perso
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/themes/ThemeInterfaceView.cpp
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/themes/addons/WinampSkinAddon.cpp
haiku/branches/developer/zooey/posix-locale/Jamfile
haiku/branches/developer/zooey/posix-locale/Jamrules
haiku/branches/developer/zooey/posix-locale/build/config_headers/kernel_debug_config.h
haiku/branches/developer/zooey/posix-locale/build/config_headers/tracing_config.h
haiku/branches/developer/zooey/posix-locale/build/jam/BeOSRules
haiku/branches/developer/zooey/posix-locale/build/jam/BuildSetup
haiku/branches/developer/zooey/posix-locale/build/jam/CDRules
haiku/branches/developer/zooey/posix-locale/build/jam/CommandLineArguments
haiku/branches/developer/zooey/posix-locale/build/jam/FileRules
haiku/branches/developer/zooey/posix-locale/build/jam/HaikuCD
haiku/branches/developer/zooey/posix-locale/build/jam/HaikuImage
haiku/branches/developer/zooey/posix-locale/build/jam/ImageRules
haiku/branches/developer/zooey/posix-locale/build/jam/MiscRules
haiku/branches/developer/zooey/posix-locale/build/jam/OptionalBuildFeatures
haiku/branches/developer/zooey/posix-locale/build/jam/OptionalPackageDependencies
haiku/branches/developer/zooey/posix-locale/build/jam/OptionalPackages
haiku/branches/developer/zooey/posix-locale/build/jam/OptionalTestPackages
haiku/branches/developer/zooey/posix-locale/build/jam/ReleaseBuildProfiles
haiku/branches/developer/zooey/posix-locale/build/jam/UserBuildConfig.ReadMe
haiku/branches/developer/zooey/posix-locale/build/jam/UserBuildConfig.sample
haiku/branches/developer/zooey/posix-locale/build/scripts/build_haiku_image
haiku/branches/developer/zooey/posix-locale/configure
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU logo - black
on white - tiny.png
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU logo -
black.svg
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU logo -
website - everything
haiku/branches/developer/zooey/posix-locale/data/artwork/HAIKU logo -
website - logo
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Alert_Idea
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_BeHappy
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_BeVexed
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Beacon
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Beacon_2
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Beacon_3
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Beam_1_NewMail
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Beam_2_NewMail
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Beam_2_NoMail
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Beam_3_NewMail
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Beam_3_NoMail
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Bikeshed
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_CharacterMap
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_DOS-Box
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Debugger
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_DiskUsage
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Finance
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Generic_4
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_ImageEditor
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Mail_None
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Old
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Poorman
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_TV_2
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_Transmission
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_XEmacs
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/App_YAB
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_01_Black
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_02_Dark_Grey
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_03_Grey
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_04_Light_Grey
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_05_White
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_06_Red
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_07_Rose
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_08_Orange
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_09_Apricot
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_10_Yellow
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_11_Cream
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_12_Green
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_13_Lime
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_14_Turquoise
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_15_Aquamarine
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_16_Blue
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_17_Cyan
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_18_Violet
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_19_Mauve
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_20_Magenta
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_21_Pink
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_22_Brown
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Color_23_Beige
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Device_Harddisk_development
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Device_MemoryStick
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Device_Mobile
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Device_Pendrive
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/File_Archive_XZ
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/File_Broken_Link_2
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/File_Generic
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/File_Image_3
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_Bomb
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_Book
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_CF_LightBulb
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_Dragger
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_Hand
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_Magic_Wand
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_Marker
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_Paper_Plane
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_R.I.P.
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_Scroll
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_Speaker
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_Speaker_Box
haiku/branches/developer/zooey/posix-locale/data/artwork/icons/Misc_TCF_LightBulb
[... truncated: 3148 changed files follow ...]
Log:
* merged all changes from trunk (part1)
Property changes on: haiku/branches/developer/zooey/posix-locale
___________________________________________________________________
Added: svn:mergeinfo
+ /haiku/trunk:35646-37177
Modified:
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/scripts/dev-perso
===================================================================
---
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/scripts/dev-perso
2010-06-19 20:26:04 UTC (rev 37178)
+++
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/scripts/dev-perso
2010-06-19 21:11:40 UTC (rev 37179)
@@ -89,6 +89,7 @@
mkdir "$DEVROOT/$1" && touch "$DEVROOT/$1/.profile"
# fallback
fi
+ export DEVPROJ="$1"
if [ ! -d "$DEVROOT/$1" ]; then
echo "invalid project name '$1'"
return 1
@@ -104,16 +105,20 @@
history -r
# set the prompt
# cf. http://tldp.org/HOWTO/Bash-Prompt-HOWTO/
+ NICEPS1='\[\033[1m\][\u@\h \w]\[\033[0m\]\$ '
case "$TERM" in
dumb|emacs)
# simpler prompt
export PS1='[\u@\h \w]\$ '
;;
+ linux)
+ export PS1="$NICEPS1"
+ ;;
*)
# prompt: set window title to [project:folder] also
#export PS1='\[\033]0;['$1':\W]\a\]\[\033[1m\][\u@\h
\w]\[\033[0m\]\$ '
#export PS1='\033]0;['$1':\W]\a\033[1m[\u@\h \w]\033[0m\$ '
- export PS1='\[\033[1m\][\u@\h \w]\[\033[0m\]\$ '
+ export PS1="$NICEPS1"
export PROMPT_COMMAND='echo -en "\033]0;['$1':${PWD##*/}]\a"'
;;
esac
@@ -122,6 +127,9 @@
beos|haiku)
prio $$ 1
;;
+ darwin10.*)
+ renice 3 $$
+ ;;
linux-*)
# linux doesn't really need it much
#renice 3 $$
Modified:
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/themes/ThemeInterfaceView.cpp
===================================================================
---
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/themes/ThemeInterfaceView.cpp
2010-06-19 20:26:04 UTC (rev 37178)
+++
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/themes/ThemeInterfaceView.cpp
2010-06-19 21:11:40 UTC (rev 37179)
@@ -66,7 +66,7 @@
const uint32 kShowSSPulse = 'TmH2';
static const uint32 skOnlineThemes = 'TmOL';
-static char* skThemeURL =
"http://www.zeta-os.com/cms/download.php?list.4";;
+static const char* skThemeURL =
"http://www.zeta-os.com/cms/download.php?list.4";;
#define HIDESS_OFFSET (Bounds().Width()/2 - 130)
@@ -436,7 +436,7 @@
break;
case skOnlineThemes:
- be_roster->Launch( "application/x-vnd.Mozilla-Firefox",
1, &skThemeURL);
+ be_roster->Launch( "application/x-vnd.Mozilla-Firefox",
1, (char **)&skThemeURL);
break;
default:
@@ -859,6 +859,11 @@
fScreenshotPane->ClearViewBitmap();
if (shot)
{
+#ifdef __HAIKU__
+ fScreenshotPane->SetViewBitmap(shot, shot->Bounds(),
+ fScreenshotPane->Bounds(), B_FOLLOW_ALL,
B_FILTER_BITMAP_BILINEAR);
+
+#else
BBitmap scaled(fScreenshotPane->Bounds(), B_RGB32);
status_t err = ENOSYS;
#ifdef B_ZETA_VERSION
@@ -870,8 +875,10 @@
}
else
{
- fScreenshotPane->SetViewBitmap(shot, shot->Bounds(),
fScreenshotPane->Bounds());
+ fScreenshotPane->SetViewBitmap(shot, shot->Bounds(),
+ fScreenshotPane->Bounds());
}
+#endif
}
fScreenshotPane->Invalidate(fScreenshotPane->Bounds());
Copied:
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/themes/addons/PulseAddon.cpp
(from rev 37177, haiku/trunk/3rdparty/mmu_man/themes/addons/PulseAddon.cpp)
===================================================================
---
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/themes/addons/PulseAddon.cpp
(rev 0)
+++
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/themes/addons/PulseAddon.cpp
2010-06-19 21:11:40 UTC (rev 37179)
@@ -0,0 +1,152 @@
+/*
+ * Pulse colors ThemesAddon class
+ */
+
+#include <Alert.h>
+#include <Application.h>
+#include <Directory.h>
+#include <Message.h>
+#include <Messenger.h>
+#include <Roster.h>
+
+#include <string.h>
+
+#include "ThemesAddon.h"
+#include "UITheme.h"
+
+#ifdef SINGLE_BINARY
+#define instantiate_themes_addon instantiate_themes_addon_pulse
+#endif
+
+#define A_NAME "Pulse"
+#define A_MSGNAME Z_THEME_PULSE_SETTINGS
+#define A_DESCRIPTION "Pulse colors"
+
+class PulseThemesAddon : public ThemesAddon {
+public:
+ PulseThemesAddon();
+ ~PulseThemesAddon();
+
+const char *Description();
+
+status_t RunPreferencesPanel();
+
+status_t AddNames(BMessage &names);
+
+status_t ApplyTheme(BMessage &theme, uint32 flags=0L);
+status_t MakeTheme(BMessage &theme, uint32 flags=0L);
+
+status_t ApplyDefaultTheme(uint32 flags=0L);
+};
+
+PulseThemesAddon::PulseThemesAddon()
+ : ThemesAddon(A_NAME, A_MSGNAME)
+{
+}
+
+PulseThemesAddon::~PulseThemesAddon()
+{
+}
+
+const char *PulseThemesAddon::Description()
+{
+ return A_DESCRIPTION;
+}
+
+status_t PulseThemesAddon::RunPreferencesPanel()
+{
+ status_t err;
+ entry_ref ref;
+ BEntry ent;
+ err = ent.SetTo("/boot/beos/preferences/Pulse");
+ if (!err) {
+ err = ent.GetRef(&ref);
+ if (!err) {
+ err = be_roster->Launch(&ref);
+ }
+ }
+ if (!err)
+ return B_OK;
+ err = ent.SetTo("/system/add-ons/Preferences/Pulse");
+ if (!err) {
+ err = ent.GetRef(&ref);
+ if (!err) {
+ err = be_roster->Launch(&ref);
+ if (err) {
+ BMessage msg(B_REFS_RECEIVED);
+ msg.AddRef("refs", &ref);
+ be_app_messenger.SendMessage(&msg);
+ }
+ }
+ }
+ return err;
+}
+
+status_t PulseThemesAddon::AddNames(BMessage &names)
+{
+ names.AddString(Z_THEME_PULSE_SETTINGS, "Pulse colors");
+ //names.AddString("db:location", "Pulse on-screen position");
+ //names.AddString("db:expanded", "Pulse is expanded");
+ return B_OK;
+}
+
+status_t PulseThemesAddon::ApplyTheme(BMessage &theme, uint32 flags)
+{
+ BMessage deskbar;
+ status_t err;
+ int32 loc = 5;
+ bool expanded = true;
+ BPulse db;
+
+ if (!(flags & UI_THEME_SETTINGS_SET_ALL) || !(AddonFlags() &
Z_THEME_ADDON_DO_SET_ALL))
+ return B_OK;
+
+ err = MyMessage(theme, deskbar);
+ if (err)
+ return err;
+
+ if (deskbar.FindInt32("db:location", &loc) != B_OK)
+ return ENOENT;
+ deskbar.FindBool("db:expanded", &expanded);
+ return db.SetLocation((deskbar_location)loc, expanded);
+}
+
+status_t PulseThemesAddon::MakeTheme(BMessage &theme, uint32 flags)
+{
+ BMessage deskbar;
+ status_t err;
+
+ (void)flags;
+ err = MyMessage(theme, deskbar);
+ if (err)
+ deskbar.MakeEmpty();
+
+ deskbar_location loc;
+ bool expanded;
+ BPulse db;
+
+ loc = db.Location(&expanded);
+ deskbar.AddInt32("db:location", (int32)loc);
+ deskbar.AddBool("db:expanded", expanded);
+
+ err = SetMyMessage(theme, deskbar);
+ return err;
+}
+
+status_t PulseThemesAddon::ApplyDefaultTheme(uint32 flags)
+{
+ BMessage theme;
+ BMessage deskbar;
+ deskbar_location loc = B_DESKBAR_RIGHT_TOP;
+ bool expanded = true;
+ deskbar.AddInt32("db:location", (int32)loc);
+ deskbar.AddBool("db:expanded", expanded);
+ theme.AddMessage(A_MSGNAME, &deskbar);
+ return ApplyTheme(theme, flags);
+}
+
+
+ThemesAddon *instantiate_themes_addon()
+{
+ return (ThemesAddon *) new PulseThemesAddon;
+}
Modified:
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/themes/addons/WinampSkinAddon.cpp
===================================================================
---
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/themes/addons/WinampSkinAddon.cpp
2010-06-19 20:26:04 UTC (rev 37178)
+++
haiku/branches/developer/zooey/posix-locale/3rdparty/mmu_man/themes/addons/WinampSkinAddon.cpp
2010-06-19 21:11:40 UTC (rev 37179)
@@ -147,11 +147,12 @@
else
err = SPSkin(&name);
/* try the other way round */
- if (err)
+ if (err) {
if (WhichApp() == USE_CL)
err = CLSkin(&name, true);
else
err = SPSkin(&name, true);
+ }
if (!err)
skin.AddString("winamp:skin", name);
err = SetMyMessage(theme, skin);
Modified: haiku/branches/developer/zooey/posix-locale/Jamfile
===================================================================
--- haiku/branches/developer/zooey/posix-locale/Jamfile 2010-06-19 20:26:04 UTC
(rev 37178)
+++ haiku/branches/developer/zooey/posix-locale/Jamfile 2010-06-19 21:11:40 UTC
(rev 37179)
@@ -151,17 +151,26 @@
LocaleKitTests
;
+# Prepare the optional build features before parsing the Jamfile tree.
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalBuildFeatures ] ;
+
# Add optional packages given via HAIKU_ADD_OPTIONAL_PACKAGES.
if $(HAIKU_ADD_OPTIONAL_PACKAGES) {
AddOptionalHaikuImagePackages
[ FSplitString $(HAIKU_ADD_OPTIONAL_PACKAGES) : / ] ;
}
-# Evaluate optional package dependencies and prepare the optional build
-# features before parsing the Jamfile tree.
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalBuildFeatures ] ;
+# Include packages that are required by all images.
+AddOptionalHaikuImagePackages MandatoryPackages ;
+# If enabled, make sure that OpenSSL is added to the image.
+if $(HAIKU_OPENSSL_ENABLED) {
+ AddOptionalHaikuImagePackages OpenSSL ;
+}
+
+# Evaluate optional package dependencies
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ;
+
# Optionally we allow not to include the "src" subdirectory.
if $(HAIKU_DONT_INCLUDE_SRC) {
# Don't include "src", but at least include the stuff needed for the
@@ -191,6 +200,7 @@
include [ FDirName $(HAIKU_BUILD_RULES_DIR) CDBootImage ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) CDBootPPCImage ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuCD ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) AnybootImage ] ;
# Check whether all requested optional packages do actually exist.
local package ;
Modified: haiku/branches/developer/zooey/posix-locale/Jamrules
===================================================================
--- haiku/branches/developer/zooey/posix-locale/Jamrules 2010-06-19
20:26:04 UTC (rev 37178)
+++ haiku/branches/developer/zooey/posix-locale/Jamrules 2010-06-19
21:11:40 UTC (rev 37179)
@@ -77,7 +77,8 @@
# check whether it is unknown or one of the default profiles.
if $(HAIKU_BUILD_PROFILE) && ! $(HAIKU_BUILD_PROFILE_DEFINED) {
# define the obvious default profiles
- if $(HAIKU_BUILD_PROFILE) in image vmware-image install {
+ if $(HAIKU_BUILD_PROFILE) in anyboot-image cd-image image install
+ vmware-image {
DefineBuildProfile $(HAIKU_BUILD_PROFILE) :
$(HAIKU_BUILD_PROFILE) ;
} else {
Exit "Build profile" $(HAIKU_BUILD_PROFILE) "not defined." ;
Modified:
haiku/branches/developer/zooey/posix-locale/build/config_headers/kernel_debug_config.h
===================================================================
---
haiku/branches/developer/zooey/posix-locale/build/config_headers/kernel_debug_config.h
2010-06-19 20:26:04 UTC (rev 37178)
+++
haiku/branches/developer/zooey/posix-locale/build/config_headers/kernel_debug_config.h
2010-06-19 21:11:40 UTC (rev 37179)
@@ -24,7 +24,11 @@
// Set to 0 to disable support for kernel breakpoints.
#define KERNEL_BREAKPOINTS 1
+// Enables the debug syslog feature (accessing the previous syslog in the boot
+// loader) by default. Can be overridden in the boot loader menu.
+#define KDEBUG_ENABLE_DEBUG_SYSLOG KDEBUG_LEVEL_1
+
// block/file cache
// Enables debugger commands.
Modified:
haiku/branches/developer/zooey/posix-locale/build/config_headers/tracing_config.h
===================================================================
---
haiku/branches/developer/zooey/posix-locale/build/config_headers/tracing_config.h
2010-06-19 20:26:04 UTC (rev 37178)
+++
haiku/branches/developer/zooey/posix-locale/build/config_headers/tracing_config.h
2010-06-19 21:11:40 UTC (rev 37179)
@@ -26,6 +26,10 @@
#define BLOCK_CACHE_BLOCK_TRACING 0
#define BLOCK_CACHE_TRANSACTION_TRACING 0
#define BMESSAGE_TRACING 0
+#define FILE_DESCRIPTOR_TRACING 0
+#define FILE_DESCRIPTOR_TRACING_STACK_TRACE 0 /* stack trace
depth */
+#define IO_CONTEXT_TRACING 0
+#define IO_CONTEXT_TRACING_STACK_TRACE 0 /* stack trace
depth */
#define KERNEL_HEAP_TRACING 0
#define KTRACE_PRINTF_STACK_TRACE 0 /*
stack trace depth */
#define NET_BUFFER_TRACING 0
Copied: haiku/branches/developer/zooey/posix-locale/build/jam/AnybootImage
(from rev 37177, haiku/trunk/build/jam/AnybootImage)
===================================================================
--- haiku/branches/developer/zooey/posix-locale/build/jam/AnybootImage
(rev 0)
+++ haiku/branches/developer/zooey/posix-locale/build/jam/AnybootImage
2010-06-19 21:11:40 UTC (rev 37179)
@@ -0,0 +1,50 @@
+# Set anyboot file name and directory defaults.
+HAIKU_ANYBOOT_NAME ?= $(HAIKU_DEFAULT_ANYBOOT_NAME) ;
+HAIKU_ANYBOOT_DIR ?= $(HAIKU_DEFAULT_ANYBOOT_DIR) ;
+HAIKU_ANYBOOT = $(HAIKU_ANYBOOT_NAME) ;
+HAIKU_ANYBOOT_LABEL ?= $(HAIKU_DEFAULT_ANYBOOT_LABEL) ;
+
+rule BuildAnybootMBR binary : source {
+ Depends $(binary) : $(source) ;
+
+ MBR_SOURCE on $(binary) = $(source) ;
+
+ BuildAnybootMBR1 $(binary) ;
+}
+
+actions BuildAnybootMBR1 {
+ $(RM) $(1)
+ $(TARGET_CC) $(MBR_SOURCE) -o $(1) -nostdlib -Xlinker --oformat=binary
-Xlinker -S -Xlinker -N -Xlinker "-e start" -Xlinker "-Ttext=0x600"
+}
+
+rule BuildAnybootImage anybootImage : mbrPart : isoPart : imageFile {
+ local anyboot = <build>anyboot ;
+
+ Depends $(anybootImage) : $(anyboot) ;
+ Depends $(anybootImage) : $(isoPart) ;
+ Depends $(anybootImage) : $(mbrPart) ;
+ Depends $(anybootImage) : $(imageFile) ;
+
+ BuildAnybootImage1 $(anybootImage) : $(anyboot) $(isoPart) $(mbrPart)
$(imageFile) ;
+}
+
+actions BuildAnybootImage1 {
+ $(2[1]) $(1) $(2[2]) $(2[3]) $(2[4])
+}
+
+local baseMBR = base_mbr.bin ;
+local mbrSource = [ FDirName $(HAIKU_TOP) src bin writembr mbr.S ] ;
+BuildAnybootMBR $(baseMBR) : $(mbrSource) ;
+MakeLocate $(baseMBR) : $(HAIKU_OUTPUT_DIR) ;
+MakeLocate $(HAIKU_ANYBOOT) : $(HAIKU_ANYBOOT_DIR) ;
+BuildAnybootImage $(HAIKU_ANYBOOT) : $(baseMBR) : $(HAIKU_CD_BOOT_IMAGE)
+ : $(HAIKU_IMAGE_NAME) ;
+
+# TODO: this one seems to cause the build to fail each other run (caching?)
+#RmTemps $(HAIKU_ANYBOOT) : $(baseMBR) ;
+RmTemps $(HAIKU_ANYBOOT) : $(HAIKU_CD_BOOT_IMAGE) ;
+RmTemps $(HAIKU_ANYBOOT) : $(HAIKU_IMAGE_NAME) ;
+RmTemps $(HAIKU_ANYBOOT) : $(HAIKU_BOOT_FLOPPY) ;
+
+NotFile haiku-anyboot-image ;
+Depends haiku-anyboot-image : $(HAIKU_ANYBOOT) ;
Modified: haiku/branches/developer/zooey/posix-locale/build/jam/BeOSRules
===================================================================
--- haiku/branches/developer/zooey/posix-locale/build/jam/BeOSRules
2010-06-19 20:26:04 UTC (rev 37178)
+++ haiku/branches/developer/zooey/posix-locale/build/jam/BeOSRules
2010-06-19 21:11:40 UTC (rev 37179)
@@ -187,7 +187,7 @@
local cc ;
local defines ;
local localIncludesOption ;
-
+
on $(1) { # use on $(1) variable values
defines = $(DEFINES) ;
@@ -204,9 +204,9 @@
DEFINES on $(1) = $(defines) ;
CCDEFS on $(1) = [ FDefines $(defines) ] ;
- HDRS on $(1) = [ FIncludes $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS)
+ HDRS on $(1) = [ FIncludes $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS)
: $(localIncludesOption) ] ;
- RCHDRS on $(1) = [ FIncludes $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS)
+ RCHDRS on $(1) = [ FIncludes $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS)
: "-I " ] ;
CC on $(1) = $(cc) ;
@@ -274,7 +274,7 @@
# 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
+rule ExtractCatalogEntries target : source : signature : regexp
{
# get compiler and defines for the platform
local headers ;
@@ -319,7 +319,12 @@
[ FSysIncludes $(sysHeaders) : $(systemIncludesOption) ] ;
CC on $(target) = $(cc) ;
- LOCALE_KIT_SIGNATURE on $(target) = $(signature) ;
+ 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) ;
@@ -333,54 +338,70 @@
{
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
cat "$(2[2-])" | $(CC) -E $(CCDEFS) $(HDRS) - > "$(1)".pre
- $(2[1]) -s $(LOCALE_KIT_SIGNATURE) -w -o "$(1)" "$(1)".pre
+ $(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE)
-w -o "$(1)" "$(1)".pre
}
-# 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.
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) ;
- LOCALE_KIT_SIGNATURE on $(target) = $(signature) ;
Depends $(target) : $(sources) <build>linkcatkeys ;
LocalClean clean : $(target) ;
- LinkApplicationCatalog1 $(target)
- : <build>linkcatkeys $(language) $(sources) ;
+
+ 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[3-])" -l $(2[2]:B) -v -s $(LOCALE_KIT_SIGNATURE) -o "$(1)"
+ $(2[1]) "$(2[2-])" -l $(HAIKU_CATALOG_LANGUAGE) -v \
+ -s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)"
}
-# General rules to invoke from jamfiles and that do (almost) everything related
-# to localization
-rule DoCatalogs appName # Application name
- : signature # Application MIME signature (must match the one
- # declared in the sourcecode)
- : sources # List of cpp files where to search keys
- : generatedCatalog # Name of the generated catalog (most probably
- # en.catalog)
- : translatedCatalogs # List of available translations
+rule DoCatalogs target : signature : sources : sourceLanguage : regexp
{
- genCat = [ FGristFiles $(generatedCatalog) ] ;
- trans = [ FGristFiles $(translatedCatalogs) ] ;
- srcs = [ FGristFiles $(sources) ] ;
- SEARCH on $(trans) += [ FDirName $(HAIKU_TOP) data catalogs
$(SUBDIR_TOKENS[2-]) ] ;
+ # 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
- ExtractCatalogEntries $(genCat:S=.catkeys) : $(srcs) : $(signature) ;
+ local generatedCatalog = [ FGristFiles
$(sourceLanguage:E=en:S=.catalog) ] ;
- LinkApplicationCatalog $(genCat) : $(genCat:S=.catkeys)
- : $(signature) : $(genCat:B) ;
-
- for catalog in $(trans)
- {
- LinkApplicationCatalog $(catalog:S=.catalog) : $(catalog)
- : $(signature) : $(catalog:B) ;
+ # 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) ;
}
-
- AddFilesToHaikuImage system data locale catalogs $(signature) :
- $(genCat) $(trans:S=.catalog) ;
+
+ HAIKU_CATALOG_FILES on $(target) = $(catkeysFiles:S=.catalog) ;
+ HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
}
Modified: haiku/branches/developer/zooey/posix-locale/build/jam/BuildSetup
===================================================================
--- haiku/branches/developer/zooey/posix-locale/build/jam/BuildSetup
2010-06-19 20:26:04 UTC (rev 37178)
+++ haiku/branches/developer/zooey/posix-locale/build/jam/BuildSetup
2010-06-19 21:11:40 UTC (rev 37179)
@@ -73,6 +73,11 @@
HAIKU_DEFAULT_CD_DIR = $(HAIKU_OUTPUT_DIR) ;
HAIKU_DEFAULT_CD_LABEL = Haiku ;
+# Haiku Anyboot defaults
+HAIKU_DEFAULT_ANYBOOT_NAME = haiku-anyboot.image ;
+HAIKU_DEFAULT_ANYBOOT_DIR = $(HAIKU_OUTPUT_DIR) ;
+HAIKU_DEFAULT_ANYBOOT_LABEL ?= Haiku ;
+
# analyze and optionally replace jam's target parameters
ProcessCommandLineArguments ;
@@ -182,6 +187,7 @@
# analyze the gcc machine spec to determine HAIKU_CPU
switch $(HAIKU_GCC_MACHINE) {
case i?86-* : HAIKU_CPU = x86 ;
+ case x86_64-* : HAIKU_CPU = x86_64 ;
case powerpc-* : HAIKU_CPU = ppc ;
case m68k-* : HAIKU_CPU = m68k ;
case mipsel-* : HAIKU_CPU = mipsel ;
@@ -238,6 +244,19 @@
Exit "HAIKU_YASM not set. Please re-run configure." ;
}
}
+ case x86_64 :
+ {
+ HAIKU_DEFINES += __x86_64__ ;
+ HAIKU_BOOT_PLATFORM = bios_ia32 ;
+ HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
+ # offset in floppy image (>= sizeof(haiku_loader))
+ HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
+
+ # yasm is required for target arch x86_64
+ if ! $(HAIKU_YASM) {
+ Exit "HAIKU_YASM not set. Please re-run configure." ;
+ }
+ }
case m68k :
{
HAIKU_DEFINES += __M68K__ ;
@@ -336,6 +355,12 @@
# available with gcc 2, but the header will take care of that.
HAIKU_DEFINES += B_USE_BUILTIN_ATOMIC_FUNCTIONS ;
}
+ case x86_64 :
+ {
+ # Enable use of the gcc built-in atomic functions instead of
atomic_*().
+ # The former are inlined and have thus less overhead.
+ HAIKU_DEFINES += B_USE_BUILTIN_ATOMIC_FUNCTIONS ;
+ }
}
# If the environment variable HAIKU_INCLUDE_PATENTED_CODE is defined, we
@@ -481,8 +506,8 @@
# init library name map
{
local i ;
- for i in be game GL mail media midi midi2 network bnetapi opengl
- screensaver root z textencoding tracker translation {
+ for i in be bnetapi debug game GL locale mail media midi midi2 network
+ opengl root screensaver textencoding tracker
translation z {
HAIKU_LIBRARY_NAME_MAP_$(i) = lib$(i).so ;
}
HAIKU_LIBRARY_NAME_MAP_libstdc++ = $(HAIKU_LIBSTDC++) ;
Modified: haiku/branches/developer/zooey/posix-locale/build/jam/CDRules
===================================================================
--- haiku/branches/developer/zooey/posix-locale/build/jam/CDRules
2010-06-19 20:26:04 UTC (rev 37178)
+++ haiku/branches/developer/zooey/posix-locale/build/jam/CDRules
2010-06-19 21:11:40 UTC (rev 37179)
@@ -2,7 +2,7 @@
{
# BuildHaikuCD <haiku cd> : <bootFloppy> : <scripts> ;
- local mainScript = build_haiku_cd ;
+ local mainScript = build_haiku_image ;
SEARCH on $(mainScript) = [ FDirName $(HAIKU_TOP) build scripts ] ;
Depends $(haikuCD) : $(mainScript) $(scripts) ;
Modified:
haiku/branches/developer/zooey/posix-locale/build/jam/CommandLineArguments
===================================================================
--- haiku/branches/developer/zooey/posix-locale/build/jam/CommandLineArguments
2010-06-19 20:26:04 UTC (rev 37178)
+++ haiku/branches/developer/zooey/posix-locale/build/jam/CommandLineArguments
2010-06-19 21:11:40 UTC (rev 37179)
@@ -32,6 +32,8 @@
Echo ;
Echo "Default build profiles:" ;
Echo " image - A raw disk image." ;
+ Echo " anyboot-image - A custom image for
either CD or disk." ;
+ Echo " cd-image - An ISO9660 CD image." ;
Echo " vmware-image - A VMware disk image." ;
Echo " install - A Haiku installation in
a directory." ;
Echo ;
Modified: haiku/branches/developer/zooey/posix-locale/build/jam/FileRules
===================================================================
--- haiku/branches/developer/zooey/posix-locale/build/jam/FileRules
2010-06-19 20:26:04 UTC (rev 37178)
+++ haiku/branches/developer/zooey/posix-locale/build/jam/FileRules
2010-06-19 21:11:40 UTC (rev 37179)
@@ -315,6 +315,10 @@
local gitIndex = <haiku-rootdir-git>index ;
SEARCH on $(gitIndex) = [ FDirName $(HAIKU_TOP) .git ] ;
Depends $(target) : $(gitIndex) ;
+ } else if [ Glob [ FDirName $(HAIKU_TOP) .hg ] : store ] {
+ local hgStore = <haiku-rootdir-hg>store ;
+ SEARCH on $(hgStore) = [ FDirName $(HAIKU_TOP) .hg ] ;
+ Depends $(target) : $(hgStore) ;
}
HAIKU_INCLUDE_IN_IMAGE on $(target)
@@ -342,6 +346,14 @@
grep "git-svn-id:" | cut -d '@' -f 2 |
awk '{printf $1}'`
fi
+ if [ "$revision" = 0 -o "$revision" = "" ]; then
+ # Try searching hg log for last svn commit
+ # Extract from "(svn r12345) ..." line
+ revision=`(cd $(HAIKU_TOP) &&
+ hg log --no-merges --template "{desc|firstline}\n") 2>
/dev/null |
+ grep --max-count=1 "(svn r" |
+ sed -n -e 's,(svn r\(.*\)).*,\1,p'`
+ fi
if [ "$revision" = "" ]; then
revision=0
fi
Modified: haiku/branches/developer/zooey/posix-locale/build/jam/HaikuCD
===================================================================
--- haiku/branches/developer/zooey/posix-locale/build/jam/HaikuCD
2010-06-19 20:26:04 UTC (rev 37178)
+++ haiku/branches/developer/zooey/posix-locale/build/jam/HaikuCD
2010-06-19 21:11:40 UTC (rev 37179)
@@ -8,6 +8,13 @@
HAIKU_CD_LABEL ?= $(HAIKU_DEFAULT_CD_LABEL) ;
MakeLocate $(HAIKU_CD) : $(HAIKU_CD_DIR) ;
+# Detect a hybrid GCC2/GCC4 image.
+local isHybridBuild ;
+if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
+ && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
+ isHybridBuild = 1 ;
+}
+
# prepare the script that initializes the shell variables
HAIKU_CD_INIT_VARIABLES_SCRIPT = <HaikuCD>haiku.cd-init-vars ;
local script = $(HAIKU_CD_INIT_VARIABLES_SCRIPT) ;
@@ -17,6 +24,9 @@
AddVariableToScript $(script) : sourceDir : $(HAIKU_TOP) ;
AddVariableToScript $(script) : outputDir : $(HAIKU_OUTPUT_DIR) ;
AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
+AddVariableToScript $(script) : isCD : 1 ;
+AddVariableToScript $(script) : gccVersion : $(HAIKU_GCC_VERSION[1]) ;
+AddVariableToScript $(script) : isHybridBuild : $(isHybridBuild) ;
AddVariableToScript $(script) : cdLabel : $(HAIKU_CD_LABEL) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
Modified: haiku/branches/developer/zooey/posix-locale/build/jam/HaikuImage
===================================================================
--- haiku/branches/developer/zooey/posix-locale/build/jam/HaikuImage
2010-06-19 20:26:04 UTC (rev 37178)
+++ haiku/branches/developer/zooey/posix-locale/build/jam/HaikuImage
2010-06-19 21:11:40 UTC (rev 37179)
@@ -27,11 +27,6 @@
IDE_ONLY = "" ;
}
-# Make sure that OpenSSL is added to the image.
-if $(HAIKU_OPENSSL_ENABLED) {
- AddOptionalHaikuImagePackages OpenSSL ;
-}
-
SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum
clear
clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp
@@ -44,26 +39,26 @@
hd head hey hostname
id ident ifconfig <bin>install installsound iroster isvolume
$(IDE_ONLY)ideinfo $(IDE_ONLY)idestatus
- join keymap kill
+ join kernel_debugger keymap kill
less lessecho lesskey link linkcatkeys listarea listattr listimage
listdev
listport listres listsem listusb ln locate logger login logname ls
lsindex
mail2mbox makebootable mbox2mail md5sum merge message mimeset mkdos
mkdir
- mkfifo mkfs mkindex modifiers mount mount_nfs mountvolume mv
- netcat netstat nl nohup
+ mkfifo mkfs mkindex mktemp modifiers mount mount_nfs mountvolume mv
+ 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
query quit
rc readlink ReadOnlyBootPrompt reindex release renice rlog rm rmattr
rmindex rmdir roster route
- safemode screen_blanker screenmode sdiff sed setdecor settype setversion
- setvolume seq sha1sum shar shred shuf shutdown sleep sort spamdbm split
- stat strace stty su sum sync sysinfo
- tac tail tar tcpdump tcptester tee telnet telnetd test timeout top touch
+ 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
uname unchop unexpand unmount uniq unlink unrar unshar unzip unzipsfx
<bin>updatedb uptime urlwrapper useradd uudecode uuencode
- vdir version vim vmstat waitfor watch wc wget whoami xargs xres yes
+ vdir version vmstat waitfor watch wc wget whoami xargs xres yes
zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
;
@@ -71,15 +66,15 @@
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 Gradients
+ GLTeapot Haiku3d Mandelbrot Pairs Playground Pulse Sudoku
;
ICU_LIBS = libicu-common.so libicu-data.so libicu-i18n.so
;
@@ -95,7 +90,7 @@
libpng.so
<revisioned>libroot.so libroot-addon-locale.so
libscreensaver.so
- libtextencoding.so libtracker.so libtranslation.so
+ libtextencoding.so libtiff.so libtracker.so libtranslation.so
libz.so
$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
;
@@ -108,7 +103,7 @@
;
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 ;
@@ -126,7 +121,7 @@
#$(X86_ONLY)vmware.accelerant
;
SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
- ICOTranslator JPEGTranslator JPEG2000Translator
+ HVIFTranslator ICOTranslator JPEGTranslator JPEG2000Translator
PCXTranslator PNGTranslator PPMTranslator
RAWTranslator RTF-Translator SGITranslator STXTTranslator TGATranslator
TIFFTranslator WonderBrushTranslator
@@ -171,25 +166,39 @@
;
SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki usb_midi ;
SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
- $(X86_ONLY)broadcom440x $(X86_ONLY)broadcom570x etherpci
$(X86_ONLY)ipro1000
- pegasus $(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900
- $(X86_ONLY)via_rhine wb840 $(X86_ONLY)ipro100 $(X86_ONLY)nforce
- #vlance
- $(X86_ONLY)marvell_yukon $(X86_ONLY)syskonnect $(X86_ONLY)vt612x
- $(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx
- usb_ecm usb_asix
+ $(X86_ONLY)ar81xx $(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2
+ $(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)syskonnect usb_asix usb_ecm $(X86_ONLY)via_rhine #vlance
+ $(X86_ONLY)vt612x wb840
# WLAN drivers
- $(X86_ONLY)atheroswifi $(X86_ONLY)iprowifi3945
+ $(X86_ONLY)aironetwifi $(X86_ONLY)atheroswifi $(X86_ONLY)broadcom43xx
+ $(X86_ONLY)ipw2100 $(X86_ONLY)iprowifi2200 $(X86_ONLY)iprowifi3945
+ $(X86_ONLY)iprowifi4965 $(X86_ONLY)marvell88w8363
$(X86_ONLY)marvell88w8335
+ $(X86_ONLY)ralinkwifi $(X86_ONLY)wavelanwifi
;
#SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
$(IDE_ONLY)ide scsi config_manager agp_gart usb firewire $(X86_ONLY)acpi
;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
- write_overlay ntfs reiserfs ; #googlefs
+ write_overlay ntfs reiserfs udf googlefs ;
+# wifi firmware
+for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
+ local package = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGE) ] ;
+ local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ;
+ local extract = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_DO_EXTRACT)
] ;
+ if $(archive) {
+ AddWifiFirmwareToHaikuImage $(driver) : $(package) : $(archive)
+ : $(extract) ;
+ }
+}
+
# modules
AddFilesToHaikuImage system add-ons kernel bus_managers
: $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
@@ -232,10 +241,9 @@
AddNewDriversToHaikuImage disk scsi : scsi_cd scsi_disk ;
AddNewDriversToHaikuImage power : $(X86_ONLY)enhanced_speedstep ;
AddNewDriversToHaikuImage power : $(X86_ONLY)acpi_battery ;
-AddNewDriversToHaikuImage power : $(X86_ONLY)acpi_embedded_controller ;
# legacy drivers
-AddDriversToHaikuImage : console dprintf
$(X86_ONLY)keyboard null
+AddDriversToHaikuImage : console dprintf null
random <driver>tty zero ;
AddDriversToHaikuImage audio hmulti : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
AddDriversToHaikuImage audio old : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
@@ -306,6 +314,8 @@
AddFilesToHaikuImage system bin : which ;
SEARCH on installoptionalpackage = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToHaikuImage system bin :
installoptionalpackage ;
+SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
+AddFilesToHaikuImage system bin :
install-wifi-firmwares.sh ;
AddSymlinkToHaikuImage system bin : bash : sh ;
AddSymlinkToHaikuImage system bin : trash : untrash ;
@@ -313,7 +323,7 @@
AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
# Mailbox folders and symlink
-AddDirectoryToHaikuImage home mail drafts ;
+AddDirectoryToHaikuImage home mail draft ;
AddDirectoryToHaikuImage home mail in ;
AddDirectoryToHaikuImage home mail out ;
AddSymlinkToHaikuImage home config settings Mail : ../../../mail/in : mailbox ;
@@ -365,8 +375,6 @@
AddSymlinkToHaikuImage system bin : gawk : awk ;
AddSymlinkToHaikuImage system bin : grep : egrep ;
AddSymlinkToHaikuImage system bin : grep : fgrep ;
-AddSymlinkToHaikuImage system bin : vim : vi ;
-AddSymlinkToHaikuImage system bin : vim : view ;
# scripts and data files
@@ -400,11 +408,6 @@
= [ FDirName $(HAIKU_TOP) src apps mail ] ;
AddFilesToHaikuImage system data spell_check word_dictionary : $(spellFiles) ;
-# Locale kit language files
-local languageDir = [ FDirName $(HAIKU_TOP) src data locale languages ] ;
-local languages = [ Glob $(languageDir) : *.language ] ;
-AddFilesToHaikuImage system data locale languages : $(languages) ;
-
local etcFiles = bash_completion inputrc profile ;
etcFiles = $(etcFiles:G=etc) ;
SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;
@@ -416,9 +419,6 @@
AddFilesToHaikuImage common etc bash_completion.d :
<bash_completion>subversion ;
-SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
-AddFilesToHaikuImage common etc vim : <etc>vimrc ;
-
local dataFiles = teapot.data ;
dataFiles = $(dataFiles:G=data) ;
SEARCH on $(dataFiles) = [ FDirName $(HAIKU_TOP) data system data ] ;
@@ -477,7 +477,7 @@
AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ;
# post install scripts and fresh install indicator file
-local postInstallFiles = mime_update.sh ;
+local postInstallFiles = mime_update.sh default_deskbar_items.sh ;
postInstallFiles = $(postInstallFiles:G=post-install) ;
SEARCH on $(postInstallFiles)
= [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
@@ -592,7 +592,21 @@
: [ 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 ]
+ : pdflib : -x .svn ;
+
+# Copy sample programs as per PDFlib Lite's license requirement.
+CopyDirectoryToHaikuImage develop sample-code
+ : [ FDirName $(HAIKU_TOP) src libs pdflib bind pdflib ]
+ : pdflib : -x .svn ;
+
#pragma mark - Optional Packages
@@ -627,7 +641,8 @@
# GCC and unzip onto our image. Building the archive is done by a sub-jam.
include [ FDirName $(HAIKU_BUILD_RULES_DIR) AlternativeGCCArchive ] ;
-if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
+if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
+ && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
# let another jam build a zip with the system libraries
rule InvokeSubJam target : directory : jamLine
{
@@ -698,7 +713,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) ; # 100 MB
+HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 192 MB
HAIKU_IMAGE_LABEL ?= $(HAIKU_DEFAULT_IMAGE_LABEL) ;
MakeLocate $(HAIKU_IMAGE) : $(HAIKU_IMAGE_DIR) ;
@@ -708,6 +723,13 @@
# the pseudo target all image contents is attached to
NotFile $(HAIKU_IMAGE_CONTAINER_NAME) ;
+# Detect a hybrid GCC2/GCC4 image.
+local isHybridBuild ;
+if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
+ && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
+ isHybridBuild = 1 ;
+}
+
[... truncated: 501087 lines follow ...]
Other related posts:
- » [haiku-commits] r37179 - in haiku/branches/developer/zooey/posix-locale: . 3rdparty/mmu_man/scripts 3rdparty/mmu_man/themes 3rdparty/mmu_man/themes/addons build/config_headers ... - zooey
