Author: aldeck Date: 2011-05-10 01:08:35 +0200 (Tue, 10 May 2011) New Revision: 41410 Changeset: https://dev.haiku-os.org/changeset/41410 Added: haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/Device_USB_Floppy haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/fr.catkeys 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/bfs/sv.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/fr.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/disk_systems/intel/sv.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/pl.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/sv.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/ro.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/fr.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/sv.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/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/pl.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/sv.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/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/fr.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/sv.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/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/pl.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/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/sv.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/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/pl.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/sv.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/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/fi.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/ro.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/sv.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/uk.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/jpeg/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/jpeg/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/jpeg/cs.catkeys [... truncated: 1428 added files follow ...] Removed: haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/Floppy haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/fr.catkeys 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/bfs/sv.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/fr.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/disk_systems/intel/sv.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/screen_savers/leaves/pl.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/sv.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/translators/bmp/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/bmp/fr.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/sv.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/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/exr/pl.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/sv.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/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/gif/fr.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/sv.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/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/pl.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/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hpgs/sv.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/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/hvif/pl.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/sv.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/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/fi.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/ro.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/sv.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/ico/uk.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/jpeg/ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/jpeg/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/jpeg/cs.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/jpeg/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/jpeg/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/jpeg/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/jpeg/ro.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/jpeg/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/translators/jpeg/sv.catkeys [... truncated: 1000 deleted files follow ...] Modified: haiku/branches/developer/aldeck/tracker_layout/ haiku/branches/developer/aldeck/tracker_layout/build/jam/BuildSetup haiku/branches/developer/aldeck/tracker_layout/build/jam/FileRules haiku/branches/developer/aldeck/tracker_layout/build/jam/HaikuImage haiku/branches/developer/aldeck/tracker_layout/build/jam/MiscRules 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/OptionalPackages haiku/branches/developer/aldeck/tracker_layout/build/jam/ReleaseBuildProfiles haiku/branches/developer/aldeck/tracker_layout/build/jam/TestsRules haiku/branches/developer/aldeck/tracker_layout/build/scripts/build_haiku_image haiku/branches/developer/aldeck/tracker_layout/data/bin/installoptionalpackage 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/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/pl.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/apps/aboutsystem/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/da.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/eo.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/es.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/hu.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/ja.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/ko.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/lt.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/pl.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/pt.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/sv.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/aboutsystem/uk.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/codycam/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/codycam/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/codycam/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/codycam/ko.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/codycam/pt_br.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/codycam/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/codycam/sv.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/deskbar/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/deskbar/eo.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/deskbar/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/deskbar/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/deskbar/ja.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/deskbar/lt.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/deskbar/pt.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/deskbar/ro.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/deskbar/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/deskbar/sv.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/deskbar/uk.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/diskprobe/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/diskprobe/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/diskprobe/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/da.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/es.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/hu.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/ja.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/ko.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/lt.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/pl.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/pt.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/pt_br.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/drivesetup/uk.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/expander/be.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/expander/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/expander/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/expander/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/expander/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/expander/sv.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/expander/uk.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/installer/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/installer/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/installer/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/installer/hu.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/installer/ja.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/installer/ko.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/installer/lt.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/installer/pl.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/installer/pt.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/installer/pt_br.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/installer/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/installer/uk.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/mail/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/mail/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/mail/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/mail/ru.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/mail/sv.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/mail/uk.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/midiplayer/de.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/midiplayer/eo.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/midiplayer/fi.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/midiplayer/fr.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/midiplayer/pl.catkeys haiku/branches/developer/aldeck/tracker_layout/data/catalogs/apps/midiplayer/ru.catkeys [... truncated: 2083 changed files follow ...] Log: * Merged trunk changes from r39661 through r40706. Will merge Jonas's (kirilla) localization changes next. r39810, r40464, r40623 (ContainerWindow.cpp) and r40252, r40649, r39744 and r40338 (PoseView.cpp) had to be merged manually (with r39810 and r40623 ported in DefaultControls.cpp) Untested. Property changes on: haiku/branches/developer/aldeck/tracker_layout ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/weak-symbols:39365-39568 /haiku/trunk:37809-39487,39489-39660 + /haiku/branches/developer/bonefish/signals:40148-40195 /haiku/branches/developer/bonefish/weak-symbols:39365-39568 /haiku/trunk:37809-39487,39489-40706 Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/BuildSetup =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/build/jam/BuildSetup 2011-05-09 22:47:06 UTC (rev 41409) +++ haiku/branches/developer/aldeck/tracker_layout/build/jam/BuildSetup 2011-05-09 23:08:35 UTC (rev 41410) @@ -65,7 +65,7 @@ HAIKU_DEFAULT_IMAGE_DIR = $(HAIKU_OUTPUT_DIR) ; HAIKU_DEFAULT_VMWARE_IMAGE_NAME = haiku.vmdk ; HAIKU_DEFAULT_INSTALL_DIR = /Haiku ; -HAIKU_DEFAULT_IMAGE_SIZE ?= 220 ; # 220 MB +HAIKU_DEFAULT_IMAGE_SIZE ?= 230 ; # 230 MB HAIKU_DEFAULT_IMAGE_LABEL ?= Haiku ; # Haiku CD defaults @@ -529,7 +529,8 @@ { local i ; for i in be bnetapi debug game GL locale mail media midi midi2 network - opengl root screensaver textencoding tracker translation z { + opengl package root screensaver textencoding tracker translation + z { HAIKU_LIBRARY_NAME_MAP_$(i) = lib$(i).so ; } HAIKU_LIBRARY_NAME_MAP_libstdc++ = $(HAIKU_LIBSTDC++) ; Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/FileRules =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/build/jam/FileRules 2011-05-09 22:47:06 UTC (rev 41409) +++ haiku/branches/developer/aldeck/tracker_layout/build/jam/FileRules 2011-05-09 23:08:35 UTC (rev 41410) @@ -201,10 +201,10 @@ # <directory> - The directory into which to extract the archive file. The # directory is created is by this rule and it is the target # that the extract action is associated with. - # <entries> - The entries of the archive file one is interested in. The - # rule always exctracts the complete archive file, from the - # given entries the rule creates targets (using <grist>) - # representing the extracted entries. Those targets are + # <entries> - The entries of the archive file one is interested in. The + # rule always extracts the complete archive file, from the + # given entries the rule creates targets (using <grist>) + # representing the extracted entries. Those targets are # returned by the rule. # <archiveFile> - The archive file target to extract. # <grist> - The grist used to create targets from <entries>. Defaults to Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/HaikuImage =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/build/jam/HaikuImage 2011-05-09 22:47:06 UTC (rev 41409) +++ haiku/branches/developer/aldeck/tracker_layout/build/jam/HaikuImage 2011-05-09 23:08:35 UTC (rev 41410) @@ -27,7 +27,7 @@ IDE_ONLY = "" ; } -SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2 +SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bzip2 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 @@ -52,7 +52,7 @@ rc readlink ReadOnlyBootPrompt reindex release renice rlog rm rmattr rmindex rmdir roster route safemode screen_blanker screenmode screenshot sdiff setdecor settype - setversion setvolume setwep seq sha1sum shar shred shuf shutdown sleep sort + setversion setvolume seq sha1sum shar shred shuf shutdown sleep sort spamdbm split stat strace stty su sum sync sysinfo tac tail tcpdump tcptester tee telnet telnetd test timeout top touch @@ -63,19 +63,21 @@ zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew ; -SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc Devices - DiskProbe DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer - LaunchBox Magnify Mail MediaConverter MediaPlayer MidiPlayer NetworkStatus - PackageInstaller People PoorMan PowerStatus ProcessController Screenshot - ShowImage SoundRecorder StyledEdit Terminal TextSearch TV Workspaces +SYSTEM_APPS = AboutSystem ActivityMonitor $(X86_ONLY)BootManager CharacterMap + CodyCam DeskCalc Devices DiskProbe DiskUsage DriveSetup CDPlayer Expander + Icon-O-Matic Installer LaunchBox Magnify Mail MediaConverter MediaPlayer + MidiPlayer NetworkStatus PackageInstaller People PoorMan PowerStatus + ProcessController Screenshot ShowImage SoundRecorder StyledEdit Terminal + TextSearch TV Workspaces ; SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations <preference>Deskbar E-mail FileTypes Fonts Keyboard Keymap Locale Media - Mouse Network Notifications OpenGL Printers Screen ScreenSaver Shortcuts Sounds Time - Touchpad <preference>Tracker VirtualMemory + Mouse Network Notifications OpenGL Printers Screen ScreenSaver Shortcuts + Sounds Time Touchpad <preference>Tracker VirtualMemory ; SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo GLTeapot - $(HAIKU_INCLUDE_TRADEMARKS)Haiku3d Mandelbrot Pairs Playground Pulse Sudoku + $(HAIKU_INCLUDE_TRADEMARKS)Haiku3d Mandelbrot OverlayImage Pairs Playground + Pulse Sudoku ; SYSTEM_LIBS = libbe.so libbsd.so libbnetapi.so @@ -94,6 +96,7 @@ $(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++) ; PRIVATE_SYSTEM_LIBS = + libalm.so libfluidsynth.so libilmimf.so liblpsolve55.so @@ -152,10 +155,10 @@ SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port Print\ To\ File Serial\ Port USB\ Port ; -SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow Flurry - $(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Spider Message ; -SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ; -SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ; +SYSTEM_ADD_ONS_SCREENSAVERS = Butterfly DebugNow Flurry + $(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Leaves Message Spider ; +SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda sis7018 ; +SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia usb_audio ; 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 @@ -181,8 +184,8 @@ SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa $(IDE_ONLY)ide scsi config_manager agp_gart usb firewire $(X86_ONLY)acpi ; -SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay - write_overlay ntfs reiserfs udf googlefs ; +SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs btrfs cdda ext2 fat iso9660 nfs + attribute_overlay write_overlay ntfs reiserfs udf googlefs ; # wifi firmware for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) { @@ -225,7 +228,7 @@ : <usb>uhci <usb>ohci <usb>ehci ; AddFilesToHaikuImage system add-ons kernel console : vga_text ; AddFilesToHaikuImage system add-ons kernel debugger - : <kdebug>demangle $(X86_ONLY)<kdebug>disasm <kdebug>hangman + : <kdebug>demangle $(X86_ONLY)<kdebug>disasm <kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>run_on_exit ; AddFilesToHaikuImage system add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; @@ -341,14 +344,13 @@ AddDirectoryToHaikuImage home mail draft ; AddDirectoryToHaikuImage home mail in ; AddDirectoryToHaikuImage home mail out ; -AddSymlinkToHaikuImage home config settings Mail : ../../../mail/in : mailbox ; # Deskbar Application links AddDirectoryToHaikuImage home config be Applications ; DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc Devices DiskProbe DriveSetup DiskUsage Expander Icon-O-Matic Installer - Magnify Mail MediaConverter MediaPlayer MidiPlayer People PoorMan Screenshot - SoundRecorder StyledEdit Terminal TV + Magnify Mail MediaConverter MediaPlayer MidiPlayer People PoorMan + Screenshot SoundRecorder StyledEdit Terminal TV ; local linkTarget ; for linkTarget in $(DESKBAR_APPLICATIONS) { @@ -522,10 +524,8 @@ AddFilesToHaikuImage system add-ons mail_daemon inbound_protocols : POP3 IMAP ; AddFilesToHaikuImage system add-ons mail_daemon outbound_protocols : SMTP ; AddFilesToHaikuImage system add-ons mail_daemon inbound_filters - : Match\ Header Spam\ Filter R5\ Daemon\ Filter ; + : MatchHeader SpamFilter NewMailNotification ; AddFilesToHaikuImage system add-ons mail_daemon outbound_filters : Fortune ; -AddFilesToHaikuImage system add-ons mail_daemon system_filters - : 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) ; @@ -610,6 +610,11 @@ : [ FDirName $(HAIKU_TOP) src libs print libgutenprint src xml ] : gutenprint : -x .svn -x *.c -x Makefile.am -x Makefile.in ; +# dvb channel settings +CopyDirectoryToHaikuImage home config settings Media + : [ FDirName $(HAIKU_TOP) data settings media dvb ] + : dvb : -x .svn -x Jamfile ; + # licenses CopyDirectoryToHaikuImage system data : [ FDirName $(HAIKU_TOP) data system data licenses ] @@ -738,7 +743,7 @@ HAIKU_IMAGE_NAME ?= $(HAIKU_DEFAULT_IMAGE_NAME) ; HAIKU_IMAGE_DIR ?= $(HAIKU_DEFAULT_IMAGE_DIR) ; HAIKU_IMAGE = $(HAIKU_IMAGE_NAME) ; -HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 220 MB +HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 230 MB HAIKU_IMAGE_LABEL ?= $(HAIKU_DEFAULT_IMAGE_LABEL) ; MakeLocate $(HAIKU_IMAGE) : $(HAIKU_IMAGE_DIR) ; Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/MiscRules =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/build/jam/MiscRules 2011-05-09 22:47:06 UTC (rev 41409) +++ haiku/branches/developer/aldeck/tracker_layout/build/jam/MiscRules 2011-05-09 23:08:35 UTC (rev 41410) @@ -73,11 +73,15 @@ rule MakeLocateCommonPlatform { + # The file is shared between all target platforms. MakeLocate $(1) : $(COMMON_PLATFORM_LOCATE_TARGET) ; } rule MakeLocatePlatform { + # The file is specific for the target platform, but + # architecture independent. Usually the right rule for generated + # sources, though sometimes sources can be architecture specific. local files = $(1) ; local file ; for file in $(files) { @@ -91,6 +95,9 @@ rule MakeLocateArch { + # The file is platform+architecture specific, but is debug + # level independent. This is usually the right rule for generated + # architecture specific data or source files. local files = $(1) ; local file ; for file in $(files) { @@ -104,6 +111,8 @@ rule MakeLocateDebug { + # The file is platform+architecture+debug level specific. + # That's what should be used for compiled code. local files = $(1) ; local file ; for file in $(files) { Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalBuildFeatures =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalBuildFeatures 2011-05-09 22:47:06 UTC (rev 41409) +++ haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalBuildFeatures 2011-05-09 23:08:35 UTC (rev 41410) @@ -12,9 +12,9 @@ } if $(HAIKU_GCC_VERSION[1]) >= 4 { - HAIKU_OPENSSL_PACKAGE = openssl-1.0.0a-x86-gcc4-2010-11-12.zip ; + HAIKU_OPENSSL_PACKAGE = openssl-1.0.0c-x86-gcc4-2010-12-23.zip ; } else { - HAIKU_OPENSSL_PACKAGE = openssl-1.0.0a-x86-gcc2-2010-08-29.zip ; + HAIKU_OPENSSL_PACKAGE = openssl-1.0.0c-x86-gcc2-2010-12-23.zip ; } local baseURL = http://haiku-files.org/files/optional-packages ; Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalLibPackages =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalLibPackages 2011-05-09 22:47:06 UTC (rev 41409) +++ haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalLibPackages 2011-05-09 23:08:35 UTC (rev 41410) @@ -28,7 +28,7 @@ local baseURL = http://haiku-files.org/files/optional-packages ; -local baseSourceURL = http://haiku-files.org/files/releases/r1alpha2/sources ; +local baseSourceURL = http://haiku-files.org/files/sources ; # AllegroLibs @@ -261,8 +261,8 @@ Echo "No optional package SDLLibs available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libsdl-1.2-hg-x86-gcc4-2010-10-30.zip - : $(baseURL)/lib/libsdl-1.2-hg-x86-gcc4-2010-10-30.zip ; + libsdl-1.2-hg-x86-gcc4-2010-12-23.zip + : $(baseURL)/lib/libsdl-1.2-hg-x86-gcc4-2010-12-23.zip ; InstallOptionalHaikuImagePackage guilib-1.2.1-x86-gcc4-2010-10-30.zip : $(baseURL)/lib/guilib-1.2.1-x86-gcc4-2010-10-30.zip ; @@ -283,7 +283,7 @@ : $(baseURL)/lib/sdl-sound-1.0.3-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip - : $(baseURL)/lib/sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip ; + : $(baseURL)/lib/sdl-rtf-0.1.0-x86-gcc4-2010-12-26.zip ; InstallOptionalHaikuImagePackage sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip : $(baseURL)/lib/sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip ; @@ -295,11 +295,11 @@ : $(baseURL)/lib/smjpeg-0.2.1-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage smpeg-0.4.5-x86-gcc4-2010-10-29.zip - : $(baseURL)/lib/smpeg-0.4.5-x86-gcc4-2010-10-29.zip ; + : $(baseURL)/lib/smpeg-0.4.5-x86-gcc4-2010-10-30.zip ; } else { InstallOptionalHaikuImagePackage - libsdl-1.2-hg-x86-gcc2-2010-10-29.zip - : $(baseURL)/lib/libsdl-1.2-hg-x86-gcc2-2010-10-29.zip ; + libsdl-1.2-hg-x86-gcc2-2010-12-23.zip + : $(baseURL)/lib/libsdl-1.2-hg-x86-gcc2-2010-12-23.zip ; InstallOptionalHaikuImagePackage guilib-1.2.1-x86-gcc2-2010-10-29.zip : $(baseURL)/lib/guilib-1.2.1-x86-gcc2-2010-10-29.zip ; @@ -343,8 +343,8 @@ Echo "No optional package XiphLibs available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - flac-1.2.1-x86-gcc4-2010-10-30.zip - : $(baseURL)/lib/flac-1.2.1-x86-gcc4-2010-10-30.zip ; + flac-1.2.1-x86-gcc4-2010-10-31.zip + : $(baseURL)/lib/flac-1.2.1-x86-gcc4-2010-10-31.zip ; InstallOptionalHaikuImagePackage libao-1.0.0-x86-gcc4-2010-10-30.zip : $(baseURL)/lib/libao-1.0.0-x86-gcc4-2010-10-30.zip ; @@ -361,8 +361,8 @@ speex-1.2-git-x86-gcc4-2010-10-30.zip : $(baseURL)/lib/speex-1.2-git-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage - vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip - : $(baseURL)/lib/vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip ; + vorbis-tools-1.4.0-x86-gcc4-2010-12-30.zip + : $(baseURL)/lib/vorbis-tools-1.4.0-x86-gcc4-2010-12-30.zip ; } else { InstallOptionalHaikuImagePackage flac-1.2.1-x86-gcc2-2010-10-29.zip Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalPackages =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalPackages 2011-05-09 22:47:06 UTC (rev 41409) +++ haiku/branches/developer/aldeck/tracker_layout/build/jam/OptionalPackages 2011-05-09 23:08:35 UTC (rev 41410) @@ -37,6 +37,7 @@ # CVS - the version control system # Development - more complete dev environment (including autotools) # 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 # Expat - XML parsing libraries @@ -85,11 +86,11 @@ # UserlandFS - aids native file system development (like FUSE) # Vim - Vi IMproved. Highly configurable text editor # Vision - powerful native IRC client -# VLC - the multi media player with native interface # WebPositive - native, WebKit-based web browser # Welcome - introductory documentation to Haiku # WifiFirmwareScriptData - data files needed by install-wifi-firmwares.sh # WonderBrush - native graphics application +# WQY-MicroHei - Chinese font # XZ-Utils - file archiving utility # Yasm - the assembler utility @@ -452,15 +453,15 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - cmake-2.8.2-x86-gcc4-2010-10-31.zip - : $(baseURL)/cmake-2.8.2-x86-gcc4-2010-10-31.zip + cmake-2.8.4-x86-gcc4-2011-02-25.zip + : $(baseURL)/cmake-2.8.4-x86-gcc4-2011-02-25.zip : : true ; } else { InstallOptionalHaikuImagePackage - cmake-2.8.2-x86-gcc2-2010-10-13.zip - : $(baseURL)/cmake-2.8.2-x86-gcc2-2010-10-13.zip + cmake-2.8.4-x86-gcc2-2011-02-25.zip + : $(baseURL)/cmake-2.8.4-x86-gcc2-2011-02-25.zip : : true ; @@ -474,12 +475,12 @@ if $(TARGET_ARCH) != x86 { Echo "No optional package Curl available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage curl-7.21.2-x86-gcc4-2010-11-12.zip - : $(baseURL)/curl-7.21.2-x86-gcc4-2010-11-12.zip + InstallOptionalHaikuImagePackage curl-7.21.4-x86-gcc4-2011-02-18.zip + : $(baseURL)/curl-7.21.4-x86-gcc4-2011-02-18.zip : : true ; } else { - InstallOptionalHaikuImagePackage curl-7.21.2-x86-gcc2-2010-10-13.zip - : $(baseURL)/curl-7.21.2-x86-gcc2-2010-10-13.zip + InstallOptionalHaikuImagePackage curl-7.21.4-x86-gcc2-2011-02-18.zip + : $(baseURL)/curl-7.21.4-x86-gcc2-2011-02-18.zip : : true ; } } @@ -589,8 +590,8 @@ # other commonly used tools if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - bison-2.4.1-x86-gcc4-2010-11-12.zip - : $(baseURL)/bison-2.4.1-x86-gcc4-2010-11-12.zip ; + bison-2.4.3-x86-gcc4-2011-02-07.zip + : $(baseURL)/bison-2.4.3-x86-gcc4-2011-02-07.zip ; InstallOptionalHaikuImagePackage m4-1.4.14-x86-gcc4-2010-11-12.zip : $(baseURL)/m4-1.4.14-x86-gcc4-2010-11-12.zip ; @@ -604,8 +605,8 @@ : $(baseURL)/make-3.82-x86-gcc4-2010-11-12.zip ; } else { InstallOptionalHaikuImagePackage - bison-2.4.1-r1a2-x86-gcc2-2010-04-21-a.zip - : $(baseURL)/bison-2.4.1-r1a2-x86-gcc2-2010-04-21-a.zip ; + bison-2.4.3-x86-gcc2-2011-02-07.zip + : $(baseURL)/bison-2.4.3-x86-gcc2-2011-02-07.zip ; InstallOptionalHaikuImagePackage m4-1.4.14-r1a2-x86-gcc2-2010-04-21-a.zip : $(baseURL)/m4-1.4.14-r1a2-x86-gcc2-2010-04-21-a.zip ; @@ -620,8 +621,8 @@ : $(baseURL)/make-3.82-x86-gcc2-2010-09-25.zip ; } - InstallSourceArchive bison-2.4.1_haiku-2010-04-29.tar.xz - : $(baseSourceURL)/2010/bison-2.4.1_haiku-2010-04-29.tar.xz ; + InstallSourceArchive bison-2.4.3_haiku-2011-01-30.tar.xz + : $(baseSourceURL)/2011/bison-2.4.3_haiku-2011-01-30.tar.xz ; InstallSourceArchive m4-1.4.14_haiku-2010-04-29.tar.xz : $(baseSourceURL)/2010/m4-1.4.14_haiku-2010-04-29.tar.xz ; InstallSourceArchive flex-2.5.35_haiku-2010-04-29.tar.xz @@ -629,6 +630,51 @@ } +# DevelopmentJava +if [ IsOptionalHaikuImagePackageAdded DevelopmentJava ] { + if $(TARGET_ARCH) != x86 { + Echo "No optional package DevelopmentJava available for $(TARGET_ARCH)" ; + } else if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage + classpath-0.98-x86-gcc4-2011-02-13.zip + : http://jerome.duval.free.fr/obos/classpath-0.98-x86-gcc4-2011-02-13.zip ; + AddSymlinkToHaikuImage common bin : + /boot/common/bin/i586-pc-haiku-grmiregistry : rmiregistry ; + AddSymlinkToHaikuImage common bin : + /boot/common/bin/i586-pc-haiku-gserialver : serialver ; + AddSymlinkToHaikuImage common bin : + /boot/common/bin/i586-pc-haiku-gjar : jar ; + AddSymlinkToHaikuImage common bin : + /boot/common/bin/i586-pc-haiku-gjavah : javah ; + AddSymlinkToHaikuImage common bin : + /boot/common/bin/i586-pc-haiku-gnameserv : nameserv ; + AddSymlinkToHaikuImage common bin : + /boot/common/bin/i586-pc-haiku-gorbd : orbd ; + AddSymlinkToHaikuImage common bin : + /boot/common/bin/i586-pc-haiku-grmid : rmid ; + AddSymlinkToHaikuImage common bin : + /boot/common/bin/i586-pc-haiku-gkeytool : keytool ; + AddSymlinkToHaikuImage common bin : + /boot/common/bin/i586-pc-haiku-gappletviewer : appletviewer ; + AddSymlinkToHaikuImage common bin : + /boot/common/bin/i586-pc-haiku-grmic : rmic ; + AddSymlinkToHaikuImage common bin : + /boot/common/bin/i586-pc-haiku-gnative2ascii : native2ascii ; + AddSymlinkToHaikuImage common bin : + /boot/common/bin/i586-pc-haiku-gjarsigner : jarsigner ; + InstallOptionalHaikuImagePackage + jamvm-1.5.4-x86-gcc4-2011-02-13.zip + : http://jerome.duval.free.fr/obos/jamvm-1.5.4-x86-gcc4-2011-02-13.zip ; + AddSymlinkToHaikuImage common bin : /boot/common/bin/jamvm : java ; + InstallOptionalHaikuImagePackage + ecj-3.6.2-haiku-2011-02-26.zip + : http://jerome.duval.free.fr/obos/ecj-3.6.2-haiku-2011-02-26.zip ; + } else { + Echo "No optional package DevelopmentJava available for gcc2" ; + } +} + + # DevelopmentMin if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 { if ! ( $(HAIKU_GCC_VERSION[1]) in 2 4 ) { @@ -823,22 +869,22 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - gettext-0.17-x86-gcc4-2010-05-06.zip - : $(baseURL)/gettext-0.17-x86-gcc4-2010-05-06.zip + gettext-0.18.1.1-x86-gcc4-2011-02-07.zip + : $(baseURL)/gettext-0.18.1.1-x86-gcc4-2011-02-07.zip : : true ; - InstallSourceArchive gettext-0.17_haiku-2010-05-06.tar.xz - : $(baseSourceURL)/2010/gettext-0.17_haiku-2010-05-06.tar.xz ; + InstallSourceArchive gettext-0.18.1.1_haiku-2011-02-07.tar.xz + : $(baseSourceURL)/2010/gettext-0.18.1.1_haiku-2011-02-07.tar.xz ; } else if $(HAIKU_GCC_VERSION[1]) = 2 && $(isHybridBuild) { InstallOptionalHaikuImagePackage - gettext-0.17-x86-gcc2h-2010-05-06.zip - : $(baseURL)/gettext-0.17-x86-gcc2h-2010-05-06.zip + gettext-0.18.1.1-x86-gcc2-2011-02-07.zip + : $(baseURL)/gettext-0.18.1.1-x86-gcc2-2011-02-07.zip : : true ; - InstallSourceArchive gettext-0.17_haiku-2010-05-06.tar.xz - : $(baseSourceURL)/2010/gettext-0.17_haiku-2010-05-06.tar.xz ; + InstallSourceArchive gettext-0.18.1.1_haiku-2011-02-07.tar.xz + : $(baseSourceURL)/2011/gettext-0.18.1.1_haiku-2011-02-07.tar.xz ; } else { Echo "No optional package GetText available for $(TARGET_ARCH)-gcc2" ; } @@ -852,8 +898,8 @@ Echo "No optional package Git available for $(TARGET_ARCH)" ; } else { InstallOptionalHaikuImagePackage - git-1.7.1-x86-gcc2-2010-05-26.zip - : $(baseURL)/git-1.7.1-x86-gcc2-2010-05-26.zip + git-1.7.3.5-x86-gcc2-2011-02-25.zip + : $(baseURL)/git-1.7.3.5-x86-gcc2-2011-02-25.zip : : true ; @@ -983,15 +1029,15 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libevent-1.4.13-x86-gcc4-2010-10-30.zip - : $(baseURL)/lib/libevent-1.4.13-x86-gcc4-2010-10-30.zip + libevent-2.0.10-x86-gcc4-2011-02-25.zip + : $(baseURL)/lib/libevent-2.0.10-x86-gcc4-2011-02-25.zip : : true ; } else { InstallOptionalHaikuImagePackage - libevent-1.4.13-x86-gcc2-2010-10-29.zip - : $(baseURL)/lib/libevent-1.4.13-x86-gcc2-2010-10-29.zip + libevent-2.0.10-x86-gcc2-2011-02-25.zip + : $(baseURL)/lib/libevent-2.0.10-x86-gcc2-2011-02-25.zip : : true ; @@ -1180,12 +1226,12 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - nano-2.2.5-x86-gcc4-2010-11-13.zip - : $(baseURL)/nano-2.2.5-x86-gcc4-2010-11-13.zip ; + nano-2.2.6-x86-gcc4-2011-02-25.zip + : $(baseURL)/nano-2.2.6-x86-gcc4-2011-02-25.zip ; } else { InstallOptionalHaikuImagePackage - nano-2.2.5-x86-gcc2-2010-10-16.zip - : $(baseURL)/nano-2.2.5-x86-gcc2-2010-10-16.zip ; + nano-2.2.6-x86-gcc2-2011-02-25.zip + : $(baseURL)/nano-2.2.6-x86-gcc2-2011-02-25.zip ; } } } @@ -1340,12 +1386,12 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - p7zip-9.04-x86-gcc4-2010-11-13.zip - : $(baseURL)/p7zip-9.04-x86-gcc4-2010-11-13.zip ; + p7zip-9.13-x86-gcc4-2011-02-25.zip + : $(baseURL)/p7zip-9.13-x86-gcc4-2011-02-25.zip ; } else { InstallOptionalHaikuImagePackage - p7zip-9.04-x86-gcc2-2010-09-01.zip - : $(baseURL)/p7zip-9.04-x86-gcc2-2010-09-01.zip + p7zip-9.13-x86-gcc2-2011-02-25.zip + : $(baseURL)/p7zip-9.13-x86-gcc2-2011-02-25.zip : ; } @@ -1388,17 +1434,16 @@ Echo "No optional package PCRE available for $(TARGET_ARCH)" ; } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage pcre-7.9-x86-gcc4-2009-09-30.zip - : $(baseURL)/pcre-7.9-x86-gcc4-2009-09-30.zip + InstallOptionalHaikuImagePackage + libpcre-8.12-x86-gcc4-2011-02-25.zip + : $(baseURL)/libpcre-8.12-x86-gcc4-2011-02-25.zip ; } else { InstallOptionalHaikuImagePackage - libpcre-8.02-r1a2-x86-gcc2-2010-04-28-a.zip - : $(baseURL)/libpcre-8.02-r1a2-x86-gcc2-2010-04-28-a.zip + libpcre-8.12-x86-gcc2-2011-02-25.zip + : $(baseURL)/libpcre-8.12-x86-gcc2-2011-02-25.zip ; } - InstallSourceArchive libpcre-8.02_haiku-2010-04-29.tar.xz - : $(baseSourceURL)/2010/libpcre-8.02_haiku-2010-04-29.tar.xz ; } } @@ -1524,13 +1569,13 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - sqlite-3.7.3-x86-gcc4-2010-11-12.zip - : $(baseURL)/sqlite-3.7.3-x86-gcc4-2010-11-12.zip + sqlite-3.7.5-x86-gcc4-2011-02-25.zip + : $(baseURL)/sqlite-3.7.5-x86-gcc4-2011-02-25.zip : : true ; } else { InstallOptionalHaikuImagePackage - sqlite-3.7.3-x86-gcc2-2010-10-13.zip - : $(baseURL)/sqlite-3.7.3-x86-gcc2-2010-10-13.zip + sqlite-3.7.5-x86-gcc2-2011-02-25.zip + : $(baseURL)/sqlite-3.7.5-x86-gcc2-2011-02-25.zip : : true ; } } @@ -1582,16 +1627,16 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { InstallOptionalHaikuImagePackage - tar-1.22-x86-gcc4-2010-11-13.zip - : $(baseURL)/tar-1.22-x86-gcc4-2010-11-13.zip ; + tar-1.25-x86-gcc4-2011-02-07.zip + : $(baseURL)/tar-1.25-x86-gcc4-2011-02-07.zip ; } else { InstallOptionalHaikuImagePackage - tar-1.22-r1a2-x86-gcc2-2010-04-22-a.zip - : $(baseURL)/tar-1.22-r1a2-x86-gcc2-2010-04-22-a.zip ; + tar-1.25-x86-gcc2-2011-02-07.zip + : $(baseURL)/tar-1.25-x86-gcc2-2011-02-07.zip ; } - InstallSourceArchive tar-1.22_haiku-2010-04-29.tar.xz - : $(baseSourceURL)/2010/tar-1.22_haiku-2010-04-29.tar.xz ; + InstallSourceArchive tar-1.25_haiku-2011-02-07.tar.xz + : $(baseSourceURL)/2011/tar-1.25_haiku-2011-02-07.tar.xz ; } } @@ -1730,25 +1775,6 @@ } -# VLC media player -if [ IsOptionalHaikuImagePackageAdded VLC ] { - if $(TARGET_ARCH) != x86 { - Echo "No optional package VLC available for $(TARGET_ARCH)" ; - } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { - Echo "No optional package VLC available for gcc4" ; - } else { - InstallOptionalHaikuImagePackage VLC-0.8.6d.zip - : $(baseURL)/vlc-0.8.6d-gcc2-2009-04-18.zip - : apps - ; - AddSymlinkToHaikuImage home config be Applications - : "/boot/apps/vlc-0.8.6d/VLC media player" ; - AddSymlinkToHaikuImage common bin - : "/boot/apps/vlc-0.8.6d/VLC media player" : vlc ; - } -} - - # WebPositive if [ IsOptionalHaikuImagePackageAdded WebPositive ] { if $(TARGET_ARCH) != x86 { @@ -1757,8 +1783,8 @@ Echo "No optional package WebPositive available for gcc2" ; } else { InstallOptionalHaikuImagePackage - WebPositive-gcc4-x86-r547-2010-11-16.zip - : $(baseURL)/WebPositive-gcc4-x86-r547-2010-11-16.zip + WebPositive-gcc4-x86-r573-2011-01-07.zip + : $(baseURL)/WebPositive-gcc4-x86-r573-2011-01-07.zip : ; AddSymlinkToHaikuImage home config be Applications @@ -1846,6 +1872,14 @@ } +# WQY-MicroHei +if [ IsOptionalHaikuImagePackageAdded WQY-MicroHei ] { + InstallOptionalHaikuImagePackage + wqy-microhei-0.2.0-beta-x86-gcc2-2011-02-23.zip + : $(baseURL)/wqy-microhei-0.2.0-beta-x86-gcc2-2011-02-23.zip ; +} + + # XZ-Utils if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] { if $(TARGET_ARCH) != x86 { Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/ReleaseBuildProfiles =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/build/jam/ReleaseBuildProfiles 2011-05-09 22:47:06 UTC (rev 41409) +++ haiku/branches/developer/aldeck/tracker_layout/build/jam/ReleaseBuildProfiles 2011-05-09 23:08:35 UTC (rev 41410) @@ -16,9 +16,10 @@ HAIKU_ROOT_USER_REAL_NAME = "Yourself" ; AddGroupToHaikuImage party : 101 : user sshd ; HAIKU_IMAGE_HOST_NAME = shredder ; - HAIKU_IMAGE_SIZE = 690 ; + HAIKU_IMAGE_SIZE = 790 ; - AddOptionalHaikuImagePackages TimGMSoundFont TrackerNewTemplates ; + AddOptionalHaikuImagePackages TimGMSoundFont TrackerNewTemplates + WQY-MicroHei ; AddOptionalHaikuImagePackages BePDF Pe Vision WebPositive WonderBrush ; AddOptionalHaikuImagePackages CVS Development Git Mercurial Modified: haiku/branches/developer/aldeck/tracker_layout/build/jam/TestsRules =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/build/jam/TestsRules 2011-05-09 22:47:06 UTC (rev 41409) +++ haiku/branches/developer/aldeck/tracker_layout/build/jam/TestsRules 2011-05-09 23:08:35 UTC (rev 41410) @@ -23,7 +23,7 @@ Depends $(lib) : <tests!unittests>libbe_test.so ; } else { - ObjectDefines $(2) : TEST_R5 ; + ObjectDefines $(2) : TEST_HAIKU TEST_OBOS ; } UseCppUnitObjectHeaders $(sources) ; @@ -51,7 +51,7 @@ Depends $(target) : <tests!unittests>libbe_test.so ; } else { - ObjectDefines $(2) : TEST_R5 ; + ObjectDefines $(2) : TEST_HAIKU TEST_OBOS ; } UseCppUnitObjectHeaders $(sources) ; @@ -73,7 +73,7 @@ if $(TARGET_PLATFORM) = libbe_test { ObjectDefines $(2) : TEST_HAIKU TEST_OBOS ; } else { - ObjectDefines $(2) : TEST_R5 ; + ObjectDefines $(2) : TEST_HAIKU TEST_OBOS ; } UseCppUnitObjectHeaders $(sources) ; Modified: haiku/branches/developer/aldeck/tracker_layout/build/scripts/build_haiku_image =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/build/scripts/build_haiku_image 2011-05-09 22:47:06 UTC (rev 41409) +++ haiku/branches/developer/aldeck/tracker_layout/build/scripts/build_haiku_image 2011-05-09 23:08:35 UTC (rev 41410) @@ -72,6 +72,52 @@ mkdir=mkdir rm=rm elif [ $isImage ]; then + # If FIFOs are used for the communication with the FS shell, prepare them. + if $fsShellCommand --uses-fifos; then + fifoBasePath=/tmp/build_haiku_image-$$-fifo + toFSShellFifo=${fifoBasePath}-to-shell + fromFSShellFifo=${fifoBasePath}-from-shell + + rm -f $toFSShellFifo $fromFSShellFifo + mkfifo $toFSShellFifo $fromFSShellFifo + + # Open the FIFOs such that they are ready for the fsShellCommand. This + # also makes sure that they remain open until this script exits. When we + # exit while the FS shell is still running and waiting for commands, + # closing of our file descriptors will break the FIFOs and the FS shell + # will exit, too. + # Note: A bit of trickery is needed since opening one end blocks until + # someone opens the other end. + sleep 3<$fromFSShellFifo 1 & + exec 6>$fromFSShellFifo 3<$fromFSShellFifo + sleep 5<$toFSShellFifo 1 & + exec 4>$toFSShellFifo 5<$toFSShellFifo + + # Remove the FIFO files again -- we have the open FDs, so they can + # still be used and this makes sure they won't hang around any further. + rm -f $toFSShellFifo $fromFSShellFifo + + # Remap the fsShellCommand and bfsShell such that they don't inherit the + # wrong FDs. For both fsShellCommand and bfsShell FD 3 is the input from + # the respectively other program, FD 4 is the output to it. + actualFSShellCommand="$fsShellCommand" + actualBFSShell="$bfsShell" + + fsShellCommandWrapper() + { + $actualFSShellCommand 5>&- 6>&- "$@" + } + + bfsShellWrapper() + { + $actualBFSShell 3>&5 4<&6 "$@" + } + + fsShellCommand=fsShellCommandWrapper + bfsShell=bfsShellWrapper + fi + + # set up the other commands sPrefix=: tPrefix=/myfs/ cd="$fsShellCommand cd" @@ -227,8 +273,16 @@ "$imageLabel" "block_size 2048" $makebootable $imageOffsetFlags "$imagePath" fi + $bfsShell -n $imageOffsetFlags "$imagePath" > /dev/null & sleep 1 + + # Close FDs 5 and 6. Those represent the pipe ends that are used by the + # FS shell. Closing them in the shell process makes sure an unexpected death + # of the FS shell causes writing to/reading from the other ends to fail + # immediately. + exec 5>&- 6>&- + # bail out, if mounting fails $cd . fi Copied: haiku/branches/developer/aldeck/tracker_layout/data/artwork/icons/Device_USB_Floppy (from rev 40706, haiku/trunk/data/artwork/icons/Device_USB_Floppy) =================================================================== (Binary files differ) Modified: haiku/branches/developer/aldeck/tracker_layout/data/bin/installoptionalpackage =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/bin/installoptionalpackage 2011-05-09 22:47:06 UTC (rev 41409) +++ haiku/branches/developer/aldeck/tracker_layout/data/bin/installoptionalpackage 2011-05-09 23:08:35 UTC (rev 41410) @@ -385,7 +385,7 @@ # DownloadAllBuildFiles # Retreive the necessary jam files from svn. local buildFiles="OptionalPackages OptionalPackageDependencies \ - OptionalBuildFeatures" + OptionalBuildFeatures OptionalLibPackages" for file in ${buildFiles} ; do GetBuildFile ${file} done @@ -481,6 +481,7 @@ local regExp='/^if\ \[\ IsOptionalHaikuImagePackageAdded/p' sed -n -e "$regExp" ${baseDir}/OptionalPackages > ${file}.temp + sed -n -e "$regExp" ${baseDir}/OptionalLibPackages >> ${file}.temp while read line ; do # in each non-filtered line, the 4th word is the optional package local pkg=`echo ${line} | awk '{print $4}'` @@ -570,9 +571,10 @@ for package in ${packagesToInstall} ; do # output the "if [ IsOptionalHaikuImagePackageAdded..." code block - local regExp="if\ \[\ IsOptionalHaikuImagePackageAdded\ ${package}" - local inputFile="${baseDir}/OptionalPackages" - sed -n "/^$regExp/,/^\}/p" ${inputFile} >> ${tmpDir}/optpkg.jam + local regExp="if\ \[\ IsOptionalHaikuImagePackageAdded\ ${package}\ " + for inputFile in OptionalPackages OptionalLibPackages ; do + sed -n "/^$regExp/,/^\}/p" "${baseDir}/${inputFile}" >> ${tmpDir}/optpkg.jam + done done ConvertJamToBash "${tmpDir}/optpkg.jam" Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/be.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/bfs/be.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/be.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/be.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1,8 @@ +1 belarusian application/x-vnd.Haiku-BFSAddOn 1074880496 +1024 (Mostly small files) BFS_Initialize_Parameter 1024 (Пераважна для маленькіх файлаў) +2048 (Recommended) BFS_Initialize_Parameter 2048 (Рэкамендуецца) +8192 (Mostly large files) BFS_Initialize_Parameter 8192 (Пераважна для велькіх файлаў) +Blocksize: BFS_Initialize_Parameter Памер блоку: +Disabling query support may speed up certain file system operations, but should only be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled. BFS_Initialize_Parameter Вы можаце не актывізаваць падтрымку запытаў каб паскорыць некаторыя аперацыі файлавай сістэмы. Але майце на ўвазе, што вы не будзеце мець магчымасці карыстацца на гэтым падзеле пошукавымі запытами.\nТаксама, падзел абавязаны мець падтрымку запытаў актыўнаю, калі ён будзе з´яўляецца загрузачным. +Enable query support BFS_Initialize_Parameter Актывізаваць падтрымку запытаў +Name: BFS_Initialize_Parameter Імя: Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/cs.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/bfs/cs.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/cs.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/cs.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1,8 @@ +1 czech application/x-vnd.Haiku-BFSAddOn 1074880496 +1024 (Mostly small files) BFS_Initialize_Parameter 1024 (Hlavně malé soubory) +2048 (Recommended) BFS_Initialize_Parameter 2048 (Doporučeno) +8192 (Mostly large files) BFS_Initialize_Parameter 8192 (Hlavně velké soubory) +Blocksize: BFS_Initialize_Parameter Velikost bloku: +Disabling query support may speed up certain file system operations, but should only be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled. BFS_Initialize_Parameter Vypnutí podpory dotazování může zrychlit určité operace systému souborů, ale mělo by být použito pouze tehdy, je-li si člověk absolutně jist, že funkci dotazování nepotřebuje.\nKaždý oddíl určený k náběhu HAIKU musí mít podporu dotazování zapnutou. +Enable query support BFS_Initialize_Parameter Zapnout podporu dotazování +Name: BFS_Initialize_Parameter Jméno: Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/de.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/bfs/de.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/de.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/de.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1,8 @@ +1 german application/x-vnd.Haiku-BFSAddOn 1074880496 +1024 (Mostly small files) BFS_Initialize_Parameter 1024 (überwiegend kleine Dateien) +2048 (Recommended) BFS_Initialize_Parameter 2048 (empfohlen) +8192 (Mostly large files) BFS_Initialize_Parameter 8192 (überwiegend große Dateien) +Blocksize: BFS_Initialize_Parameter Blockgröße: +Disabling query support may speed up certain file system operations, but should only be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled. BFS_Initialize_Parameter Eine deaktivierte Query-Unterstützung kann gewisse Zugriffe im Dateisystem beschleunigen. Man muss sich dabei allerdings sicher sein, dass man auch zukünftig niemals Queries auf dieser Partition brauchen wird.\nUm Haiku von einer Partition booten zu können, wird die Query-Unterstützung unbedingt benötigt. +Enable query support BFS_Initialize_Parameter Query-Unterstützung aktivieren +Name: BFS_Initialize_Parameter Name: Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/fi.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/bfs/fi.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/fi.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/fi.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1,8 @@ +1 finnish application/x-vnd.Haiku-BFSAddOn 1074880496 +1024 (Mostly small files) BFS_Initialize_Parameter 1024 (Enimmäkseen pienet tiedostot) +2048 (Recommended) BFS_Initialize_Parameter 2048 (Suositeltu) +8192 (Mostly large files) BFS_Initialize_Parameter 8192 (Enimmäkseen laajat tiedostot) +Blocksize: BFS_Initialize_Parameter Lohkokoko: +Disabling query support may speed up certain file system operations, but should only be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled. BFS_Initialize_Parameter Kyselytuen ottaminen pois käytöstä nopeuttaa tiettyjä tiedostojärjestelmätoimia, mutta sitä pitäisi käyttää ainoastaan, jos ollaan ehdottoman varmoja, että kukaan ei tarvitse kyselyjä.\nKaikissa Haikun alkulataustaltioissa on oltava kysely käytössä. +Enable query support BFS_Initialize_Parameter Ota käyttöön kyselytuki +Name: BFS_Initialize_Parameter Nimi: Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/fr.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/bfs/fr.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/fr.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/fr.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1,8 @@ +1 french application/x-vnd.Haiku-BFSAddOn 1074880496 +1024 (Mostly small files) BFS_Initialize_Parameter 1024 (Surtout des petits fichiers) +2048 (Recommended) BFS_Initialize_Parameter 2048 (Recommandé) +8192 (Mostly large files) BFS_Initialize_Parameter 8192 (Surtout des gros fichiers) +Blocksize: BFS_Initialize_Parameter Taille de bloc : +Disabling query support may speed up certain file system operations, but should only be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled. BFS_Initialize_Parameter Désactiver le support des requête peut accélérer certaines opérations du système de fichiers, mais vous devez être certains de ne jamais avoir besoin des requêtes.\nTout volume destiné à amorcer Haiku doit avoir le support des requête activé. +Enable query support BFS_Initialize_Parameter Activer le support des requêtes +Name: BFS_Initialize_Parameter Nom : Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/ru.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/bfs/ru.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/ru.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/ru.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1,8 @@ +1 russian application/x-vnd.Haiku-BFSAddOn 1074880496 +1024 (Mostly small files) BFS_Initialize_Parameter 1024 (Подходит для маленьких файлов) +2048 (Recommended) BFS_Initialize_Parameter 2048 (Рекомендуемый) +8192 (Mostly large files) BFS_Initialize_Parameter 8192 (Подходит для больших файлов) +Blocksize: BFS_Initialize_Parameter Размер блока: +Disabling query support may speed up certain file system operations, but should only be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled. BFS_Initialize_Parameter Отключение поддержки запросов может ускорить определенные операции файловой системы, но ее следует отключать, только если вы уверены, что на этом разделе вам не понадобятся запросы.\nДля загрузочных разделов поддержка запросов обязательна. +Enable query support BFS_Initialize_Parameter Включить поддержку запросов +Name: BFS_Initialize_Parameter Имя: Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/sv.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/bfs/sv.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/sv.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/bfs/sv.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1,8 @@ +1 swedish application/x-vnd.Haiku-BFSAddOn 1074880496 +1024 (Mostly small files) BFS_Initialize_Parameter 1024 (Huvudsakligen små filer) +2048 (Recommended) BFS_Initialize_Parameter 2048 (Rekommenderat) +8192 (Mostly large files) BFS_Initialize_Parameter 8192 (Huvudsakligen stora filer) +Blocksize: BFS_Initialize_Parameter Blockstorlek: +Disabling query support may speed up certain file system operations, but should only be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled. BFS_Initialize_Parameter Att inaktivera sökfunktionaliteten kan öka hastigheten för vissa procedurer på filsystemet men bör endast inaktiveras om man är helt säker på att sökningar inte kommer att utnyttjas.\nEn volym måste ha sökfunktionaliteten aktiverad för att systemet ska kunna vara installeras på denna. +Enable query support BFS_Initialize_Parameter Aktivera sökstöd +Name: BFS_Initialize_Parameter Namn: Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/be.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/intel/be.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/be.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/be.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1,2 @@ +1 belarusian application/x-vnd.Haiku-IntelDiskAddOn 4191422532 +Active partition BFS_Creation_Parameter Актыўны падзел Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/cs.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/intel/cs.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/cs.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/cs.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1,2 @@ +1 czech application/x-vnd.Haiku-IntelDiskAddOn 4191422532 +Active partition BFS_Creation_Parameter Aktivní oddíl Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/de.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/intel/de.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/de.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/de.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1,2 @@ +1 german application/x-vnd.Haiku-IntelDiskAddOn 4191422532 +Active partition BFS_Creation_Parameter Aktive Partition Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/fi.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/intel/fi.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/fi.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/fi.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1,2 @@ +1 finnish application/x-vnd.Haiku-IntelDiskAddOn 4191422532 +Active partition BFS_Creation_Parameter Aktivoi osio Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/fr.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/intel/fr.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/fr.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/fr.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1,2 @@ +1 french application/x-vnd.Haiku-IntelDiskAddOn 4191422532 +Active partition BFS_Creation_Parameter Partition active Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/ru.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/intel/ru.catkeys) =================================================================== --- haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/ru.catkeys (rev 0) +++ haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/ru.catkeys 2011-05-09 23:08:35 UTC (rev 41410) @@ -0,0 +1 @@ +1 russian application/x-vnd.Haiku-IntelDiskAddOn 0 Copied: haiku/branches/developer/aldeck/tracker_layout/data/catalogs/add-ons/disk_systems/intel/sv.catkeys (from rev 40706, haiku/trunk/data/catalogs/add-ons/disk_systems/intel/sv.catkeys) =================================================================== [... truncated: 325751 lines follow ...]