qt5: update run scripts

Fixes #1695
This commit is contained in:
Christian Prochaska 2015-09-17 12:50:42 +02:00 committed by Christian Helmuth
parent 08541b68f7
commit 7fff1770e0
13 changed files with 123 additions and 130 deletions

View File

@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
# Build
#
set build_components [qt5_build_components feature]
append build_components [qt5_build_components feature]
append build_components {
app/qt5/qt_launchpad
@ -28,7 +28,7 @@ create_qt5_fs_tar_archive "tetrix" "gui"
# Generate config
#
set config {
append config {
<config>
<parent-provides>}
append config [qt5_parent_provides feature]
@ -81,7 +81,7 @@ install_config $config
# Boot modules
#
set boot_modules [qt5_boot_modules feature]
append boot_modules [qt5_boot_modules feature]
append boot_modules {
qt_launchpad

View File

@ -6,7 +6,7 @@ set feature(Audio_out) 1
# Build
#
set build_components [qt5_build_components feature]
append build_components [qt5_build_components feature]
append build_components {
app/avplay
@ -37,7 +37,7 @@ create_qt5_fs_tar_archive "qt_avplay" "gui"
# Generate config
#
set config {
append config {
<config>
<parent-provides>}
append config [qt5_parent_provides feature]
@ -71,7 +71,7 @@ install_config $config
# Boot modules
#
set boot_modules [qt5_boot_modules feature]
append boot_modules [qt5_boot_modules feature]
append boot_modules {
qt_avplay

View File

@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
# Build
#
set build_components [qt5_build_components feature]
append build_components [qt5_build_components feature]
append build_components {
app/qt5/examples/calculatorform
@ -25,7 +25,7 @@ create_qt5_fs_tar_archive "calculatorform" "gui"
# Generate config
#
set config {
append config {
<config>
<parent-provides>}
append config [qt5_parent_provides feature]
@ -58,7 +58,7 @@ install_config $config
# Boot modules
#
set boot_modules [qt5_boot_modules feature]
append boot_modules [qt5_boot_modules feature]
append boot_modules {
calculatorform
@ -83,7 +83,7 @@ append boot_modules {
build_boot_image $boot_modules
append qemu_args " -m 128"
append qemu_args " -m 256"
run_genode_until forever

View File

@ -94,12 +94,57 @@ proc qt5_start_nodes { feature_arg } {
</route>
</start>
<start name="report_rom">
<resource name="RAM" quantum="4M"/>
<provides>
<service name="Report"/>
<service name="ROM"/>
</provides>
<config>
<rom>
<policy label="layouter -> window_list" report="wm -> window_list"/>
<policy label="decorator -> window_layout" report="layouter -> window_layout"/>
<policy label="wm -> resize_request" report="layouter -> resize_request"/>
<policy label="decorator -> pointer" report="wm -> pointer"/>
<policy label="layouter -> hover" report="decorator -> hover"/>
<policy label="wm -> focus" report="layouter -> focus"/>
</rom>
</config>
</start>
<start name="wm">
<resource name="RAM" quantum="16M"/>
<provides><service name="Nitpicker"/></provides>
<resource name="RAM" quantum="8M"/>
<provides>
<service name="Nitpicker"/>
</provides>
<config>
<policy label="decorator" role="decorator"/>
<policy label="layouter" role="layouter"/>
</config>
<route>
<service name="Nitpicker"> <child name="nitpicker"/> </service>
<any-service> <parent/> <any-child/> </any-service>
<any-service>
<child name="nitpicker"/> <child name="report_rom"/> <parent/> <any-child/>
</any-service>
</route>
</start>
<start name="layouter">
<binary name="floating_window_layouter"/>
<resource name="RAM" quantum="4M"/>
<route>
<any-service>
<child name="wm"/> <child name="report_rom"/> <parent/> <any-child/>
</any-service>
</route>
</start>
<start name="decorator">
<binary name="decorator"/>
<resource name="RAM" quantum="8M"/>
<route>
<any-service>
<child name="wm"/> <child name="report_rom"/> <parent/> <any-child/>
</any-service>
</route>
</start>
}

View File

@ -1,14 +1,18 @@
#
# Global variables required by platform_drv-related functions
#
set build_components { }
set config { }
set boot_modules { }
source ${genode_dir}/repos/base/run/platform_drv.inc
#
# Helper functions
#
proc use_acpi_drv { feature_arg } {
upvar $feature_arg feature
return [have_spec acpi]
}
proc use_audio_out_drv { feature_arg } {
proc use_audio_drv { feature_arg } {
upvar $feature_arg feature
return [info exists feature(Audio_out)]
}
@ -35,16 +39,6 @@ proc use_nic_drv { feature_arg } {
![use_usb_drv feature]}]
}
proc use_pci_device_pd { feature_arg } {
upvar $feature_arg feature
return [expr [use_pci_drv feature] && [have_spec nova]]
}
proc use_pci_drv { feature_arg } {
upvar $feature_arg feature
return [have_spec pci]
}
proc use_ps2_drv { feature_arg } {
upvar $feature_arg feature
return [have_spec ps2]
@ -72,16 +66,18 @@ proc drivers_build_components { feature_arg } {
set build_components { }
lappend_if [use_acpi_drv feature] build_components drivers/acpi
lappend_if [use_audio_out_drv feature] build_components drivers/audio_out
lappend_if [use_fb_drv feature] build_components drivers/framebuffer
lappend_if [use_fb_sdl feature] build_components drivers/framebuffer
lappend_if [use_gpio_drv feature] build_components drivers/gpio
lappend_if [use_nic_drv feature] build_components drivers/nic
lappend_if [use_pci_drv feature] build_components drivers/pci
lappend_if [use_ps2_drv feature] build_components drivers/input/spec/ps2
lappend_if [use_timer feature] build_components drivers/timer
lappend_if [use_usb_drv feature] build_components drivers/usb
# This function appends to the global 'build_components' variable, not to
# the local version defined above.
append_platform_drv_build_components
lappend_if [use_audio_drv feature] build_components drivers/audio
lappend_if [use_fb_drv feature] build_components drivers/framebuffer
lappend_if [use_fb_sdl feature] build_components drivers/framebuffer
lappend_if [use_gpio_drv feature] build_components drivers/gpio
lappend_if [use_nic_drv feature] build_components drivers/nic
lappend_if [use_ps2_drv feature] build_components drivers/input/spec/ps2
lappend_if [use_timer feature] build_components drivers/timer
lappend_if [use_usb_drv feature] build_components drivers/usb
return $build_components
}
@ -121,41 +117,11 @@ proc drivers_start_nodes { feature_arg } {
set start_nodes { }
append_if [use_acpi_drv feature] start_nodes {
<start name="acpi">
<resource name="RAM" quantum="10M" constrain_phys="yes"/>
<binary name="acpi_drv"/>
<provides>
<service name="PCI"/>
<service name="IRQ" />
</provides>
<binary name="acpi_drv"/>
<provides>
<service name="PCI"/>
<service name="IRQ" />
</provides>
<config>
<policy label="acpi_drv">
<pci class="ALL"/>
</policy>
<policy label="ahci">
<pci class="AHCI"/>
</policy>
<policy label="ps2_drv">
<device name="PS2" />
</policy>
<policy label="fb_drv">
<pci class="VGA" />
</policy>
</config>
<route>
<service name="PCI"> <any-child /> </service>
<any-service> <parent/> <any-child /> </any-service>
</route>
</start>
}
# This function appends to the global 'config' variable, not to the
# 'start_nodes' variable defined above.
append_platform_drv_config
append_if [use_audio_out_drv feature] start_nodes {
append_if [use_audio_drv feature] start_nodes {
<start name="audio_drv">
<resource name="RAM" quantum="4M"/>
<provides><service name="Audio_out"/></provides>
@ -194,24 +160,6 @@ proc drivers_start_nodes { feature_arg } {
</start>
}
append_if [expr [use_pci_drv feature] && ![use_acpi_drv feature]] start_nodes {
<start name="pci_drv">
<resource name="RAM" quantum="2M" constrain_phys="yes"/>
<provides><service name="PCI"/></provides>
<config>
<policy label="ahci">
<pci class="AHCI"/>
</policy>
<policy label="ps2_drv">
<device name="PS2" />
</policy>
<policy label="fb_drv">
<pci class="VGA" />
</policy>
</config>
</start>
}
append_if [use_ps2_drv feature] start_nodes {
<start name="ps2_drv">
<resource name="RAM" quantum="1M"/>
@ -261,17 +209,18 @@ proc drivers_boot_modules { feature_arg } {
set boot_modules { }
lappend_if [use_acpi_drv feature] boot_modules acpi_drv
lappend_if [use_audio_out_drv feature] boot_modules audio_out_drv
lappend_if [use_fb_drv feature] boot_modules fb_drv
lappend_if [use_fb_sdl feature] boot_modules fb_sdl
lappend_if [use_gpio_drv feature] boot_modules gpio_drv
lappend_if [use_nic_drv feature] boot_modules nic_drv
lappend_if [use_pci_drv feature] boot_modules pci_drv
lappend_if [use_pci_device_pd feature] boot_modules pci_device_pd
lappend_if [use_ps2_drv feature] boot_modules ps2_drv
lappend_if [use_timer feature] boot_modules timer
lappend_if [use_usb_drv feature] boot_modules usb_drv
# This function appends to the global 'boot_modules' variable, not to the
# local version defined above.
append_platform_drv_boot_modules
lappend_if [use_audio_drv feature] boot_modules audio_drv
lappend_if [use_fb_drv feature] boot_modules fb_drv
lappend_if [use_fb_sdl feature] boot_modules fb_sdl
lappend_if [use_gpio_drv feature] boot_modules gpio_drv
lappend_if [use_nic_drv feature] boot_modules nic_drv
lappend_if [use_ps2_drv feature] boot_modules ps2_drv
lappend_if [use_timer feature] boot_modules timer
lappend_if [use_usb_drv feature] boot_modules usb_drv
return $boot_modules
}

View File

@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
# Build
#
set build_components [qt5_build_components feature]
append build_components [qt5_build_components feature]
append build_components {
app/qt5/examples/openglwindow
@ -24,7 +24,7 @@ create_qt5_fs_tar_archive "openglwindow" "gui"
# Generate config
#
set config {
append config {
<config>
<parent-provides>}
append config [qt5_parent_provides feature]
@ -57,7 +57,7 @@ install_config $config
# Boot modules
#
set boot_modules [qt5_boot_modules feature]
append boot_modules [qt5_boot_modules feature]
append boot_modules {
openglwindow

View File

@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
# Build
#
set build_components [qt5_build_components feature]
append build_components [qt5_build_components feature]
append build_components {
app/qt5/examples/previewer
@ -24,7 +24,7 @@ create_qt5_fs_tar_archive "previewer" "gui"
# Generate config
#
set config {
append config {
<config>
<parent-provides>}
append config [qt5_parent_provides feature]
@ -57,7 +57,7 @@ install_config $config
# Boot modules
#
set boot_modules [qt5_boot_modules feature]
append boot_modules [qt5_boot_modules feature]
append boot_modules {
previewer

View File

@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
# Build
#
set build_components [qt5_build_components feature]
append build_components [qt5_build_components feature]
append build_components {
server/loader
@ -27,7 +27,7 @@ create_qt5_fs_tar_archive "test-qpluginwidget" "gui"
# Generate config
#
set config {
append config {
<config>
<parent-provides>}
append config [qt5_parent_provides feature]
@ -66,7 +66,7 @@ install_config $config
exec sh -c "ln -sf ../test/qt5/qpluginwidget/test-plugin.tar bin/"
set boot_modules [qt5_boot_modules feature]
append boot_modules [qt5_boot_modules feature]
append boot_modules {
loader
@ -100,7 +100,7 @@ append boot_modules {
build_boot_image $boot_modules
append qemu_args " -m 128"
append qemu_args " -m 256"
run_genode_until forever

View File

@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
# Build
#
set build_components [qt5_build_components feature]
append build_components [qt5_build_components feature]
append build_components {
app/qt5/qt_quicktest
@ -25,7 +25,7 @@ create_qt5_fs_tar_archive "qt_quicktest" "gui quick"
# Generate config
#
set config {
append config {
<config>
<parent-provides>}
append config [qt5_parent_provides feature]
@ -61,7 +61,7 @@ install_config $config
# The QtQuick plugin currently needs to be provided both in the file system
# (for Qt) and as ROM module (for 'dlopen()').
set boot_modules [qt5_boot_modules feature]
append boot_modules [qt5_boot_modules feature]
append boot_modules {
qt_quicktest

View File

@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
# Build
#
set build_components [qt5_build_components feature]
append build_components [qt5_build_components feature]
append build_components {
app/qt5/examples/samegame
@ -25,7 +25,7 @@ create_qt5_fs_tar_archive "samegame" "gui quick"
# Generate config
#
set config {
append config {
<config>
<parent-provides>}
append config [qt5_parent_provides feature]
@ -61,7 +61,7 @@ install_config $config
# The QtQuick plugin currently needs to be provided both in the file system
# (for Qt) and as ROM module (for 'dlopen()').
set boot_modules [qt5_boot_modules feature]
append boot_modules [qt5_boot_modules feature]
append boot_modules {
samegame

View File

@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
# Build
#
set build_components [qt5_build_components feature]
append build_components [qt5_build_components feature]
append build_components {
app/qt5/examples/tetrix
@ -24,7 +24,7 @@ create_qt5_fs_tar_archive "tetrix" "gui"
# Generate config
#
set config {
append config {
<config>
<parent-provides>}
append config [qt5_parent_provides feature]
@ -57,7 +57,7 @@ install_config $config
# Boot modules
#
set boot_modules [qt5_boot_modules feature]
append boot_modules [qt5_boot_modules feature]
append boot_modules {
tetrix
@ -84,7 +84,7 @@ append boot_modules {
build_boot_image $boot_modules
append qemu_args " -m 128"
append qemu_args " -m 256"
run_genode_until forever

View File

@ -9,7 +9,7 @@ if {[have_spec hw_odroid_xu]} {
exit 0
}
set build_components [qt5_build_components feature]
append build_components [qt5_build_components feature]
append build_components {
app/qt5/examples/textedit
@ -50,8 +50,7 @@ append config {
append config [qt5_start_nodes feature]
append_if $use_ahci_driver config {
<start name="ahci">
<binary name="ahci_drv" />
<start name="ahci_drv">
<resource name="RAM" quantum="5M"/>
<provides> <service name="Block"/> </provides>
<config>
@ -121,7 +120,7 @@ install_config $config
# Boot modules
#
set boot_modules [qt5_boot_modules feature]
append boot_modules [qt5_boot_modules feature]
append boot_modules {
textedit

View File

@ -6,7 +6,7 @@ set feature(Nic) 1
# Build
#
set build_components [qt5_build_components feature]
append build_components [qt5_build_components feature]
append build_components {
server/loader server/tar_rom server/nit_fb app/launchpad test/nitpicker
@ -32,7 +32,7 @@ exec tar cf bin/nitpicker_plugin.tar -C [genode_dir]/repos/ports/src/app/arora/d
# Generate config
#
set config {
append config {
<config>
<parent-provides>}
append config [qt5_parent_provides feature]
@ -68,7 +68,7 @@ install_config $config
# Boot modules
#
set boot_modules [qt5_boot_modules feature]
append boot_modules [qt5_boot_modules feature]
append boot_modules {
loader