[haiku-commits] r41418 - in haiku/branches/developer/aldeck/tracker_layout: . 3rdparty/mmu_man/onlinedemo 3rdparty/mmu_man/scripts build/jam build/scripts ...
- From: alex@xxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 10 May 2011 14:45:53 +0200 (CEST)
Author: aldeck
Date: 2011-05-10 14:45:35 +0200 (Tue, 10 May 2011)
New Revision: 41418
Changeset: https://dev.haiku-os.org/changeset/41418
Added:
haiku/branches/developer/aldeck/tracker_layout/build/scripts/generate_CountryFlags.sh
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AD
Andorra
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AE
United Arab Emirates
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AF
Afghanistan
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AG
Antigua and Barbuda
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AI
Anguilla
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AL
Albania
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AM
Armenia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AO
Angola
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AQ
Antarctica
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AR
Argentina
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AS
American Samoa
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AT
Austria
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AU
Australia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AW
Aruba
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AX
Aland Islands
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/AZ
Azerbaijan
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BA
Bosnia and Herzegovina
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BB
Barbados
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BD
Bangladesh
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BE
Belgium
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BF
Burkina Faso
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BG
Bulgaria
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BH
Bahrain
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BI
Burundi
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BJ
Benin
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BL
Saint Barthelemy
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BM
Bermuda
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BN
Brunei
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BO
Bolivia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BQ
Bonaire, Saint Eustatius and Saba
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BR
Brazil
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BS
Bahamas
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BT
Bhutan
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BV
Bouvet Island
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BW
Botswana
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BY
Belarus
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/BZ
Belize
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CA
Canada
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CC
Cocos (Keeling) Islands
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CD
Democratic Republic of the Congo
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CF
Central African Republic
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CG
Congo
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CH
Switzerland
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CI
Ivory Coast
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CK
Cook Islands
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CL
Chile
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CM
Cameroon
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CN
China
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CO
Colombia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CR
Costa Rica
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CU
Cuba
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CV
Cape Verde
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CW
Curacao
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CX
Christmas Island
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CY
Cyprus
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/CZ
Czech Republic
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/DE
Germany
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/DJ
Djibouti
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/DK
Denmark
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/DM
Dominica
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/DO
Dominican Republic
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/DZ
Algeria
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/EC
Ecuador
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/EE
Estonia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/EG
Egypt
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/ER
Eritrea
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/ES
Spain
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/ET
Ethiopia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/FI
Finland
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/FJ
Fiji
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/FK
Falkland Islands
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/FM
Federated States of Micronesia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/FO
Faroe Islands
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/FR
France
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GA
Gabon
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GB
United Kingdom
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GD
Grenada
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GE
Georgia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GF
French Guiana
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GG
Guernsey
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GH
Ghana
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GI
Gibraltar
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GL
Greenland
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GM
Gambia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GN
Guinea
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GP
Guadeloupe
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GQ
Equatorial Guinea
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GR
Greece
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GS
South Georgia and the South Sandwich Islands
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GT
Guatemala
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GU
Guam
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GW
Guinea Bissau
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/GY
Guyana
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/HK
Hong Kong
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/HM
Heard Island and McDonald Islands
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/HN
Honduras
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/HR
Croatia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/HT
Haiti
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/HU
Hungary
[... truncated: 932 added files follow ...]
Removed:
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
website - everything
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
website - logo
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
website - navigaion
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on blue - medium
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on blue - medium.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Afghanistan
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Albania
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Algeria
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Angola
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Anguilla
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Antigua_and_Barbuda
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Argentina
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Armenia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Australia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Austria
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Azerbaijan
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Bahrain
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Bangladesh
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Barbados
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Belarus
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Belgium
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Benin
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Bolivia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Bulgaria
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Burkina
Faso
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Cameroon
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Canada
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Chad
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Chile
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/China
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Colombia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Czech
Republic
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Denmark
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Djibouti
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Estonia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Finland
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/France
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Gabon
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Germany
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Ghana
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Guinea
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Guinea
Bissau
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Haiti
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Hungary
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Iceland
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Indonesia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Ireland
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Israel
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Italy
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Ivory
Coast
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Japan
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Kuwait
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Laos
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Latvia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Libya
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Lithuania
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Luxembourg
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Madagascar
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Mali
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Mauritius
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Monaco
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Netherlands
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Niger
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Nigeria
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Norway
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Palau
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Peru
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Poland
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Republic
of the Congo
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Romania
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Russia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Senegal
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Serbia
and Montenegro
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Sierra
Leone
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Somalia
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Sudan
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Sweden
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Switzerland
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Ukraine
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/United
Arab Emirates
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Vietnam
haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/flags/Yemen
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/input_server/devices/
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/input_server/devices/keyboard/
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/input_server/devices/keyboard/de.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/input_server/devices/keyboard/fi.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/input_server/devices/keyboard/fr.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/input_server/devices/keyboard/ja.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/butterfly/be.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/butterfly/cs.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/butterfly/de.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/butterfly/fi.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/butterfly/fr.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/butterfly/it.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/butterfly/ja.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/butterfly/nb.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/butterfly/ru.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/butterfly/sk.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/butterfly/sv.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/butterfly/uk.catkeys
[... truncated: 258 deleted files follow ...]
Modified:
haiku/branches/developer/aldeck/tracker_layout/
haiku/branches/developer/aldeck/tracker_layout/3rdparty/mmu_man/onlinedemo/haiku.php
haiku/branches/developer/aldeck/tracker_layout/3rdparty/mmu_man/scripts/dev-perso
haiku/branches/developer/aldeck/tracker_layout/build/jam/FileRules
haiku/branches/developer/aldeck/tracker_layout/build/jam/HaikuCD
haiku/branches/developer/aldeck/tracker_layout/build/jam/HaikuImage
haiku/branches/developer/aldeck/tracker_layout/build/jam/ImageRules
haiku/branches/developer/aldeck/tracker_layout/build/jam/LocaleRules
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalBuildFeatures
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalLibPackages
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalPackageDependencies
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalPackages
haiku/branches/developer/aldeck/tracker_layout/build/scripts/build_haiku_image
haiku/branches/developer/aldeck/tracker_layout/data/artwork/GET HAIKU -
download box 2
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU alpha 2
logo - white on blue - big
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU alpha logo
- white on blue - big
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on transparent - big.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on transparent - tiny.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on white - big
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on white - big.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on white - installer
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on white - installer - development.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on white - installer.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on white - normal
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on white - normal.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on white - tiny
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on white - tiny - versioned
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on white - tiny - versioned.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black on white - tiny.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
black.svg
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
website
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
website.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
welcome
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on black - big
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on black - big.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on black - normal
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on black - normal.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on black - tiny
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on black - tiny.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on blue - big
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on blue - big.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on blue - normal
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on blue - normal.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on blue - tiny
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on blue - tiny.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on transparent - big.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on transparent - small.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white on transparent - tiny.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/HAIKU logo -
white.svg
haiku/branches/developer/aldeck/tracker_layout/data/artwork/ReadMe
haiku/branches/developer/aldeck/tracker_layout/data/artwork/boot_splash/splash_logo
haiku/branches/developer/aldeck/tracker_layout/data/artwork/boot_splash/splash_logo-alpha.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/boot_splash/splash_logo-development.png
haiku/branches/developer/aldeck/tracker_layout/data/artwork/boot_splash/splash_logo-versioned
haiku/branches/developer/aldeck/tracker_layout/data/artwork/boot_splash/splash_logo.png
haiku/branches/developer/aldeck/tracker_layout/data/bin/installoptionalpackage
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/ru.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/ru.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/ro.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/ru.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/uk.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/be.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/cs.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/da.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/de.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/eo.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/es.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/fi.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/fr.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/hu.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/it.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/ja.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/ko.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/lt.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/nb.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/nl.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/pl.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/pt.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/pt_br.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/ro.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/ru.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/sv.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/uk.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/tracker/zipomatic/zh_hans.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/ro.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/ru.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/uk.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/ro.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/ru.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/uk.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/ro.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/ru.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/uk.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/ro.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/uk.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/ro.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/ru.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/uk.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/fr.catkeys
haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/ru.catkeys
[... truncated: 3455 changed files follow ...]
Log:
* Merged trunk changes from r40707 through r41417, bringing the branch up to
date though unstested yet.
r40922, r41075, r41126 (Model.cpp) and r41085, r41090, r41135, r41197
(ContainerWindow.cpp) were merged manually (with r41197
ported to DefaultControls.cpp)
Property changes on: haiku/branches/developer/aldeck/tracker_layout
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals:40148-40195
/haiku/branches/developer/bonefish/weak-symbols:39365-39568
/haiku/trunk:37809-39487,39489-40706
+ /haiku/branches/developer/bonefish/signals:40148-40195
/haiku/branches/developer/bonefish/weak-symbols:39365-39568
/haiku/trunk:37809-39487,39489-41417
Modified:
haiku/branches/developer/aldeck/tracker_layout/3rdparty/mmu_man/onlinedemo/haiku.php
===================================================================
---
haiku/branches/developer/aldeck/tracker_layout/3rdparty/mmu_man/onlinedemo/haiku.php
2011-05-10 10:07:46 UTC (rev 41417)
+++
haiku/branches/developer/aldeck/tracker_layout/3rdparty/mmu_man/onlinedemo/haiku.php
2011-05-10 12:45:35 UTC (rev 41418)
@@ -3,7 +3,7 @@
/*
* haiku.php - an online Haiku demo using qemu and vnc.
*
- * Copyright 2007-2010, Francois Revol, revol@xxxxxxxx
+ * Copyright 2007-2011, Francois Revol, revol@xxxxxxxx
* Distributed under the terms of the MIT License.
*/
@@ -32,6 +32,9 @@
// to use the tightvnc applet instead (supports > 8bpp):
// on debian, apt-get install tightvnc-java will put them in
// /usr/share/tightvnc-java
+// else you can get it from http://www.tightvnc.com/download-old.php :
+// wget http://www.tightvnc.com/download/1.3.10/tightvnc-1.3.10_javabin.zip
+// (you will have to move the VncViewer.jar file around)
define("VNCJAVA_PATH", "tightvnc-java");
define("VNCJAR", "VncViewer.jar");
define("VNCCLASS", "VncViewer.class");
@@ -58,6 +61,9 @@
//define("AUDIOPORTBASE", 8080);
define("AUDIOPORTBASE", (VNCPORTBASE + MAX_QEMUS));
+// if audio is enabled
+define("AUDIOENABLED", false);
+
// base port for serial output
//define("SERIALPORTBASE", 9000);
define("SERIALPORTBASE", (VNCPORTBASE + MAX_QEMUS * 2));
@@ -74,7 +80,7 @@
."-daemonize " /* detach from stdin */
."-localtime " /* not UTC */
."-name '" . addslashes(PAGE_TITLE) . "' "
- ."-monitor /dev/null "
+ ."-monitor null " /* disable the monitor */
."-serial none "
."-parallel none "
."-net none "
@@ -87,7 +93,7 @@
// BAD: let's one download the image
//define("QEMU_IMAGE_PATH", dirname($_SERVER['SCRIPT_FILENAME']) .
"/haiku.image");
-// max number of cpus for the VM, not more than 8
+// max number of cpus for the VM, no more than 8
define("QEMU_MAX_CPUS", 1);
// qemu 0.8.2 needs "", qemu 0.9.1 needs ":"
@@ -96,6 +102,7 @@
// name of session and pid files in /tmp
define("QEMU_SESSFILE_TMPL", "qemu-haiku-session-");
define("QEMU_PIDFILE_TMPL", "qemu-haiku-pid-");
+define("QEMU_LOGFILE_TMPL", "qemu-haiku-log-");
// name of session variable holding the qemu slot; not yet used correctly
define("QEMU_IDX_VAR", "QEMU_HAIKU_SESSION_VAR");
@@ -153,6 +160,11 @@
return "/tmp/" . QEMU_PIDFILE_TMPL . $idx;
}
+function make_qemu_logfile_name($idx)
+{
+ return "/tmp/" . QEMU_LOGFILE_TMPL . $idx;
+}
+
function find_qemu_slot()
{
for ($idx = 0; $idx < MAX_QEMUS; $idx++) {
@@ -379,9 +391,8 @@
echo "</td>\n</tr>\n";
- $enable_sound = 1;
echo "<tr ";
- if (!$enable_sound)
+ if (!AUDIOENABLED)
echo "class=\"haiku_online_disabled\"";
echo ">\n";
echo "<td align=\"right\">\n";
@@ -389,7 +400,7 @@
echo "</td>\n<td>\n";
echo "<input type=\"checkbox\" name=\"sound\" id=\"sound_cb\" ";
echo "value=\"1\" ";
- if ($enable_sound) {
+ if (AUDIOENABLED) {
//echo "checked=\"checked\" /";
} else
echo "disabled=\"disabled\" /";
@@ -452,8 +463,8 @@
echo "</table>\n";
echo "</form>\n";
out("NOTE: You will need a Java-enabled browser to display the VNC " .
- "Applet needed by this demo.");
- out("You can however use instead an external <a " .
+ "Applet used by this demo. " .
+ "You can however use instead an external <a " .
"href=\"http://fr.wikipedia.org/wiki/Virtual_Network_Computing\""; .
">VNC viewer</a>.");
ob_flush();
@@ -490,6 +501,7 @@
return $idx;
}
$pidfile = make_qemu_pidfile_name($idx);
+ $logfile = make_qemu_logfile_name($idx);
$cmd = '';
if (isset($_GET['sound'])) {
$cmd .= "QEMU_AUDIO_DRV=twolame ";
@@ -514,6 +526,9 @@
" -vnc " . QEMU_VNC_PREFIX . vnc_display() .
" -pidfile " . $pidfile .
" " . QEMU_IMAGE_PATH;
+ //$cmd .= " || echo $? && echo done )";
+ // redirect output to log file
+ //$cmd .= " >$logfile 2>&1";
if (file_exists($pidfile))
unlink($pidfile);
@@ -703,6 +718,8 @@
$class = VNCCLASS;
if ($external_only)
return;
+ if (!VNC_HIDE_CONTROLS)
+ $h += 32;
echo "<a name=\"haiku_online_applet\"></a>";
echo "<center>";
echo "<applet code=$class codebase=\"$vncjpath/\" ";
@@ -715,7 +732,7 @@
if (defined('VNC_USE_PASS') && VNC_USE_PASS)
$pass = $_SESSION['VNC_PASS'];
echo "<param name=\"PASSWORD\" value=\"" . $pass . "\">\n";
- if (defined("VNC_HIDE_CONTROLS") && VNC_HIDE_CONTROLS)
+ if (VNC_HIDE_CONTROLS)
echo "<param name=\"Show controls\" value=\"No\">\n";
//echo "<param name=\"share desktop\" value=\"no\" />";
echo "<param name=\"background-color\" value=\"#336698\">\n";
Modified:
haiku/branches/developer/aldeck/tracker_layout/3rdparty/mmu_man/scripts/dev-perso
===================================================================
---
haiku/branches/developer/aldeck/tracker_layout/3rdparty/mmu_man/scripts/dev-perso
2011-05-10 10:07:46 UTC (rev 41417)
+++
haiku/branches/developer/aldeck/tracker_layout/3rdparty/mmu_man/scripts/dev-perso
2011-05-10 12:45:35 UTC (rev 41418)
@@ -144,6 +144,7 @@
# make sure the update action is the first found in history.
test -d .svn && history -s svn up
+ test -d .bzr && history -s bzr update
test -d .hg && history -s hg pull
test -d .git && history -s git pull
test -d CVS && history -s cvs up -d
Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/FileRules
===================================================================
--- haiku/branches/developer/aldeck/tracker_layout/build/jam/FileRules
2011-05-10 10:07:46 UTC (rev 41417)
+++ haiku/branches/developer/aldeck/tracker_layout/build/jam/FileRules
2011-05-10 12:45:35 UTC (rev 41418)
@@ -221,7 +221,7 @@
}
LOCATE on $(targets) = $(directory) ;
- Depends $(targets) : $(directory) ;
+ Depends $(targets) : $(directory) $(archiveFile) ;
NoUpdate $(targets) ;
# one-time initialization for the main target (the directory)
@@ -235,8 +235,10 @@
Depends $(directory) : $(archiveFile) ;
switch $(archiveFile:S)
{
- case .zip : ExtractZipArchive1 $(directory) :
$(archiveFile) ;
- case .tgz : ExtractTarArchive1 $(directory) :
$(archiveFile) ;
+ case .zip : ExtractZipArchive1 $(targets) :
$(directory)
+ $(archiveFile) ;
+ case .tgz : ExtractTarArchive1 $(targets) :
$(directory)
+ $(archiveFile) ;
case * : Exit "ExtractArchive: Unhandled
archive extension:
$(archiveFile:S)" ;
}
@@ -252,14 +254,14 @@
actions ExtractZipArchive1
{
- mkdir -p $(1[1])
- unzip -q -u -o -d $(1[1]) $(2)
+ mkdir -p $(2[1])
+ unzip -q -u -o -d $(2[1]) $(2[2])
}
actions ExtractTarArchive1
{
- mkdir -p $(1[1])
- tar -C $(1[1]) -xf $(2)
+ mkdir -p $(2[1])
+ tar -C $(2[1]) -xf $(2[2])
}
actions ExtractArchiveDummy
Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/HaikuCD
===================================================================
--- haiku/branches/developer/aldeck/tracker_layout/build/jam/HaikuCD
2011-05-10 10:07:46 UTC (rev 41417)
+++ haiku/branches/developer/aldeck/tracker_layout/build/jam/HaikuCD
2011-05-10 12:45:35 UTC (rev 41418)
@@ -25,8 +25,6 @@
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/aldeck/tracker_layout/build/jam/HaikuImage
===================================================================
--- haiku/branches/developer/aldeck/tracker_layout/build/jam/HaikuImage
2011-05-10 10:07:46 UTC (rev 41417)
+++ haiku/branches/developer/aldeck/tracker_layout/build/jam/HaikuImage
2011-05-10 12:45:35 UTC (rev 41418)
@@ -118,6 +118,7 @@
$(X86_ONLY)s3.accelerant $(X86_ONLY)vesa.accelerant
$(X86_ONLY)ati.accelerant
$(X86_ONLY)3dfx.accelerant
+ #$(X86_ONLY)radeon_hd.accelerant
#$(X86_ONLY)via.accelerant
#$(X86_ONLY)vmware.accelerant
;
@@ -162,7 +163,7 @@
SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
$(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme
$(X86_ONLY)s3 $(X86_ONLY)vesa #$(X86_ONLY)via #$(X86_ONLY)vmware
- $(X86_ONLY)ati $(X86_ONLY)3dfx
+ $(X86_ONLY)ati $(X86_ONLY)3dfx #$(X86_ONLY)radeon_hd
;
SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki usb_midi ;
SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
@@ -179,12 +180,15 @@
$(X86_ONLY)ipw2100 $(X86_ONLY)iprowifi2200 $(X86_ONLY)iprowifi3945
$(X86_ONLY)iprowifi4965 $(X86_ONLY)marvell88w8363
$(X86_ONLY)marvell88w8335
$(X86_ONLY)ralink2860 $(X86_ONLY)ralinkwifi $(X86_ONLY)wavelanwifi
+
+ # WiMAX drivers
+ $(GPL_ONLY)usb_beceemwmx
;
#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 btrfs cdda ext2 fat iso9660 nfs
+SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs btrfs cdda exfat ext2 fat iso9660 nfs
attribute_overlay write_overlay ntfs reiserfs udf googlefs ;
# wifi firmware
@@ -484,7 +488,8 @@
AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ;
# post install scripts and fresh install indicator file
-local postInstallFiles = mime_update.sh default_deskbar_items.sh ;
+local postInstallFiles = add_catalog_entry_attributes.sh
+ default_deskbar_items.sh mime_update.sh ;
postInstallFiles = $(postInstallFiles:G=post-install) ;
SEARCH on $(postInstallFiles)
= [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
@@ -771,8 +776,6 @@
AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
AddVariableToScript $(script) : installDir : $(HAIKU_INSTALL_DIR) ;
#AddVariableToScript $(script) : isImage : 1 ;
-AddVariableToScript $(script) : gccVersion : $(HAIKU_GCC_VERSION[1]) ;
-AddVariableToScript $(script) : isHybridBuild : $(isHybridBuild) ;
AddVariableToScript $(script) : imageSize : $(HAIKU_IMAGE_SIZE) ;
AddVariableToScript $(script) : imageLabel : $(HAIKU_IMAGE_LABEL) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir
Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/ImageRules
===================================================================
--- haiku/branches/developer/aldeck/tracker_layout/build/jam/ImageRules
2011-05-10 10:07:46 UTC (rev 41417)
+++ haiku/branches/developer/aldeck/tracker_layout/build/jam/ImageRules
2011-05-10 12:45:35 UTC (rev 41418)
@@ -283,17 +283,16 @@
}
rule ExtractArchiveToContainer container : directoryTokens : archiveFile
- : extractedSubDir : isGCCAgnostic
+ : extractedSubDir
{
# ExtractArchiveToContainer <container> : <directory> : <archiveFile>
- # : <extractedSubDir> : <isGCCAgnostic> ;
+ # : <extractedSubDir> ;
local directory = [ AddDirectoryToContainer $(container)
: $(directoryTokens) ] ;
ARCHIVE_FILES_TO_INSTALL on $(directory) += $(archiveFile) ;
ARCHIVE_SUBDIR_TO_INSTALL_FROM on $(archiveFile) = $(extractedSubDir) ;
- ARCHIVE_IS_GCC_AGNOSTIC on $(archiveFile) = $(isGCCAgnostic) ;
}
rule AddDriversToContainer container : relativeDirectoryTokens : targets
@@ -608,11 +607,6 @@
ARCHIVE_SUBDIR_TO_INSTALL_FROM on $(dummyTarget) =
$(extractedSubDir:E=.) ;
- local isGCCAgnostic = [ on $(archiveFile)
- return $(ARCHIVE_IS_GCC_AGNOSTIC) ] ;
- ARCHIVE_IS_GCC_AGNOSTIC on $(dummyTarget) =
- $(isGCCAgnostic:E=false) ;
-
Depends $(dummyTarget) : $(initScript) $(archiveFile)
$(serializationDependency) ;
Depends $(script) : $(dummyTarget) ;
@@ -628,8 +622,7 @@
actions AddExtractFileToContainerExtractFilesScript
{
echo extractFile "\"$(2[2])\"" "\"$(TARGET_DIR)\"" \
- "\"$(ARCHIVE_SUBDIR_TO_INSTALL_FROM)\"" \
- "\"$(ARCHIVE_IS_GCC_AGNOSTIC)\"" >> $(2[1])
+ "\"$(ARCHIVE_SUBDIR_TO_INSTALL_FROM)\"" >> $(2[1])
}
@@ -734,16 +727,16 @@
}
rule ExtractArchiveToHaikuImage dirTokens : archiveFile : alwaysUpdate
- : extractedSubDir : isGCCAgnostic
+ : extractedSubDir
{
# ExtractArchiveToHaikuImage <dirTokens> : <archiveFile> :
<alwaysUpdate>
- # : <extractedSubDir> : <isGCCAgnostic> ;
+ # : <extractedSubDir> ;
# If the image shall only be updated, we extract only, if explicitely
# requested.
if ! [ IsUpdateHaikuImageOnly ] || $(alwaysUpdate) {
ExtractArchiveToContainer $(HAIKU_IMAGE_CONTAINER_NAME) :
$(dirTokens)
- : $(archiveFile) : $(extractedSubDir) :
$(isGCCAgnostic) ;
+ : $(archiveFile) : $(extractedSubDir) ;
}
}
@@ -830,7 +823,6 @@
}
rule InstallOptionalHaikuImagePackage package : url : dirTokens : isCDPackage
- : isGCCAgnostic
{
# download archive file
local archiveFile = [ DownloadFile $(package) : $(url) ] ;
@@ -840,16 +832,9 @@
# image!
# copy onto image
AddFilesToHaikuImage _packages_ : $(archiveFile) ;
- #if $(isGCCAgnostic) {
- # TODO: The archives would need to be marked whether they
are
- # gcc-agnostic (e.g. via attribute). Installer's
UnzipEngine would
- # also need to be updated, to read this attribute and
create the
- # alt gcc dir and symlinks as needed.
- #}
} else {
# extract onto image
- ExtractArchiveToHaikuImage $(dirTokens) : $(archiveFile) : :
- : $(isGCCAgnostic) ;
+ ExtractArchiveToHaikuImage $(dirTokens) : $(archiveFile) ;
}
}
Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/LocaleRules
===================================================================
--- haiku/branches/developer/aldeck/tracker_layout/build/jam/LocaleRules
2011-05-10 10:07:46 UTC (rev 41417)
+++ haiku/branches/developer/aldeck/tracker_layout/build/jam/LocaleRules
2011-05-10 12:45:35 UTC (rev 41418)
@@ -163,3 +163,24 @@
# For the pseudo-target catkeys
HAIKU_LOCALE_OUTPUT_CATKEYS += $(generatedCatalog:S=.catkeys) ;
}
+
+rule AddCatalogEntryAttribute target
+{
+ # AddCatalogEntryAttribute <target> : <attribute value> ;
+ #
+ # <attribute value> should be of the form
+ # "x-vnd.Haiku-App:context:string"
+
+ CATALOG_ENTRY on $(target) = "$(2)" ;
+
+ Depends $(target) : <build>addattr ;
+
+ AddCatalogEntryAttribute1 $(target)
+ : <build>addattr ;
+}
+
+actions AddCatalogEntryAttribute1
+{
+ $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
+ "$(2)" -t string "SYS:NAME" "$(CATALOG_ENTRY)" "$(1)"
+}
Modified:
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalBuildFeatures
===================================================================
---
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalBuildFeatures
2011-05-10 10:07:46 UTC (rev 41417)
+++
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalBuildFeatures
2011-05-10 12:45:35 UTC (rev 41418)
@@ -129,48 +129,6 @@
= [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers 3rdparty ] ;
-# EtPan
-
-# Automatically install the EtPan mail lib, when the optional EtPan optional
-# package is enabled.
-if [ IsOptionalHaikuImagePackageAdded EtPan ] {
- HAIKU_BUILD_FEATURE_ETPAN = 1 ;
-}
-
-HAIKU_ETPAN_GCC_2_PACKAGE = etpan-1.0-x86-gcc2-2010-10-20.zip ;
-HAIKU_ETPAN_GCC_4_PACKAGE = etpan-1.0-x86-gcc4-2010-10-20.zip ;
-
-if $(HAIKU_BUILD_FEATURE_ETPAN) {
- if $(TARGET_ARCH) != x86 {
- Echo "EtPan not available for $(TARGET_ARCH)" ;
- } else {
- local etpan_package ;
- if $(HAIKU_GCC_VERSION[1]) = 2 {
- etpan_package = $(HAIKU_ETPAN_GCC_2_PACKAGE) ;
- } else {
- etpan_package = $(HAIKU_ETPAN_GCC_4_PACKAGE) ;
- }
-
- local zipFile = [ DownloadFile $(etpan_package)
- : $(baseURL)/$(etpan_package) ] ;
-
- # zip file and output directory
- HAIKU_ETPAN_ZIP_FILE = $(zipFile) ;
- HAIKU_ETPAN_DIR = [ FDirName
$(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
- $(etpan_package:B) ] ;
-
- # extract libraries
- HAIKU_ETPAN_LIBS = [ ExtractArchive $(HAIKU_ETPAN_DIR)
- :
- common/lib/libetpan.a
- : $(zipFile)
- ] ;
- HAIKU_ETPAN_HEADERS
- = [ FDirName $(HAIKU_ETPAN_DIR) common include
] ;
- }
-}
-
-
# CLucene
# Automatically install the CLucene feature, when the optional CLucene optional
Modified:
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalLibPackages
===================================================================
---
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalLibPackages
2011-05-10 10:07:46 UTC (rev 41417)
+++
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalLibPackages
2011-05-10 12:45:35 UTC (rev 41418)
@@ -69,9 +69,7 @@
InstallOptionalHaikuImagePackage
box2d-2.1.2-x86-gcc4-2010-10-30.zip
:
$(baseURL)/lib/box2d-2.1.2-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
Echo "No optional package box2d available for
$(TARGET_ARCH)-gcc2" ;
}
@@ -87,16 +85,12 @@
InstallOptionalHaikuImagePackage
fribidi-0.19.2-x86-gcc4-2010-10-30.zip
: $(baseURL)/lib/fribidi-0.19.2-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
fribidi-0.19.2-x86-gcc2-2010-10-29.zip
: $(baseURL)/lib/fribidi-0.19.2-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -109,16 +103,12 @@
InstallOptionalHaikuImagePackage
lcms-2.0a-x86-gcc4-2010-10-30.zip
: $(baseURL)/lib/lcms-2.0a-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
lcms-2.0a-x86-gcc2-2010-10-29.zip
: $(baseURL)/lib/lcms-2.0a-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -131,16 +121,12 @@
InstallOptionalHaikuImagePackage
libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
:
$(baseURL)/lib/libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip
:
$(baseURL)/lib/libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -153,16 +139,12 @@
InstallOptionalHaikuImagePackage
libmad-0.15.1-x86-gcc4-2010-10-30.zip
: $(baseURL)/lib/libmad-0.15.1-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
libmad-0.15.1-x86-gcc2-2010-10-29.zip
: $(baseURL)/lib/libmad-0.15.1-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -175,16 +157,12 @@
InstallOptionalHaikuImagePackage
libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
:
$(baseURL)/lib/libmikmod-3.1.11-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
:
$(baseURL)/lib/libmikmod-3.1.11-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -197,16 +175,12 @@
InstallOptionalHaikuImagePackage
libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
:
$(baseURL)/lib/libmodplug-0.8.7-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
libmodplug-0.8.7-x86-gcc2-2010-10-29.zip
:
$(baseURL)/lib/libmodplug-0.8.7-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -219,16 +193,12 @@
InstallOptionalHaikuImagePackage
libpaper-1.1.24-x86-gcc4-2010-10-30.zip
: $(baseURL)/lib/libpaper-1.1.24-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
libpaper-1.1.24-x86-gcc2-2010-10-29.zip
: $(baseURL)/lib/libpaper-1.1.24-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -241,16 +211,12 @@
InstallOptionalHaikuImagePackage
physfs-2.0.1-x86-gcc4-2010-10-30.zip
: $(baseURL)/lib/physfs-2.0.1-x86-gcc4-2010-10-30.zip
- :
- : true
- ;
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
physfs-2.0.1-x86-gcc2-2010-10-29.zip
: $(baseURL)/lib/physfs-2.0.1-x86-gcc2-2010-10-29.zip
- :
- : true
- ;
+ : : true ;
}
}
Modified:
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalPackageDependencies
===================================================================
---
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalPackageDependencies
2011-05-10 10:07:46 UTC (rev 41417)
+++
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalPackageDependencies
2011-05-10 12:45:35 UTC (rev 41418)
@@ -14,8 +14,8 @@
OptionalPackageDependencies Curl : OpenSSL ;
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies Development : DevelopmentBase Perl ;
-OptionalPackageDependencies EtPan : Curl Expat LibIconv OpenSSL ;
OptionalPackageDependencies GetText : LibIconv ;
+OptionalPackageDependencies Curl : OpenSSL ;
OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ;
OptionalPackageDependencies ICU-devel : DevelopmentBase ;
OptionalPackageDependencies LibLayout : DevelopmentBase ;
@@ -23,6 +23,7 @@
OptionalPackageDependencies Tar : LibIconv ;
OptionalPackageDependencies Python : Bzip ;
OptionalPackageDependencies Mercurial : Python ;
+OptionalPackageDependencies Neon : LibXML2 ;
OptionalPackageDependencies NetFS : UserlandFS ;
OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv Libmng ;
OptionalPackageDependencies OpenSSH : OpenSSL ;
Modified:
haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalPackages
===================================================================
--- haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalPackages
2011-05-10 10:07:46 UTC (rev 41417)
+++ haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalPackages
2011-05-10 12:45:35 UTC (rev 41418)
@@ -39,7 +39,7 @@
# DevelopmentBase - basic development environment (gcc,
headers, libs,...)
# DevelopmentJava - JamVM, a Java Virtual machine, GNU
Classpath, ECJ
# DevelopmentMin - development headers, libs, tools,
from sources only
-# EtPan - e-mail libraries
+# Doxygen - Generate documentation from
source code
# Expat - XML parsing libraries
# Fastdep - fast dependency generator for
C/C++ files
# friss - RSS/ATOM/... feeds reader
@@ -104,8 +104,7 @@
} else {
InstallOptionalHaikuImagePackage
ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip
- :
$(baseURL)/ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip
- ;
+ :
$(baseURL)/ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip ;
}
}
@@ -115,12 +114,12 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package APR available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
apr-1.4.2-x86-gcc4-2010-11-12.zip
- : $(baseURL)/apr-1.4.2-x86-gcc4-2010-11-12.zip
+ InstallOptionalHaikuImagePackage
apr-1.4.2-x86-gcc4-2011-05-05.zip
+ : $(baseURL)/apr-1.4.2-x86-gcc4-2011-05-05.zip
: : true ;
} else {
- InstallOptionalHaikuImagePackage
apr-1.4.2-x86-gcc2-2010-10-13.zip
- : $(baseURL)/apr-1.4.2-x86-gcc2-2010-10-13.zip
+ InstallOptionalHaikuImagePackage
apr-1.4.2-x86-gcc2-2011-05-05.zip
+ : $(baseURL)/apr-1.4.2-x86-gcc2-2011-05-05.zip
: : true ;
}
}
@@ -131,12 +130,12 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package APR-util available for
$(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
apr-util-1.3.10-x86-gcc4-2010-11-12.zip
- : $(baseURL)/apr-util-1.3.10-x86-gcc4-2010-11-12.zip
+ InstallOptionalHaikuImagePackage
apr-util-1.3.10-x86-gcc4-2011-05-05.zip
+ : $(baseURL)/apr-util-1.3.10-x86-gcc4-2011-05-05.zip
: : true ;
} else {
- InstallOptionalHaikuImagePackage
apr-util-1.3.10-x86-gcc2-2010-10-13.zip
- : $(baseURL)/apr-util-1.3.10-x86-gcc2-2010-10-13.zip
+ InstallOptionalHaikuImagePackage
apr-util-1.3.10-x86-gcc2-2011-05-05.zip
+ : $(baseURL)/apr-util-1.3.10-x86-gcc2-2011-05-05.zip
: : true ;
}
}
@@ -150,9 +149,7 @@
Echo "No optional package ArmyKnife for gcc4" ;
} else {
InstallOptionalHaikuImagePackage
armyknife-61-x86-gcc2-2010-10-30.zip
- : $(baseURL)/armyknife-61-x86-gcc2-2010-10-30.zip
- :
- ;
+ : $(baseURL)/armyknife-61-x86-gcc2-2010-10-30.zip ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/ArmyKnife/ArmyKnife ;
}
@@ -162,17 +159,13 @@
# Bazaar
if [ IsOptionalHaikuImagePackageAdded Bazaar ] {
if $(TARGET_ARCH) != x86 {
- Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
+ Echo "No optional package Bazaar available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage bzr-2.2.0-gcc4-2010-09-15.zip
- : $(baseURL)/bzr-2.2.0-x86-gcc4-2010-09-15.zip
- :
- ;
+ : $(baseURL)/bzr-2.2.0-x86-gcc4-2010-09-15.zip ;
} else {
InstallOptionalHaikuImagePackage
bzr-2.2.1-x86-gcc2-2010-10-16.zip
- : $(baseURL)/bzr-2.2.1-x86-gcc2-2010-10-16.zip
- :
- ;
+ : $(baseURL)/bzr-2.2.1-x86-gcc2-2010-10-16.zip ;
}
}
@@ -181,18 +174,14 @@
if [ IsOptionalHaikuImagePackageAdded BeAE ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage beae-22-x86-gcc4-2010-09-15.zip
- : $(baseURL)/beae-22-x86-gcc4-2010-09-15.zip
- :
- ;
- AddSymlinkToHaikuImage home config be Applications
- : /boot/apps/BeAE/BeAE ;
} else {
- InstallOptionalHaikuImagePackage beae-22-x86-gcc2-2010-09-15.zip
- : $(baseURL)/beae-22-x86-gcc2-2010-09-15.zip
- :
- ;
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
beae-22-x86-gcc4-2010-09-15.zip
+ : $(baseURL)/beae-22-x86-gcc4-2010-09-15.zip ;
+ } else {
+ InstallOptionalHaikuImagePackage
beae-22-x86-gcc2-2010-09-15.zip
+ : $(baseURL)/beae-22-x86-gcc2-2010-09-15.zip ;
+ }
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeAE/BeAE ;
}
@@ -207,8 +196,7 @@
Echo "No optional package Beam available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage
Beam-1.2alpha-x86-gcc2-2010-04-29.zip
- : $(baseURL)/Beam-1.2alpha-x86-gcc2-2010-04-29.zip
- ;
+ : $(baseURL)/Beam-1.2alpha-x86-gcc2-2010-04-29.zip ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Beam/Beam ;
}
@@ -219,8 +207,7 @@
if [ IsOptionalHaikuImagePackageAdded BeBook ] {
InstallOptionalHaikuImagePackage bebook_20081026.zip
: $(baseURL)/bebook_20081026.zip
- : system documentation
- ;
+ : system documentation ;
AddSymlinkToHaikuImage home Desktop
: /boot/system/documentation/bebook/index.html : BeBook ;
}
@@ -234,9 +221,7 @@
Echo "No optional package BeHappy available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage
BeHappy-1.0.6-x86-gcc2-2008-10-16.zip
- : $(baseURL)/BeHappy-1.0.6-x86-gcc2-2008-10-16.zip
- :
- ;
+ : $(baseURL)/BeHappy-1.0.6-x86-gcc2-2008-10-16.zip ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeHappy/BeHappy ;
}
@@ -274,8 +259,7 @@
InstallOptionalHaikuImagePackage
BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip
: $(baseURL)/BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip
- : apps
- ;
+ : apps ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BePDF/BePDF ;
AddSymlinkToHaikuImage common data licenses
@@ -298,22 +282,16 @@
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc4-2010-05-04.zip
- :
$(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc4-2010-05-04.zip
- :
- ;
+ :
$(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc4-2010-05-04.zip ;
} else {
InstallOptionalHaikuImagePackage
BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc2-2010-05-02.zip
- :
$(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc2-2010-05-02.zip
- :
- ;
+ :
$(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc2-2010-05-02.zip ;
}
AddSymlinkToHaikuImage home config be Applications
- : /boot/apps/BeZillaBrowser/BeZillaBrowser
- ;
+ : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
InstallSourceArchive
BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz
- :
$(baseSourceURL)/2010/BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz
- ;
+ :
$(baseSourceURL)/2010/BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz ;
}
}
@@ -344,18 +322,14 @@
if [ IsOptionalHaikuImagePackageAdded BurnItNow ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package BurnItNow available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
burnitnow-39-x86-gcc4-2010-09-15.zip
- : $(baseURL)/burnitnow-39-x86-gcc4-2010-09-15.zip
- :
- ;
- AddSymlinkToHaikuImage home config be Applications
- : /boot/apps/BurnItNow/BurnItNow ;
} else {
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
burnitnow-39-x86-gcc4-2010-09-15.zip
+ :
$(baseURL)/burnitnow-39-x86-gcc4-2010-09-15.zip ;
+ } else {
InstallOptionalHaikuImagePackage
burnitnow-39-x86-gcc2-2010-09-15.zip
- : $(baseURL)/burnitnow-39-x86-gcc2-2010-09-15.zip
- :
- ;
+ : $(baseURL)/burnitnow-39-x86-gcc2-2010-09-15.zip ;
+ }
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BurnItNow/BurnItNow ;
}
@@ -370,9 +344,7 @@
InstallOptionalHaikuImagePackage
bzip2-1.0.6-x86-gcc2-2010-09-21.zip
: $(baseURL)/bzip2-1.0.6-x86-gcc2-2010-09-21.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -384,9 +356,7 @@
} else {
InstallOptionalHaikuImagePackage
ccache-3.0.1-x86-gcc2-2010-08-30.zip
- : $(baseURL)/ccache-3.0.1-x86-gcc2-2010-08-30.zip
- :
- ;
+ : $(baseURL)/ccache-3.0.1-x86-gcc2-2010-08-30.zip ;
}
}
@@ -396,11 +366,11 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package CDRecord available for
$(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
cdrtools-3.00-x86-gcc4-2010-11-12.zip
- : $(baseURL)/cdrtools-3.00-x86-gcc4-2010-11-12.zip ;
+ InstallOptionalHaikuImagePackage
cdrtools-3.01a01-x86-gcc4-2011-05-03.zip
+ : $(baseURL)/cdrtools-3.01a01-x86-gcc4-2011-05-03.zip ;
} else {
- InstallOptionalHaikuImagePackage
cdrtools-3.00-x86-gcc2-2010-08-25-1.zip
- : $(baseURL)/cdrtools-3.00-x86-gcc2-2010-08-25-1.zip ;
+ InstallOptionalHaikuImagePackage
cdrtools-3.01a01-x86-gcc2-2011-04-30.zip
+ : $(baseURL)/cdrtools-3.01a01-x86-gcc2-2011-04-30.zip ;
}
}
@@ -409,20 +379,16 @@
if [ IsOptionalHaikuImagePackageAdded Clockwerk ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Clockwerk available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
- Clockwerk-0.0.2-x86-gcc4-2010-10-13-1.zip
- : $(baseURL)/Clockwerk-0.0.2-x86-gcc4-2010-10-13-1.zip
- :
- ;
- AddSymlinkToHaikuImage home config be Applications
- : /boot/apps/Clockwerk/Clockwerk ;
} else {
- InstallOptionalHaikuImagePackage
- Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip
- : $(baseURL)/Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip
- :
- ;
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ Clockwerk-0.0.2-x86-gcc4-2010-10-13-1.zip
+ :
$(baseURL)/Clockwerk-0.0.2-x86-gcc4-2010-10-13-1.zip ;
+ } else {
+ InstallOptionalHaikuImagePackage
+ Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip
+ :
$(baseURL)/Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip ;
+ }
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Clockwerk/Clockwerk ;
}
@@ -439,9 +405,7 @@
InstallOptionalHaikuImagePackage
clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip
:
$(baseURL)/clucene-0.9.21-x86-gcc4-haiku-2009-08-11.zip
- :
- : true
- ;
+ : : true ;
}
}
@@ -453,18 +417,14 @@
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- cmake-2.8.4-x86-gcc4-2011-02-25.zip
- : $(baseURL)/cmake-2.8.4-x86-gcc4-2011-02-25.zip
- :
- : true
- ;
+ cmake-2.8.4-x86-gcc4-2011-05-03.zip
+ : $(baseURL)/cmake-2.8.4-x86-gcc4-2011-05-03.zip
+ : : true ;
} else {
InstallOptionalHaikuImagePackage
- cmake-2.8.4-x86-gcc2-2011-02-25.zip
- : $(baseURL)/cmake-2.8.4-x86-gcc2-2011-02-25.zip
- :
- : true
- ;
+ cmake-2.8.4-x86-gcc2-2011-05-03.zip
+ : $(baseURL)/cmake-2.8.4-x86-gcc2-2011-05-03.zip
+ : : true ;
}
}
}
@@ -475,13 +435,11 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package Curl available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
curl-7.21.4-x86-gcc4-2011-02-18.zip
- : $(baseURL)/curl-7.21.4-x86-gcc4-2011-02-18.zip
- : : true ;
+ InstallOptionalHaikuImagePackage
curl-7.21.4-x86-gcc4-2011-03-14.zip
+ : $(baseURL)/curl-7.21.4-x86-gcc4-2011-03-14.zip ;
} else {
- InstallOptionalHaikuImagePackage
curl-7.21.4-x86-gcc2-2011-02-18.zip
- : $(baseURL)/curl-7.21.4-x86-gcc2-2011-02-18.zip
- : : true ;
+ InstallOptionalHaikuImagePackage
curl-7.21.4-x86-gcc2-2011-03-14.zip
+ : $(baseURL)/curl-7.21.4-x86-gcc2-2011-03-14.zip ;
}
}
@@ -493,18 +451,15 @@
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- cvs-1.12.13.1-x86-gcc4-2010-11-12.zip
- :
$(baseURL)/cvs-1.12.13.1-x86-gcc4-2010-11-12.zip
+ cvs-1.12.13.1-x86-gcc4-2011-03-14.zip
+ :
$(baseURL)/cvs-1.12.13.1-x86-gcc4-2011-03-14.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
- cvs-1.12.13-r1a2-x86-gcc2-2010-04-29-a.zip
- :
$(baseURL)/cvs-1.12.13-r1a2-x86-gcc2-2010-04-29-a.zip
+ cvs-1.12.13.1-x86-gcc2-2011-03-14.zip
+ :
$(baseURL)/cvs-1.12.13.1-x86-gcc2-2011-03-14.zip
: : true ;
}
-
- InstallSourceArchive cvs-1.12.13_haiku-2010-04-29.tar.xz
- :
$(baseSourceURL)/2010/cvs-1.12.13_haiku-2010-04-29.tar.xz ;
}
[... truncated: 676232 lines follow ...]
Other related posts:
- » [haiku-commits] r41418 - in haiku/branches/developer/aldeck/tracker_layout: . 3rdparty/mmu_man/onlinedemo 3rdparty/mmu_man/scripts build/jam build/scripts ... - alex
