[haiku-commits] r35314 - in haiku/branches/components/gallium3d: . 3rdparty 3rdparty/mmu_man/scripts 3rdparty/qtcreator 3rdparty/vmware ...
- From: aljen-mlists@xxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 27 Jan 2010 04:07:20 +0100 (CET)
Author: aljen
Date: 2010-01-27 04:07:13 +0100 (Wed, 27 Jan 2010)
New Revision: 35314
Changeset: http://dev.haiku-os.org/changeset/35314/haiku
Added:
haiku/branches/components/gallium3d/3rdparty/qtcreator/
haiku/branches/components/gallium3d/3rdparty/qtcreator/create_project_files.pl
haiku/branches/components/gallium3d/3rdparty/vmware/haiku-nightly.vmx
haiku/branches/components/gallium3d/build/scripts/convert_build_config_to_shell_format.pl
haiku/branches/components/gallium3d/data/bin/install-wifi-firmwares.sh
haiku/branches/components/gallium3d/data/bin/installoptionalpackage
haiku/branches/components/gallium3d/data/catalogs/add-ons/tracker/zipomatic/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/add-ons/tracker/zipomatic/ja.catkeys
haiku/branches/components/gallium3d/data/catalogs/add-ons/tracker/zipomatic/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/add-ons/tracker/zipomatic/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/
haiku/branches/components/gallium3d/data/catalogs/apps/drivesetup/
haiku/branches/components/gallium3d/data/catalogs/apps/drivesetup/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/installer/
haiku/branches/components/gallium3d/data/catalogs/apps/installer/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/mail/
haiku/branches/components/gallium3d/data/catalogs/apps/mail/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/mail/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/mail/ja.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/mail/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/midiplayer/
haiku/branches/components/gallium3d/data/catalogs/apps/midiplayer/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/midiplayer/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/midiplayer/nl.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/readonlybootprompt/
haiku/branches/components/gallium3d/data/catalogs/apps/readonlybootprompt/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/appearance/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/appearance/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/backgrounds/bg.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/backgrounds/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/backgrounds/ja.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/backgrounds/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/backgrounds/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/bluetooth/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/cpufrequency/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/cpufrequency/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/fonts/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/fonts/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/keyboard/bg.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/keyboard/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/keyboard/ja.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/keyboard/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/keyboard/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/keymap/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/keymap/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/locale/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/locale/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/media/bg.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/media/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/media/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/mouse/bg.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/mouse/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/mouse/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/mouse/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/network/bg.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/network/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/network/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/network/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/opengl/
haiku/branches/components/gallium3d/data/catalogs/preferences/opengl/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/opengl/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/opengl/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/touchpad/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/touchpad/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/touchpad/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/virtualmemory/
haiku/branches/components/gallium3d/data/catalogs/preferences/virtualmemory/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/virtualmemory/nl.catkeys
haiku/branches/components/gallium3d/data/system/data/firmware/
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi2100/
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi2100/ipw2100-fw-1.3.tgz
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi2200/
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi2200/ipw2200-fw-3.1.tgz
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi3945/
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi3945/iwlwifi-3945-ucode-2.14.1.5.tgz
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi4965/
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi4965/iwlwifi-4965-ucode-4.44.1.20.tgz
haiku/branches/components/gallium3d/data/system/data/firmware/ipw2100/
haiku/branches/components/gallium3d/data/system/data/firmware/ipw2100/ipw2100-fw-1.3.tgz
haiku/branches/components/gallium3d/data/system/data/firmware/marvell88w8363/
haiku/branches/components/gallium3d/data/system/data/firmware/marvell88w8363/88w8363-fw-3.6.2.2.zip
haiku/branches/components/gallium3d/data/system/data/firmware/ralinkwifi/
haiku/branches/components/gallium3d/data/system/data/firmware/ralinkwifi/RT61_Firmware_V1.2.zip
haiku/branches/components/gallium3d/data/system/data/licenses/ICU
haiku/branches/components/gallium3d/data/system/data/licenses/Intel (2xxx
firmware)
haiku/branches/components/gallium3d/data/system/data/licenses/Intel
(firmware)
haiku/branches/components/gallium3d/data/system/data/licenses/Marvell
(firmware)
haiku/branches/components/gallium3d/data/system/data/licenses/Ralink
(firmware)
haiku/branches/components/gallium3d/docs/images/
haiku/branches/components/gallium3d/docs/images/flags/
haiku/branches/components/gallium3d/docs/images/flags/de.png
haiku/branches/components/gallium3d/docs/images/flags/es.png
haiku/branches/components/gallium3d/docs/images/flags/fr.png
haiku/branches/components/gallium3d/docs/images/flags/gb.png
haiku/branches/components/gallium3d/docs/images/flags/it.png
haiku/branches/components/gallium3d/docs/images/flags/jp.png
haiku/branches/components/gallium3d/docs/images/flags/ru.png
haiku/branches/components/gallium3d/docs/images/flags/sv_SE.png
haiku/branches/components/gallium3d/docs/images/logo.png
haiku/branches/components/gallium3d/docs/userguide/de/
[... truncated: 1765 added files follow ...]
Removed:
haiku/branches/components/gallium3d/3rdparty/qtcreator/create_project_files.pl
haiku/branches/components/gallium3d/data/catalogs/apps/drivesetup/
haiku/branches/components/gallium3d/data/catalogs/apps/drivesetup/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/installer/
haiku/branches/components/gallium3d/data/catalogs/apps/installer/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/mail/
haiku/branches/components/gallium3d/data/catalogs/apps/mail/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/mail/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/mail/ja.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/mail/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/midiplayer/
haiku/branches/components/gallium3d/data/catalogs/apps/midiplayer/eo.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/midiplayer/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/midiplayer/nl.catkeys
haiku/branches/components/gallium3d/data/catalogs/apps/readonlybootprompt/
haiku/branches/components/gallium3d/data/catalogs/apps/readonlybootprompt/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/opengl/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/opengl/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/opengl/pt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/virtualmemory/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/virtualmemory/nl.catkeys
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi2100/
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi2100/ipw2100-fw-1.3.tgz
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi2200/
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi2200/ipw2200-fw-3.1.tgz
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi3945/
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi3945/iwlwifi-3945-ucode-2.14.1.5.tgz
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi4965/
haiku/branches/components/gallium3d/data/system/data/firmware/iprowifi4965/iwlwifi-4965-ucode-4.44.1.20.tgz
haiku/branches/components/gallium3d/data/system/data/firmware/ipw2100/
haiku/branches/components/gallium3d/data/system/data/firmware/ipw2100/ipw2100-fw-1.3.tgz
haiku/branches/components/gallium3d/data/system/data/firmware/marvell88w8363/
haiku/branches/components/gallium3d/data/system/data/firmware/marvell88w8363/88w8363-fw-3.6.2.2.zip
haiku/branches/components/gallium3d/data/system/data/firmware/ralinkwifi/
haiku/branches/components/gallium3d/data/system/data/firmware/ralinkwifi/RT61_Firmware_V1.2.zip
haiku/branches/components/gallium3d/docs/images/flags/
haiku/branches/components/gallium3d/docs/images/flags/de.png
haiku/branches/components/gallium3d/docs/images/flags/es.png
haiku/branches/components/gallium3d/docs/images/flags/fr.png
haiku/branches/components/gallium3d/docs/images/flags/gb.png
haiku/branches/components/gallium3d/docs/images/flags/it.png
haiku/branches/components/gallium3d/docs/images/flags/jp.png
haiku/branches/components/gallium3d/docs/images/flags/ru.png
haiku/branches/components/gallium3d/docs/images/flags/sv_SE.png
haiku/branches/components/gallium3d/docs/images/logo.png
haiku/branches/components/gallium3d/docs/userguide/de/applications.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/
haiku/branches/components/gallium3d/docs/userguide/de/applications/activitymonitor.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/bepdf.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/bezillabrowser.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/cdplayer.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/charactermap.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/codycam.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/deskcalc.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/diskprobe.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/diskusage.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/drivesetup.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/expander.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/icon-o-matic.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/installer.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/magnify.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/mail.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/mediaplayer.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/midiplayer.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/packageinstaller.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/pe.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/people.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/poorman.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/screenshot.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/showimage.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/soundrecorder.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/stylededit.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/terminal.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/textsearch.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/tv.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/vision.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/vlc.html
haiku/branches/components/gallium3d/docs/userguide/de/applications/wonderbrush.html
haiku/branches/components/gallium3d/docs/userguide/de/attributes.html
haiku/branches/components/gallium3d/docs/userguide/de/bash-scripting.html
haiku/branches/components/gallium3d/docs/userguide/de/bootloader.html
haiku/branches/components/gallium3d/docs/userguide/de/contents.html
haiku/branches/components/gallium3d/docs/userguide/de/demos.html
haiku/branches/components/gallium3d/docs/userguide/de/deskbar.html
haiku/branches/components/gallium3d/docs/userguide/de/desktop-applets.html
haiku/branches/components/gallium3d/docs/userguide/de/desktop-applets/
haiku/branches/components/gallium3d/docs/userguide/de/desktop-applets/launchbox.html
haiku/branches/components/gallium3d/docs/userguide/de/desktop-applets/networkstatus.html
haiku/branches/components/gallium3d/docs/userguide/de/desktop-applets/processcontroller.html
haiku/branches/components/gallium3d/docs/userguide/de/desktop-applets/workspaces.html
haiku/branches/components/gallium3d/docs/userguide/de/filesystem-layout.html
haiku/branches/components/gallium3d/docs/userguide/de/filetypes.html
haiku/branches/components/gallium3d/docs/userguide/de/gui.html
haiku/branches/components/gallium3d/docs/userguide/de/images/
haiku/branches/components/gallium3d/docs/userguide/de/images/apps-images/
haiku/branches/components/gallium3d/docs/userguide/de/images/apps-images/activitymonitor.png
haiku/branches/components/gallium3d/docs/userguide/de/images/apps-images/cdplayer.png
haiku/branches/components/gallium3d/docs/userguide/de/images/apps-images/charactermap.png
haiku/branches/components/gallium3d/docs/userguide/de/images/apps-images/codycam.png
haiku/branches/components/gallium3d/docs/userguide/de/images/apps-images/diskprobe-about-attr.png
[... truncated: 1676 deleted files follow ...]
Modified:
haiku/branches/components/gallium3d/
haiku/branches/components/gallium3d/3rdparty/mmu_man/scripts/dev-perso
haiku/branches/components/gallium3d/3rdparty/vmware/haiku-alpha.vmx
haiku/branches/components/gallium3d/build/config_headers/kernel_debug_config.h
haiku/branches/components/gallium3d/build/config_headers/tracing_config.h
haiku/branches/components/gallium3d/build/jam/BeOSRules
haiku/branches/components/gallium3d/build/jam/BuildSetup
haiku/branches/components/gallium3d/build/jam/FloppyBootImage
haiku/branches/components/gallium3d/build/jam/HaikuImage
haiku/branches/components/gallium3d/build/jam/ImageRules
haiku/branches/components/gallium3d/build/jam/MainBuildRules
haiku/branches/components/gallium3d/build/jam/MiscRules
haiku/branches/components/gallium3d/build/jam/NetBootArchive
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/scripts/build_cross_tools
haiku/branches/components/gallium3d/build/scripts/build_haiku_image
haiku/branches/components/gallium3d/configure
haiku/branches/components/gallium3d/data/bin/which
haiku/branches/components/gallium3d/data/catalogs/preferences/appearance/bg.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/appearance/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/appearance/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/appearance/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/appearance/it.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/appearance/ja.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/appearance/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/appearance/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/appearance/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/appearance/uk.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/backgrounds/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/backgrounds/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/bluetooth/bg.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/bluetooth/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/bluetooth/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/bluetooth/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/bluetooth/it.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/bluetooth/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/bluetooth/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/bluetooth/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/bluetooth/uk.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/cpufrequency/bg.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/cpufrequency/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/cpufrequency/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/cpufrequency/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/cpufrequency/it.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/cpufrequency/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/cpufrequency/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/cpufrequency/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/cpufrequency/uk.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/fonts/bg.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/fonts/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/fonts/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/fonts/hu.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/fonts/it.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/fonts/ja.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/fonts/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/fonts/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/fonts/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/fonts/uk.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/keymap/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/keymap/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/keymap/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/keymap/uk.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/locale/bg.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/locale/de.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/locale/fi.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/locale/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/locale/hu.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/locale/it.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/locale/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/locale/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/locale/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/locale/uk.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/media/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/media/lt.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/media/ru.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/media/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/media/uk.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/mouse/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/mouse/sv.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/network/fr.catkeys
haiku/branches/components/gallium3d/data/catalogs/preferences/network/sv.catkeys
haiku/branches/components/gallium3d/data/image_directories/home-config-settings-printers-save-as-pdf.rdef
haiku/branches/components/gallium3d/data/settings/kernel/drivers/kernel
haiku/branches/components/gallium3d/data/system/boot/Bootscript
haiku/branches/components/gallium3d/data/system/data/KeyboardLayouts/TypeMatrix
2030
haiku/branches/components/gallium3d/data/system/data/fonts/ttfonts/VL-Gothic-Regular.ttf
haiku/branches/components/gallium3d/data/system/data/fonts/ttfonts/VL-PGothic-Regular.ttf
haiku/branches/components/gallium3d/docs/Haiku-doc.css
haiku/branches/components/gallium3d/docs/user/support/SupportDefs.dox
haiku/branches/components/gallium3d/docs/userguide/en/applications.html
haiku/branches/components/gallium3d/docs/userguide/en/applications/activitymonitor.html
haiku/branches/components/gallium3d/docs/userguide/en/applications/bepdf.html
haiku/branches/components/gallium3d/docs/userguide/en/applications/bezillabrowser.html
haiku/branches/components/gallium3d/docs/userguide/en/applications/cdplayer.html
haiku/branches/components/gallium3d/docs/userguide/en/applications/charactermap.html
haiku/branches/components/gallium3d/docs/userguide/en/applications/codycam.html
haiku/branches/components/gallium3d/docs/userguide/en/applications/deskcalc.html
haiku/branches/components/gallium3d/docs/userguide/en/applications/diskprobe.html
[... truncated: 3210 changed files follow ...]
Log:
merged changes from trunk r34622-r35313
Property changes on: haiku/branches/components/gallium3d
___________________________________________________________________
Modified: svn:ignore
- haiku.image
generated*
svn-commit.tmp
.cproject
.project
+ haiku.image
generated*
svn-commit.tmp
.cproject
.project
haiku.pro
haiku.pro.user
.settings
Modified: svn:mergeinfo
- /haiku/trunk:33410-34621
+ /haiku/trunk:33410-35313
Modified: haiku/branches/components/gallium3d/3rdparty/mmu_man/scripts/dev-perso
===================================================================
--- haiku/branches/components/gallium3d/3rdparty/mmu_man/scripts/dev-perso
2010-01-27 02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/3rdparty/mmu_man/scripts/dev-perso
2010-01-27 03:07:13 UTC (rev 35314)
@@ -17,10 +17,12 @@
#
# This script should be sourced by bash, either from /etc/profile
# (in /etc/profile.d/) or your own .bashrc or .profile
+# after exporting DEVROOT optionally to point to the projects folder.
#
# setup:
# - edit DRLIST below to include your own possible devroots
# (ie. where you have subfolders for your own projects)
+# or export DEVROOT before sourcing dev-perso.
# - optionally edit PWLIST below to where you possibly have a
# PASSWDS/ folder with passwords stored as plain text.
# (not really a good idea though :) It's exported
@@ -51,15 +53,19 @@
# automagically find them on different machines...
-DRLIST="$HOME/devel /Data /work /Volumes/Data/devel"
+if [ -z "$DEVROOT" ]; then
+ DRLIST="$HOME/devel /Data /work /Volumes/Data/devel"
+ for d in $DRLIST; do
+ test -d $d && DEVROOT=$d && break;
+ done
+fi
+export DEVROOT
+
+# automagically find password files
PWLIST="/Data /fat32 $HOME"
-for d in $DRLIST; do
- test -d $d && DEVROOT=$d && break;
-done
for d in $PWLIST; do
test -d $d/PASSWDS && PASSWDS=$d/PASSWDS && break;
done
-export DEVROOT
export PASSWDS
# svn sometimes forgets about vi and wants me to use nano...
@@ -73,10 +79,16 @@
fi
if [ "x$1" = "x--help" ]; then
echo "setup project-specific development environment"
- echo "usage: dev [project]"
+ echo "usage: dev [-n] [project]"
echo "running without argument lists available projects"
+ echo "-n projname initializes a new project"
return 1
fi
+ if [ "x$1" = "x-n" -a -n "$2" ]; then
+ shift
+ mkdir "$DEVROOT/$1" && touch "$DEVROOT/$1/.profile"
+ # fallback
+ fi
if [ ! -d "$DEVROOT/$1" ]; then
echo "invalid project name '$1'"
return 1
Copied:
haiku/branches/components/gallium3d/3rdparty/qtcreator/create_project_files.pl
(from rev 35294, haiku/trunk/3rdparty/qtcreator/create_project_files.pl)
===================================================================
---
haiku/branches/components/gallium3d/3rdparty/qtcreator/create_project_files.pl
(rev 0)
+++
haiku/branches/components/gallium3d/3rdparty/qtcreator/create_project_files.pl
2010-01-27 03:07:13 UTC (rev 35314)
@@ -0,0 +1,106 @@
+#!/usr/bin/perl
+
+use warnings;
+use strict;
+
+=head1 create_project_files.pl
+
+This simple script traverses the haiku sources and creates (incomplete) *.pro
+files in order to make the haiku sources available within the qt-creator IDE.
+Additionally, it will add those files to svn:ignore of their parent directory
+(unless already contained there).
+
+=cut
+
+use File::Basename;
+use File::Find;
+
+if (!@ARGV) {
+ die "usage: $0 <haiku-top-path>\n";
+}
+
+my $haikuTop = shift @ARGV;
+if (!-e "$haikuTop/ReadMe.cross-compile") {
+ die "'$haikuTop/ReadMe.cross-compile' not found - not a haiku top!\n";
+}
+
+my %collection;
+
+print "scanning ...\n";
+find({ wanted => \&process, no_chdir => 1},
+ ("$haikuTop/headers", "$haikuTop/src"));
+
+writeProFile("$haikuTop/haiku.pro", { subdirs => ['headers', 'src'] });
+foreach my $dir (sort keys %collection) {
+ my $proFile = $dir.'/'.fileparse($dir).'.pro';
+ writeProFile($proFile, $collection{$dir});
+}
+
+sub process
+{
+ if (substr($_, -4, 4) eq '.svn') {
+ $File::Find::prune = 1;
+ } else {
+ return if $File::Find::dir eq $_; # skip toplevel folders
+ my $name = (fileparse($_))[0];
+ if (-d $_) {
+ $collection{$File::Find::dir}->{subdirs} ||= [];
+ push @{$collection{$File::Find::dir}->{subdirs}}, $name;
+ return;
+ }
+ elsif ($_ =~ m{\.(h|hpp)$}i) {
+ $collection{$File::Find::dir}->{headers} ||= [];
+ push @{$collection{$File::Find::dir}->{headers}}, $name;
+ }
+ elsif ($_ =~ m{\.(c|cc|cpp|s|asm)$}i) {
+ $collection{$File::Find::dir}->{sources} ||= [];
+ push @{$collection{$File::Find::dir}->{sources}}, $name;
+ }
+ }
+}
+
+sub writeProFile
+{
+ my ($proFile, $info) = @_;
+
+ return if !$info;
+
+ print "creating $proFile\n";
+ open(my $proFileFH, '>', $proFile)
+ or die "unable to write $proFile";
+ print $proFileFH "TEMPLATE = subdirs\n";
+ print $proFileFH "CONFIG += ordered\n";
+ if (exists $info->{subdirs}) {
+ print $proFileFH
+ "SUBDIRS = ".join(" \\\n\t", sort
@{$info->{subdirs}})."\n";
+ }
+ if (exists $info->{headers}) {
+ print $proFileFH
+ "HEADERS = ".join(" \\\n\t", sort
@{$info->{headers}})."\n";
+ }
+ if (exists $info->{sources}) {
+ print $proFileFH
+ "SOURCES = ".join(" \\\n\t", sort
@{$info->{sources}})."\n";
+ }
+ close $proFileFH;
+
+ updateSvnIgnore($proFile);
+}
+
+sub updateSvnIgnore
+{
+ my $proFile = shift;
+
+ my ($filename, $parentDir) = fileparse($proFile);
+
+ my $svnIgnore = qx{svn propget --strict svn:ignore $parentDir};
+ if (!grep { $_ eq $filename } split "\n", $svnIgnore) {
+ chomp $svnIgnore;
+ $svnIgnore .= "\n" unless !$svnIgnore;
+ $svnIgnore .= "$filename\n";
+ open(my $propsetFH, "|svn propset svn:ignore --file -
$parentDir")
+ or die "unable to open pipe to 'svn propset'";
+ print $propsetFH $svnIgnore;
+ close($propsetFH);
+ }
+}
Modified: haiku/branches/components/gallium3d/3rdparty/vmware/haiku-alpha.vmx
===================================================================
--- haiku/branches/components/gallium3d/3rdparty/vmware/haiku-alpha.vmx
2010-01-27 02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/3rdparty/vmware/haiku-alpha.vmx
2010-01-27 03:07:13 UTC (rev 35314)
@@ -48,6 +48,8 @@
ide0:0.writeThrough = "false"
ide0:0.startConnected = "false"
+# blank-bfs-2048mb.vdmk is an expanding disk image and is available at
+# http://haiku-files.org/files/blank-bfs/blank-bfs-2048mb.vmdk
ide0:1.present = "true"
ide0:1.fileName = "blank-bfs-2048mb.vmdk"
ide0:1.deviceType = "disk"
Copied: haiku/branches/components/gallium3d/3rdparty/vmware/haiku-nightly.vmx
(from rev 35294, haiku/trunk/3rdparty/vmware/haiku-nightly.vmx)
===================================================================
--- haiku/branches/components/gallium3d/3rdparty/vmware/haiku-nightly.vmx
(rev 0)
+++ haiku/branches/components/gallium3d/3rdparty/vmware/haiku-nightly.vmx
2010-01-27 03:07:13 UTC (rev 35314)
@@ -0,0 +1,78 @@
+#!/usr/bin/vmware
+config.version = "8"
+virtualHW.version = "3"
+
+MemAllowAutoScaleDown = "false"
+MemTrimRate = "-1"
+
+uuid.location = "56 4d 20 2e e7 51 21 3a-cf 1f 8c a4 85 aa 04 9b"
+uuid.bios = "56 4d 20 2e e7 51 21 3a-cf 1f 8c a4 85 aa 04 9b"
+
+uuid.action = "create"
+checkpoint.vmState = ""
+
+displayName = "Haiku"
+guestOS = "other"
+memsize = "512"
+
+ethernet0.present= "true"
+ethernet0.startConnected = "true"
+ethernet0.virtualDev = "e1000"
+ethernet0.connectionType = "nat"
+ethernet0.addressType = "generated"
+ethernet0.generatedAddress = "00:0c:29:aa:04:9b"
+ethernet0.generatedAddressOffset = "0"
+
+serial0.present = "true"
+serial0.fileType = "file"
+serial0.fileName = "serial-port.txt"
+serial0.tryNoRxLoss = "false"
+
+usb.present = "true"
+
+sound.present = "false"
+sound.autodetect = "true"
+sound.virtualDev = "es1371"
+sound.fileName = "-1"
+sound.startConnected = "true"
+
+scsi0.present = "false"
+
+floppy0.present = "false"
+
+ide0:0.present = "true"
+ide0:0.fileName = "haiku-nightly.vmdk"
+ide0:0.deviceType = "disk"
+ide0:0.mode = "persistent"
+ide0:0.redo = ""
+ide0:0.writeThrough = "false"
+ide0:0.startConnected = "false"
+
+# blank-bfs-2048mb.vdmk is an expanding disk image and is available at
+# http://haiku-files.org/files/blank-bfs/blank-bfs-2048mb.vmdk
+ide0:1.present = "true"
+ide0:1.fileName = "blank-bfs-2048mb.vmdk"
+ide0:1.deviceType = "disk"
+ide0:1.mode = "persistent"
+ide0:1.redo = ""
+ide0:1.writeThrough = "false"
+ide0:1.startConnected = "false"
+
+ide1:0.present = "false"
+ide1:0.deviceType = "cdrom-raw"
+ide1:0.startConnected = "true"
+ide1:0.fileName = "auto detect"
+ide1:0.autodetect = "true"
+
+ide1:1.present = "false"
+
+tools.remindInstall = "false"
+
+# If you have a dual core (or more), you might want to use both cores in the
+# emulation as well. VMware Player only supports 2, otherwise 4 are possible.
+#numvcpus = "2"
+
+# This gets rid of the annoying serial debug output requester - although it
+# always append the serial output, then.
+#msg.autoAnswer = "true"
+
Modified:
haiku/branches/components/gallium3d/build/config_headers/kernel_debug_config.h
===================================================================
---
haiku/branches/components/gallium3d/build/config_headers/kernel_debug_config.h
2010-01-27 02:00:32 UTC (rev 35313)
+++
haiku/branches/components/gallium3d/build/config_headers/kernel_debug_config.h
2010-01-27 03:07:13 UTC (rev 35314)
@@ -80,13 +80,13 @@
// VM
-// Enables the vm_page::queue, i.e. it is tracked which queue the page should
-// be in.
+// Enables the vm_page::queue field, i.e. it is tracked which queue the page
+// should be in.
#define DEBUG_PAGE_QUEUE 0
-// Enables extra debug fields in the vm_page used to track page transitions
-// between caches.
-#define DEBUG_PAGE_CACHE_TRANSITIONS 0
+// Enables the vm_page::access_count field, which is used to detect invalid
+// concurrent access to the page.
+#define DEBUG_PAGE_ACCESS KDEBUG_LEVEL_2
// Enables a global list of all vm_cache structures.
#define DEBUG_CACHE_LIST KDEBUG_LEVEL_1
@@ -94,6 +94,9 @@
// Enables swap support.
#define ENABLE_SWAP_SUPPORT 1
+// Use the slab allocator as generic memory allocator (malloc()/free()).
+#define USE_SLAB_ALLOCATOR_FOR_MALLOC 0
+
// When set limits the amount of available RAM (in MB).
//#define LIMIT_AVAILABLE_MEMORY 256
Modified:
haiku/branches/components/gallium3d/build/config_headers/tracing_config.h
===================================================================
--- haiku/branches/components/gallium3d/build/config_headers/tracing_config.h
2010-01-27 02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/build/config_headers/tracing_config.h
2010-01-27 03:07:13 UTC (rev 35314)
@@ -30,7 +30,6 @@
#define KTRACE_PRINTF_STACK_TRACE 0 /*
stack trace depth */
#define NET_BUFFER_TRACING 0
#define NET_BUFFER_TRACING_STACK_TRACE 0 /* stack trace
depth */
-#define OBJECT_CACHE_TRACING 0
#define PAGE_ALLOCATION_TRACING 0
#define PAGE_DAEMON_TRACING 0
#define PAGE_WRITER_TRACING 0
@@ -41,6 +40,8 @@
#define SCHEDULER_TRACING 0
#define SCHEDULING_ANALYSIS_TRACING 0
#define SIGNAL_TRACING 0
+#define SLAB_MEMORY_MANAGER_TRACING 0
+#define SLAB_OBJECT_CACHE_TRACING 0
#define SWAP_TRACING 0
#define SYSCALL_TRACING 0
#define SYSCALL_TRACING_IGNORE_KTRACE_OUTPUT 1
@@ -49,6 +50,7 @@
#define USER_MALLOC_TRACING 0
#define VFS_PAGES_IO_TRACING 0
#define VM_CACHE_TRACING 0
+#define VM_CACHE_TRACING_STACK_TRACE 0
#define VM_PAGE_FAULT_TRACING 0
#define WAIT_FOR_OBJECTS_TRACING 0
Modified: haiku/branches/components/gallium3d/build/jam/BeOSRules
===================================================================
--- haiku/branches/components/gallium3d/build/jam/BeOSRules 2010-01-27
02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/build/jam/BeOSRules 2010-01-27
03:07:13 UTC (rev 35314)
@@ -325,7 +325,7 @@
MakeLocatePlatform $(target) ;
Depends $(target) : $(source) <build>collectcatkeys ;
- LocalClean clean : $(target) ;
+ LocalClean clean : $(target).pre ;
ExtractCatalogEntries1 $(target) : <build>collectcatkeys $(source) ;
}
@@ -362,7 +362,7 @@
# declared in the sourcecode)
: sources # List of cpp files where to search keys
: generatedCatalog # Name of the generated catalog (most probably
- # english.catalog)
+ # en.catalog)
: translatedCatalogs # List of available translations
{
genCat = [ FGristFiles $(generatedCatalog) ] ;
Modified: haiku/branches/components/gallium3d/build/jam/BuildSetup
===================================================================
--- haiku/branches/components/gallium3d/build/jam/BuildSetup 2010-01-27
02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/build/jam/BuildSetup 2010-01-27
03:07:13 UTC (rev 35314)
@@ -181,17 +181,29 @@
# analyze the gcc machine spec to determine HAIKU_CPU
switch $(HAIKU_GCC_MACHINE) {
- case i386-* : HAIKU_CPU = x86 ;
- case i486-* : HAIKU_CPU = x86 ;
- case i586-* : HAIKU_CPU = x86 ;
- case i686-* : HAIKU_CPU = x86 ;
+ case i?86-* : HAIKU_CPU = x86 ;
case powerpc-* : HAIKU_CPU = ppc ;
- case m68k-* : HAIKU_CPU = m68k ;
+ case m68k-* : HAIKU_CPU = m68k ;
case mipsel-* : HAIKU_CPU = mipsel ;
- case arm-* : HAIKU_CPU = arm ;
- case * : Exit "Unsupported gcc target machine:" $(HAIKU_GCC_MACHINE) ;
+ case arm-* : HAIKU_CPU = arm ;
+ case * : Exit "Unsupported gcc target machine:"
+ $(HAIKU_GCC_MACHINE) ;
}
+# determine the endianness of the host
+switch $(HOST_GCC_MACHINE) {
+ case amd64-* : HAIKU_HOST_IS_BIG_ENDIAN = 0 ;
+ case i?86-* : HAIKU_HOST_IS_BIG_ENDIAN = 0 ;
+ case powerpc-* : HAIKU_HOST_IS_BIG_ENDIAN = 1 ;
+ case x86_64-* : HAIKU_HOST_IS_BIG_ENDIAN = 0 ;
+
+ # the following are rather unlikely as hosts ...
+ case arm-* : HAIKU_HOST_IS_BIG_ENDIAN = 0 ;
+ case m68k-* : HAIKU_HOST_IS_BIG_ENDIAN = 1 ;
+ case mipsel-* : HAIKU_HOST_IS_BIG_ENDIAN = 0 ;
+ case * : Exit "Unsupported gcc host machine:"
$(HOST_GCC_MACHINE) ;
+}
+
switch $(HAIKU_CPU) {
case ppc :
{
@@ -275,10 +287,8 @@
HAIKU_ASFLAGS = ;
# C/C++ flags
-HAIKU_KERNEL_CCFLAGS += -finline -fno-builtin
- -DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) ;
-HAIKU_KERNEL_C++FLAGS += -finline -fno-builtin -fno-exceptions
- -DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) ;
+HAIKU_KERNEL_CCFLAGS += -finline -fno-builtin ;
+HAIKU_KERNEL_C++FLAGS += -finline -fno-builtin -fno-exceptions ;
HAIKU_KERNEL_DEFINES += _KERNEL_MODE ;
if $(HAIKU_GCC_VERSION[1]) >= 3 {
@@ -296,38 +306,36 @@
HAIKU_KERNEL_PIC_CCFLAGS = -fno-pic ;
HAIKU_KERNEL_PIC_LINKFLAGS = ;
-if $(HAIKU_ARCH) = ppc {
- # Build a position independent PPC kernel. We need to be able to
relocate
- # the kernel, since the virtual address space layout at boot time is not
- # fixed.
- HAIKU_KERNEL_PIC_CCFLAGS = -fPIE ;
- HAIKU_KERNEL_PIC_LINKFLAGS = -shared -fPIE ;
-}
-if $(HAIKU_ARCH) = m68k {
- # We don't need a PIC kernel as it's always at the same place.
- # it's actually needed to not use pic, else linking fails due to too
large
- # pc refs.
- HAIKU_KERNEL_PIC_CCFLAGS = -fno-pic ;
- HAIKU_KERNEL_PIC_LINKFLAGS = ;
- # we don't want to have to handle emulating missing FPU opcodes for 040
and
- # 060 in the kernel
- HAIKU_KERNEL_CCFLAGS += -m68020-60 ;
- HAIKU_KERNEL_C++FLAGS += -m68020-60 ;
-}
-if $(HAIKU_ARCH) = mipsel {
- # todo: verify correctness of this
- HAIKU_KERNEL_PIC_CCFLAGS = -fno-pic ;
- HAIKU_KERNEL_PIC_LINKFLAGS = ;
-}
-# If the environment variable DEBUG_PRINTF is defined we define an equally
-# named macro to the variable value. Some components use the macro to allow
-# another function than printf() to print the debug output. The variable should
-# be set to the name of the alternative function.
-#
-if $(DEBUG_PRINTF) {
- HAIKU_CCFLAGS += [ FDefines DEBUG_PRINTF=$(DEBUG_PRINTF) ] ;
- HAIKU_C++FLAGS += [ FDefines DEBUG_PRINTF=$(DEBUG_PRINTF) ] ;
+switch $(HAIKU_ARCH) {
+ case ppc :
+ {
+ # Build a position independent PPC kernel. We need to be able to
+ # relocate the kernel, since the virtual address space layout
at boot
+ # time is not fixed.
+ HAIKU_KERNEL_PIC_CCFLAGS = -fPIE ;
+ HAIKU_KERNEL_PIC_LINKFLAGS = -shared -fPIE ;
+ }
+
+ case m68k :
+ {
+ # We don't want to have to handle emulating missing FPU opcodes
for 040
+ # and 060 in the kernel.
+ HAIKU_KERNEL_CCFLAGS += -m68020-60 ;
+ HAIKU_KERNEL_C++FLAGS += -m68020-60 ;
+ }
+ case x86 :
+ {
+ HAIKU_CCFLAGS += -march=pentium ;
+ HAIKU_C++FLAGS += -march=pentium ;
+ HAIKU_KERNEL_CCFLAGS += -march=pentium ;
+ HAIKU_KERNEL_C++FLAGS += -march=pentium ;
+
+ # Enable use of the gcc built-in atomic functions instead of
atomic_*().
+ # The former are inlined and have thus less overhead. They are
not
+ # available with gcc 2, but the header will take care of that.
+ HAIKU_DEFINES += B_USE_BUILTIN_ATOMIC_FUNCTIONS ;
+ }
}
# If the environment variable HAIKU_INCLUDE_PATENTED_CODE is defined, we
@@ -336,10 +344,8 @@
# techniques, for example the Freetype bytecode hinter or sub-pixel rendering
# as well as some problematic media codecs.
if $(HAIKU_INCLUDE_PATENTED_CODE) {
- HAIKU_CCFLAGS += [ FDefines
- HAIKU_INCLUDE_PATENTED_CODE=$(HAIKU_INCLUDE_PATENTED_CODE) ] ;
- HAIKU_C++FLAGS += [ FDefines
- HAIKU_INCLUDE_PATENTED_CODE=$(HAIKU_INCLUDE_PATENTED_CODE) ] ;
+ HAIKU_DEFINES
+ += HAIKU_INCLUDE_PATENTED_CODE=$(HAIKU_INCLUDE_PATENTED_CODE) ;
}
# warning flags
@@ -386,7 +392,7 @@
# private kernel headers to be used when compiling kernel code
HAIKU_PRIVATE_KERNEL_HEADERS =
- [ PrivateHeaders $(DOT) kernel libroot
+ [ PrivateHeaders $(DOT) kernel libroot shared
kernel/boot/platform/$(HAIKU_BOOT_PLATFORM) ]
[ ArchHeaders $(HAIKU_ARCH) ]
[ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR) system kernel ]
@@ -486,9 +492,9 @@
HOST_GCC_BASE_FLAGS = -m32 ;
} else {
switch $(HOST_GCC_MACHINE) {
- case x86_64-* : HOST_PLATFORM_IS_64_BIT = 1 ;
- case i686-apple-darwin10 :
- HOST_PLATFORM_IS_64_BIT = 1 ;
+ case amd64-* : HOST_PLATFORM_IS_64_BIT
= 1 ;
+ case i686-apple-darwin10 : HOST_PLATFORM_IS_64_BIT = 1 ;
+ case x86_64-* : HOST_PLATFORM_IS_64_BIT
= 1 ;
}
}
@@ -498,8 +504,6 @@
HOST_CC ?= $(CC) ;
HOST_C++ ?= $(C++) ;
HOST_LINK ?= $(LINK) ;
-HOST_LD ?= ld ; # TODO: Fix
this!
-HOST_OBJCOPY ?= objcopy ; #
HOST_RANLIB ?= $(RANLIB) ;
HOST_CPPFLAGS ?= $(CPPFLAGS) ;
HOST_CCFLAGS ?= $(HOST_GCC_BASE_FLAGS) $(CCFLAGS) ;
@@ -573,9 +577,9 @@
}
HOST_KERNEL_CCFLAGS += $(HOST_GCC_BASE_FLAGS) -finline -fno-builtin
- -DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
+ -D_KERNEL_MODE ;
HOST_KERNEL_C++FLAGS += $(HOST_GCC_BASE_FLAGS) -finline -fno-builtin
- -fno-exceptions -DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
+ -fno-exceptions -D_KERNEL_MODE ;
HOST_KERNEL_DEFINES += _KERNEL_MODE ;
HOST_KERNEL_PIC_CCFLAGS = -fno-pic ;
@@ -715,6 +719,14 @@
# part of the C++ runtime lives in libstdc++ on Darwin
HOST_LIBSUPC++ = gcc_s.1 stdc++ ;
HOST_LIBSTDC++ = ;
+ } else if $(HOST_PLATFORM) = freebsd {
+ if $(HOST_CPU) = x86 && $(HOST_PLATFORM_IS_64_BIT) = 1 {
+ # amd64 FreeBSD 8 doesn't come without a shared
libsupc++, and the
+ # static one prevents us from building shared
libraries. So we have
+ # to work around by using the shared libstdc++.
+ HOST_LIBSUPC++ = stdc++ ;
+ HOST_LIBSTDC++ = ;
+ }
}
# Unlike glibc FreeBSD's libc doesn't have built-in regex support.
@@ -726,7 +738,6 @@
HOST_STATIC_LIBROOT += /opt/local/lib/libgnuregex.dylib ;
}
-
# The BeOS compilers define __INTEL__ respectively __POWERPC__. On the
# build platform we need to make sure, this is also defined.
if $(HOST_CPU) = x86 {
Modified: haiku/branches/components/gallium3d/build/jam/FloppyBootImage
===================================================================
--- haiku/branches/components/gallium3d/build/jam/FloppyBootImage
2010-01-27 02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/build/jam/FloppyBootImage
2010-01-27 03:07:13 UTC (rev 35314)
@@ -12,7 +12,7 @@
}
local GPL_ONLY = ;
-if $(INCLUDE_GPL_ADDONS) = 1 {
+if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
GPL_ONLY = "" ;
}
Modified: haiku/branches/components/gallium3d/build/jam/HaikuImage
===================================================================
--- haiku/branches/components/gallium3d/build/jam/HaikuImage 2010-01-27
02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/build/jam/HaikuImage 2010-01-27
03:07:13 UTC (rev 35314)
@@ -14,7 +14,7 @@
}
local GPL_ONLY = ;
-if $(INCLUDE_GPL_ADDONS) = 1 {
+if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
GPL_ONLY = "" ;
}
@@ -27,8 +27,13 @@
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 chgrp chmod chop chown chroot cksum clear
+ cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum
clear
clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp
csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname
draggers driveinfo dstcheck du dumpcatalog
@@ -49,13 +54,13 @@
passwd paste patch pathchk pc ping play playfile playsound playwav pr
prio
printenv printf profile ps ptx pwd
query quit
- rc readlink reindex release renice rlog rm rmattr rmindex rmdir roster
- route
- safemode screen_blanker screenmode 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 tput
- tr traceroute translate trash true truncate tsort tty
+ 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
+ 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
@@ -122,7 +127,8 @@
TIFFTranslator WonderBrushTranslator
;
SYSTEM_ADD_ONS_LOCALE_CATALOGS = <catalog-addon>zeta <catalog-addon>plaintext ;
-SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon
cortex_flanger.media_addon
+SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon
+ cortex_flanger.media_addon
dvb.media_addon
hmulti_audio.media_addon
mixer.media_addon
@@ -164,12 +170,12 @@
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)marvell_yukon $(X86_ONLY)syskonnect $(X86_ONLY)vt612x
$(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx
usb_ecm usb_asix
-
- #WLAN drivers
- $(X86_ONLY)atheros
+
+ # WLAN drivers
+ $(X86_ONLY)atheroswifi $(X86_ONLY)iprowifi3945
;
#SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
@@ -299,6 +305,8 @@
SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
AddFilesToHaikuImage system bin : which ;
+SEARCH on installoptionalpackage = [ FDirName $(HAIKU_TOP) data bin ] ;
+AddFilesToHaikuImage system bin :
installoptionalpackage ;
AddSymlinkToHaikuImage system bin : bash : sh ;
AddSymlinkToHaikuImage system bin : trash : untrash ;
@@ -324,13 +332,13 @@
: /boot/system/apps/$(linkTarget) : $(linkTarget) ;
}
-# Deskbar Desktop Applets links
-AddDirectoryToHaikuImage home config be Desktop\ Applets ;
+# Deskbar Desktop applets links
+AddDirectoryToHaikuImage home config be Desktop\ applets ;
DESKBAR_DESKTOP_APPLETS = LaunchBox NetworkStatus PowerStatus ProcessController
Workspaces
;
for linkTarget in $(DESKBAR_DESKTOP_APPLETS) {
- AddSymlinkToHaikuImage home config be Desktop\ Applets
+ AddSymlinkToHaikuImage home config be Desktop\ applets
: /boot/system/apps/$(linkTarget) : $(linkTarget) ;
}
@@ -363,8 +371,8 @@
# scripts and data files
-local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript
InstallerInitScript
- InstallerFinishScript ;
+local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript
+ InstallerInitScript InstallerFinishScript ;
SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ;
AddFilesToHaikuImage system boot : $(bootScripts) ;
@@ -406,7 +414,8 @@
SEARCH on <bash_completion>subversion =
[ FDirName $(HAIKU_TOP) data etc bash_completion.d ] ;
-AddFilesToHaikuImage common etc bash_completion.d :
<bash_completion>subversion ;
+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 ;
@@ -487,7 +496,8 @@
$(IDE_ONLY)ide scsi usb
$(PPC_ONLY)openpic
$(ATA_ONLY)ata_adapter $(IDE_ONLY)ide_adapter locked_pool scsi_periph
- ahci generic_ide_pci it8211 legacy_sata silicon_image_3112
$(X86_ONLY)ide_isa
+ ahci generic_ide_pci it8211 legacy_sata silicon_image_3112
+ $(X86_ONLY)ide_isa
<usb>uhci <usb>ohci <usb>ehci
scsi_cd scsi_disk usb_disk
intel
@@ -509,13 +519,13 @@
: Match\ Header Spam\ Filter R5\ Daemon\ Filter ;
AddFilesToHaikuImage system add-ons mail_daemon outbound_filters : Fortune ;
AddFilesToHaikuImage system add-ons mail_daemon system_filters
- : Inbox New\ Mail\ Notification Outbox Message\ Parser ;
+ : Inbox New\ mail\ notification Outbox Message\ Parser ;
AddFilesToHaikuImage system add-ons media : $(SYSTEM_ADD_ONS_MEDIA) ;
AddFilesToHaikuImage system add-ons media plugins
: $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
AddFilesToHaikuImage system add-ons Tracker
- : FileType-F Mark\ as… Mark\ as\ Read-R Open\ Target\ Folder-O
OpenTerminal-T
- ZipOMatic-Z ;
+ : FileType-F Mark\ as… Mark\ as\ Read-R Open\ Target\ Folder-O
+ Open\ Terminal-T ZipOMatic-Z ;
AddSymlinkToHaikuImage system add-ons Tracker
: /boot/system/preferences/Backgrounds : Background-B ;
AddSymlinkToHaikuImage system add-ons Tracker
@@ -553,9 +563,9 @@
AddDirectoryToHaikuImage home config bin ;
AddDirectoryToHaikuImage home config lib ;
AddDirectoryToHaikuImage home mail ;
-AddDirectoryToHaikuImage var empty ;
-AddDirectoryToHaikuImage var log ;
-AddDirectoryToHaikuImage var tmp ;
+AddDirectoryToHaikuImage common var empty ;
+AddDirectoryToHaikuImage common var log ;
+AddDirectoryToHaikuImage common cache tmp ;
AddDirectoryToHaikuImage home config add-ons kernel drivers bin ;
AddDirectoryToHaikuImage home config add-ons kernel drivers dev ;
Modified: haiku/branches/components/gallium3d/build/jam/ImageRules
===================================================================
--- haiku/branches/components/gallium3d/build/jam/ImageRules 2010-01-27
02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/build/jam/ImageRules 2010-01-27
03:07:13 UTC (rev 35314)
@@ -764,6 +764,8 @@
local zipFile = [ DownloadOptionalPackage $(package) : $(url) ] ;
if ( $(isCDPackage) = true || $(isCDPackage) = 1 ) && $(HAIKU_CD_NAME) {
+ # TODO: If HAIKU_CD_NAME is set, that doesn't mean we're
building a CD
+ # image!
# copy onto image
AddFilesToHaikuImage _packages_ : $(zipFile) ;
} else {
@@ -1227,8 +1229,12 @@
BuildFloppyBootImage1 $(image) : $(haikuLoader) $(archive) ;
if $(HAIKU_BOOT_PLATFORM) = atari_m68k {
Depends $(image) : <build>fixup_tos_boot_checksum ;
- BuildFloppyBootImageAtariM68K $(image) :
<build>fixup_tos_boot_checksum ;
+ BuildFloppyBootImageFixupM68K $(image) :
<build>fixup_tos_boot_checksum ;
}
+ if $(HAIKU_BOOT_PLATFORM) = amiga_m68k {
+ Depends $(image) : <build>fixup_amiga_boot_checksum ;
+ BuildFloppyBootImageFixupM68K $(image) :
<build>fixup_amiga_boot_checksum ;
+ }
}
actions BuildFloppyBootImage1
@@ -1242,7 +1248,7 @@
dd if=$(>[2]) of=$(<) bs=$(ARCHIVE_IMAGE_OFFSET)k seek=1 conv=notrunc
}
-actions BuildFloppyBootImageAtariM68K
+actions BuildFloppyBootImageFixupM68K
{
# fixup the boot sector checksum
$(>[1]) $(<)
Modified: haiku/branches/components/gallium3d/build/jam/MainBuildRules
===================================================================
--- haiku/branches/components/gallium3d/build/jam/MainBuildRules
2010-01-27 02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/build/jam/MainBuildRules
2010-01-27 03:07:13 UTC (rev 35314)
@@ -411,9 +411,12 @@
return ;
}
+ local soname = [ on $(_lib) return $(HAIKU_SONAME) ] ;
+ soname ?= $(_lib:BS) ;
+
MainFromObjects $(_lib) : $(2) ;
LINKFLAGS on $(_lib) = [ on $(_lib) return $(LINKFLAGS) ]
- -nostart -Xlinker -soname=\"$(_lib:G=)\" ;
+ -nostart -Xlinker -soname=\"$(soname)\" ;
LinkAgainst $(_lib) : $(3) ;
AddSharedObjectGlueCode $(_lib) : false ;
Modified: haiku/branches/components/gallium3d/build/jam/MiscRules
===================================================================
--- haiku/branches/components/gallium3d/build/jam/MiscRules 2010-01-27
02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/build/jam/MiscRules 2010-01-27
03:07:13 UTC (rev 35314)
@@ -62,7 +62,7 @@
{
# SubInclude rule that can be used to conditionally include GPL licensed
# add-ons
- if $(INCLUDE_GPL_ADDONS) = 1 {
+ if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
SubInclude $(1) ;
}
}
Modified: haiku/branches/components/gallium3d/build/jam/NetBootArchive
===================================================================
--- haiku/branches/components/gallium3d/build/jam/NetBootArchive
2010-01-27 02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/build/jam/NetBootArchive
2010-01-27 03:07:13 UTC (rev 35314)
@@ -10,7 +10,7 @@
}
local GPL_ONLY = ;
-if $(INCLUDE_GPL_ADDONS) = 1 {
+if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
GPL_ONLY = "" ;
}
Modified:
haiku/branches/components/gallium3d/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/branches/components/gallium3d/build/jam/OptionalPackageDependencies
2010-01-27 02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/build/jam/OptionalPackageDependencies
2010-01-27 03:07:13 UTC (rev 35314)
@@ -10,9 +10,10 @@
OptionalPackageDependencies Development : DevelopmentBase Perl ;
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies LibLayout : DevelopmentBase ;
-OptionalPackageDependencies NetSurf : OpenSSL ;
+OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv ;
OptionalPackageDependencies OpenSSH : OpenSSL ;
OptionalPackageDependencies Python : Bzip ;
OptionalPackageDependencies Mercurial : Python ;
OptionalPackageDependencies Git : Expat Curl OpenSSL ;
OptionalPackageDependencies Curl : OpenSSL ;
+OptionalPackageDependencies NetFS : UserlandFS ;
Modified: haiku/branches/components/gallium3d/build/jam/OptionalPackages
===================================================================
--- haiku/branches/components/gallium3d/build/jam/OptionalPackages
2010-01-27 02:00:32 UTC (rev 35313)
+++ haiku/branches/components/gallium3d/build/jam/OptionalPackages
2010-01-27 03:07:13 UTC (rev 35314)
@@ -12,55 +12,60 @@
# Available Optional Packages:
-# APR - support libraries used for
example by Subversion
-# APR-util
-# Beam - powerful native e-mail client
-# BeBook - the classic BeOS API documentation
-# BeHappy - special documentation (i.e. BeBook)
browser
-# BeOSCompatibility - creates links within the system to support
old apps
-# BePDF - native PDF reader
-# Bluetooth - experimental Haiku components for
Bluetooth
-# CDRecord - the command line CD writing tools
-# Clockwerk - native audio/video compositing
-# CLucene - indexed file search
-# Curl - a client that groks URLs
-# CMake - cross platform make
-# CVS - the version control system
-# Development - more complete dev environment
(including autotools)
-# DevelopmentBase - basic development environment (gcc, headers,
libs,...)
-# DevelopmentMin - development headers, libs, tools, from
sources only
-# Expat - XML parsing libraries
-# Firefox - the webbrowser
-# Git - the distributed version
control system
-# KeymapSwitcher - Desktop utility
-# LibIconv - text encoding conversion library
-# LibLayout - GCC2 package needed by some BeOS apps
to compile
-# LibXML2 - the XML support libary
-# Links - the web browser
-# Mercurial - the distributed version control system
-# Nano - the command line text editor
-# Neon - support libraries used for example by
SVN
-# NetSurf - the web browser
-# OCaml - the Objective Caml language
-# OpenSound - additional audio driver package
-# OpenSSH - the secure shell
-# OpenSSL - secure sockets library
-# P7zip - file archiving utility
-# PCRE - the (Perl-compatible) regex engine
-# Pe - the powerful native
Programmer's Editor
-# Perl - the scripting language
-# Python - the scripting language
-# Rsync - remote directory synchronization
-# SQLite - the database implementation
-# Subversion - the version control system
-# Tar - archiving utility
-# UserlandFS - aids native file system development
(like FUSE)
-# Vim - the command line text editor
-# Vision - powerful native IRC client
-# VLC - the multi media player with
native interface
-# Welcome - introductory documentation to Haiku
-# WonderBrush - native graphics application
-# Yasm - the assembler utility
+# APR - support libraries
used for example by Subversion
+# APR-util - Apache portable runtime
utility library
+# BasicCommandLineTools - basic commandline tools
+# Beam - powerful native e-mail client
+# BeBook - the classic BeOS API
documentation
+# BeHappy - special documentation (i.e.
BeBook) browser
+# BeOSCompatibility - creates links within the system to
support old apps
+# BePDF - native PDF reader
+# Bluetooth - experimental Haiku components
for Bluetooth
+# CDRecord - the command line CD writing
tools
+# Clockwerk - native audio/video compositing
+# CLucene - indexed file search
+# Curl - a client that groks URLs
+# CMake - cross platform make
+# CVS - the version control
system
+# Development - more complete dev environment
(including autotools)
+# DevelopmentBase - basic development environment (gcc,
headers, libs,...)
+# DevelopmentMin - development headers, libs, tools,
from sources only
+# Expat - XML parsing libraries
+# Firefox - the webbrowser
+# Git - the distributed
version control system
+# ICU-devel - the headers for ICU (for
development)
+# KeymapSwitcher - Desktop utility
+# LibIconv - text encoding conversion
library
+# LibLayout - GCC2 package needed by some
BeOS apps to compile
+# LibXML2 - the XML support libary
+# Links - the web browser
+# Mercurial - the distributed version
control system
+# Nano - the command line text editor
+# Neon - support libraries used for
example by SVN
+# NetFS - the native networked file
system components
+# NetSurf - the web browser
+# OCaml - the Objective Caml language
+# OpenSound - additional audio driver
package
+# OpenSSH - the secure shell
+# OpenSSL - secure sockets library
+# P7zip - file archiving utility
+# PCRE - the (Perl-compatible) regex
engine
+# Pe - the powerful native
Programmer's Editor
+# Perl - the scripting language
+# Python - the scripting language
+# Rsync - remote directory
synchronization
+# SQLite - the database implementation
+# Subversion - the version control system
+# Tar - archiving utility
+# UserlandFS - aids native file system
development (like FUSE)
+# Vim - the command line text
editor
+# Vision - powerful native IRC client
+# VLC - the multi media
player with native interface
+# Welcome - introductory documentation to
Haiku
+# Wifi-ipw2100+fw - driver, firmware, and installer
script for Intel PRO/Wireless 2100
+# Wifi-iprowifi2200+fw - driver, firmware, and installer script for
Intel PRO/Wireless 2200
+# WonderBrush - native graphics application
+# Yasm - the assembler utility
local baseURL = http://haiku-files.org/files/optional-packages ;
@@ -92,6 +97,17 @@
}
+# BasicCommandLineTools
+if [ IsOptionalHaikuImagePackageAdded BasicCommandLineTools ]
+ && $(TARGET_ARCH) = x86 {
+ # sed
+ InstallOptionalHaikuImagePackage sed-4.2.1-r1a1-x86-gcc2-2009-08-30
+ : $(baseURL)/sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
+ :
+ : true ;
+}
+
+
# Beam
if [ IsOptionalHaikuImagePackageAdded Beam ] {
if $(TARGET_ARCH) != x86 {
@@ -178,9 +194,8 @@
AddDriversToHaikuImage bluetooth : $(bluetoothDrivers) ;
AddFilesToHaikuImage system servers : bluetooth_server ;
AddFilesToHaikuImage system lib : libbluetooth.so ;
- AddFilesToHaikuImage system add-ons kernel network devices : bluetooth ;
AddFilesToHaikuImage system add-ons kernel network protocols : l2cap ;
[... truncated: 337034 lines follow ...]
Other related posts:
- » [haiku-commits] r35314 - in haiku/branches/components/gallium3d: . 3rdparty 3rdparty/mmu_man/scripts 3rdparty/qtcreator 3rdparty/vmware ... - aljen-mlists
