mirror of
https://github.com/genodelabs/genode.git
synced 2025-01-31 08:25:38 +00:00
Qt: fix examples
With this patch, the 'textedit' example can run on base-linux again and 'qt_lauchpad' contains only runnable launch entries. Fixes #837.
This commit is contained in:
Christian Prochaska
Norman Feske
parent
d47468c005
commit
d39dfef98f
@ -12,7 +12,7 @@ build {
|
||||
server/nitpicker
|
||||
server/liquid_framebuffer
|
||||
app/qt5/qt_launchpad
|
||||
app/qt5/examples/textedit
|
||||
app/qt5/examples/calculatorform
|
||||
app/qt5/examples/tetrix
|
||||
}
|
||||
|
||||
@ -117,7 +117,7 @@ set boot_modules {
|
||||
qt5_ui_tools.lib.so
|
||||
zlib.lib.so
|
||||
stdcxx.lib.so
|
||||
textedit
|
||||
calculatorform
|
||||
tetrix
|
||||
}
|
||||
|
||||
@ -133,4 +133,3 @@ build_boot_image $boot_modules
|
||||
append qemu_args " -m 512"
|
||||
|
||||
run_genode_until forever
|
||||
|
||||
|
||||
@ -5,10 +5,8 @@
|
||||
set build_components {
|
||||
core
|
||||
init
|
||||
drivers/atapi
|
||||
drivers/framebuffer
|
||||
drivers/timer
|
||||
server/ffat_fs
|
||||
server/nitpicker
|
||||
server/liquid_framebuffer
|
||||
app/qt5/examples/textedit
|
||||
@ -17,11 +15,14 @@ set build_components {
|
||||
set use_sd_card_driver [expr [have_spec omap4] || [have_spec exynos5]]
|
||||
set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5]]
|
||||
|
||||
lappend_if $use_sd_card_driver build_components drivers/sd_card
|
||||
lappend_if $use_usb_driver build_components drivers/usb
|
||||
lappend_if [have_spec pci] build_components drivers/pci
|
||||
lappend_if [have_spec acpi] build_components drivers/acpi
|
||||
lappend_if [have_spec ps2] build_components drivers/input/ps2
|
||||
lappend_if $use_sd_card_driver build_components drivers/sd_card
|
||||
lappend_if $use_usb_driver build_components drivers/usb
|
||||
lappend_if [have_spec pci] build_components drivers/pci
|
||||
lappend_if [have_spec pci] build_components drivers/atapi
|
||||
lappend_if [have_spec acpi] build_components drivers/acpi
|
||||
lappend_if [have_spec ps2] build_components drivers/input/ps2
|
||||
lappend_if [have_spec linux] build_components server/ram_fs
|
||||
lappend_if [expr ![have_spec linux]] build_components server/ffat_fs
|
||||
|
||||
build $build_components
|
||||
create_boot_directory
|
||||
@ -69,7 +70,7 @@ append_if [have_spec pci] config {
|
||||
<config ata="yes" />
|
||||
</start>}
|
||||
|
||||
append_if [expr [have_spec pl180] || [have_spec omap4]] config {
|
||||
append_if $use_sd_card_driver config {
|
||||
<start name="sd_card_drv">
|
||||
<resource name="RAM" quantum="1M" />
|
||||
<provides><service name="Block"/></provides>
|
||||
@ -94,6 +95,27 @@ append_if [have_spec ps2] config {
|
||||
<provides><service name="Input"/></provides>
|
||||
</start>}
|
||||
|
||||
append_if [have_spec linux] config {
|
||||
<start name="ram_fs">
|
||||
<resource name="RAM" quantum="10M"/>
|
||||
<provides><service name="File_system"/></provides>
|
||||
<config>
|
||||
<!-- constrain sessions according to their labels -->
|
||||
<policy label="textedit" root="/" writeable="yes" />
|
||||
<policy label="textedit2" root="/" writeable="yes" />
|
||||
</config>
|
||||
</start>}
|
||||
|
||||
append_if [expr ![have_spec linux]] config {
|
||||
<start name="ffat_fs">
|
||||
<resource name="RAM" quantum="10M"/>
|
||||
<provides><service name="File_system"/></provides>
|
||||
<config>
|
||||
<!-- constrain sessions according to their labels -->
|
||||
<policy label="textedit" root="/" writeable="yes" />
|
||||
</config>
|
||||
</start>}
|
||||
|
||||
append config {
|
||||
<start name="timer">
|
||||
<resource name="RAM" quantum="1M"/>
|
||||
@ -103,14 +125,6 @@ append config {
|
||||
<resource name="RAM" quantum="1M"/>
|
||||
<provides><service name="Nitpicker"/></provides>
|
||||
</start>
|
||||
<start name="ffat_fs">
|
||||
<resource name="RAM" quantum="10M"/>
|
||||
<provides><service name="File_system"/></provides>
|
||||
<config>
|
||||
<!-- constrain sessions according to their labels -->
|
||||
<policy label="textedit" root="/" writeable="yes" />
|
||||
</config>
|
||||
</start>
|
||||
<start name="textedit">
|
||||
<resource name="RAM" quantum="70M"/>
|
||||
<config xpos="3" ypos="0" width="500" height="710"/>
|
||||
@ -136,7 +150,6 @@ set boot_modules {
|
||||
timer
|
||||
nitpicker
|
||||
liquid_fb
|
||||
ffat_fs
|
||||
textedit
|
||||
freetype.lib.so
|
||||
icu.lib.so
|
||||
@ -159,13 +172,15 @@ set boot_modules {
|
||||
}
|
||||
|
||||
# platform-specific modules
|
||||
lappend_if [have_spec linux] boot_modules fb_sdl
|
||||
lappend_if [have_spec pci] boot_modules pci_drv
|
||||
lappend_if [have_spec pci] boot_modules atapi_drv
|
||||
lappend_if [have_spec ps2] boot_modules ps2_drv
|
||||
lappend_if [have_spec framebuffer] boot_modules fb_drv
|
||||
lappend_if $use_sd_card_driver boot_modules sd_card_drv
|
||||
lappend_if $use_usb_driver boot_modules usb_drv
|
||||
lappend_if [have_spec linux] boot_modules fb_sdl
|
||||
lappend_if [have_spec linux] boot_modules ram_fs
|
||||
lappend_if [expr ![have_spec linux]] boot_modules ffat_fs
|
||||
lappend_if [have_spec pci] boot_modules pci_drv
|
||||
lappend_if [have_spec pci] boot_modules atapi_drv
|
||||
lappend_if [have_spec ps2] boot_modules ps2_drv
|
||||
lappend_if [have_spec framebuffer] boot_modules fb_drv
|
||||
lappend_if $use_sd_card_driver boot_modules sd_card_drv
|
||||
lappend_if $use_usb_driver boot_modules usb_drv
|
||||
|
||||
build_boot_image $boot_modules
|
||||
|
||||
|
||||
@ -29,9 +29,8 @@ int main(int argc, char *argv[])
|
||||
|
||||
Qt_launchpad *launchpad = new Qt_launchpad(Genode::env()->ram_session()->quota());
|
||||
|
||||
launchpad->add_launcher("previewer", 25*1024*1024);
|
||||
launchpad->add_launcher("textedit", 25*1024*1024);
|
||||
launchpad->add_launcher("tetrix", 40*1024*1024);
|
||||
launchpad->add_launcher("calculatorform", 30*1024*1024);
|
||||
launchpad->add_launcher("tetrix", 40*1024*1024);
|
||||
|
||||
launchpad->move(300,100);
|
||||
launchpad->show();
|
||||
|
||||
@ -10,7 +10,7 @@ build {
|
||||
drivers/framebuffer
|
||||
drivers/timer
|
||||
server/nitpicker
|
||||
app/examples/textedit
|
||||
app/examples/calculatorform
|
||||
app/examples/tetrix
|
||||
app/qt_launchpad
|
||||
}
|
||||
@ -95,7 +95,7 @@ set boot_modules {
|
||||
timer
|
||||
nitpicker
|
||||
qt_launchpad
|
||||
textedit
|
||||
calculatorform
|
||||
tetrix
|
||||
dejavusans.lib.so
|
||||
freetype.lib.so
|
||||
|
||||
@ -2,21 +2,28 @@
|
||||
# Build
|
||||
#
|
||||
|
||||
build {
|
||||
set build_components {
|
||||
core
|
||||
init
|
||||
drivers/input/ps2
|
||||
drivers/pci
|
||||
drivers/atapi
|
||||
drivers/sd_card
|
||||
drivers/framebuffer
|
||||
drivers/timer
|
||||
drivers/usb
|
||||
server/ffat_fs
|
||||
server/nitpicker
|
||||
app/examples/textedit
|
||||
}
|
||||
|
||||
set use_sd_card_driver [expr [have_spec omap4] || [have_spec exynos5]]
|
||||
set use_usb_driver [expr [have_spec omap4] || [have_spec exynos5]]
|
||||
|
||||
lappend_if $use_sd_card_driver build_components drivers/sd_card
|
||||
lappend_if $use_usb_driver build_components drivers/usb
|
||||
lappend_if [have_spec pci] build_components drivers/pci
|
||||
lappend_if [have_spec pci] build_components drivers/atapi
|
||||
lappend_if [have_spec acpi] build_components drivers/acpi
|
||||
lappend_if [have_spec ps2] build_components drivers/input/ps2
|
||||
lappend_if [have_spec linux] build_components server/ram_fs
|
||||
lappend_if [expr ![have_spec linux]] build_components server/ffat_fs
|
||||
|
||||
build $build_components
|
||||
create_boot_directory
|
||||
|
||||
#
|
||||
@ -62,7 +69,7 @@ append_if [have_spec pci] config {
|
||||
<config ata="yes" />
|
||||
</start>}
|
||||
|
||||
append_if [expr [have_spec pl180] || [have_spec omap4]] config {
|
||||
append_if $use_sd_card_driver config {
|
||||
<start name="sd_card_drv">
|
||||
<resource name="RAM" quantum="1M" />
|
||||
<provides><service name="Block"/></provides>
|
||||
@ -78,7 +85,7 @@ append_if [expr ![have_spec ps2] && [have_spec usb]] config {
|
||||
<start name="usb_drv">
|
||||
<resource name="RAM" quantum="12M"/>
|
||||
<provides><service name="Input"/></provides>
|
||||
<config uhci="yes" ehci="yes" xhci="yes"> <hid/> </config>
|
||||
<config> <hid/> </config>
|
||||
</start>}
|
||||
|
||||
append_if [have_spec ps2] config {
|
||||
@ -87,6 +94,27 @@ append_if [have_spec ps2] config {
|
||||
<provides><service name="Input"/></provides>
|
||||
</start>}
|
||||
|
||||
append_if [have_spec linux] config {
|
||||
<start name="ram_fs">
|
||||
<resource name="RAM" quantum="10M"/>
|
||||
<provides><service name="File_system"/></provides>
|
||||
<config>
|
||||
<!-- constrain sessions according to their labels -->
|
||||
<policy label="textedit" root="/" writeable="yes" />
|
||||
<policy label="textedit2" root="/" writeable="yes" />
|
||||
</config>
|
||||
</start>}
|
||||
|
||||
append_if [expr ![have_spec linux]] config {
|
||||
<start name="ffat_fs">
|
||||
<resource name="RAM" quantum="10M"/>
|
||||
<provides><service name="File_system"/></provides>
|
||||
<config>
|
||||
<!-- constrain sessions according to their labels -->
|
||||
<policy label="textedit" root="/" writeable="yes" />
|
||||
</config>
|
||||
</start>}
|
||||
|
||||
append config {
|
||||
<start name="timer">
|
||||
<resource name="RAM" quantum="1M"/>
|
||||
@ -96,14 +124,6 @@ append config {
|
||||
<resource name="RAM" quantum="1M"/>
|
||||
<provides><service name="Nitpicker"/></provides>
|
||||
</start>
|
||||
<start name="ffat_fs">
|
||||
<resource name="RAM" quantum="10M"/>
|
||||
<provides><service name="File_system"/></provides>
|
||||
<config>
|
||||
<!-- constrain sessions according to their labels -->
|
||||
<policy label="textedit" root="/" writeable="yes" />
|
||||
</config>
|
||||
</start>
|
||||
<start name="textedit">
|
||||
<resource name="RAM" quantum="40M"/>
|
||||
<config xpos="3" ypos="0" width="500" height="710"/>
|
||||
@ -128,7 +148,6 @@ set boot_modules {
|
||||
init
|
||||
timer
|
||||
nitpicker
|
||||
ffat_fs
|
||||
textedit
|
||||
dejavusans.lib.so
|
||||
freetype.lib.so
|
||||
@ -142,18 +161,19 @@ set boot_modules {
|
||||
qt_core.lib.so
|
||||
qt_gui.lib.so
|
||||
zlib.lib.so
|
||||
usb_drv
|
||||
stdcxx.lib.so
|
||||
}
|
||||
|
||||
# platform-specific modules
|
||||
lappend_if [have_spec linux] boot_modules fb_sdl
|
||||
lappend_if [have_spec pci] boot_modules pci_drv
|
||||
lappend_if [have_spec pci] boot_modules atapi_drv
|
||||
lappend_if [have_spec ps2] boot_modules ps2_drv
|
||||
lappend_if [have_spec framebuffer] boot_modules fb_drv
|
||||
lappend_if [have_spec omap4] boot_modules sd_card_drv
|
||||
lappend_if [have_spec omap4] boot_modules usb_drv
|
||||
lappend_if [have_spec linux] boot_modules fb_sdl
|
||||
lappend_if [have_spec linux] boot_modules ram_fs
|
||||
lappend_if [expr ![have_spec linux]] boot_modules ffat_fs
|
||||
lappend_if [have_spec pci] boot_modules pci_drv
|
||||
lappend_if [have_spec pci] boot_modules atapi_drv
|
||||
lappend_if [have_spec ps2] boot_modules ps2_drv
|
||||
lappend_if [have_spec framebuffer] boot_modules fb_drv
|
||||
lappend_if $use_sd_card_driver boot_modules sd_card_drv
|
||||
lappend_if $use_usb_driver boot_modules usb_drv
|
||||
|
||||
build_boot_image $boot_modules
|
||||
|
||||
|
||||
@ -29,9 +29,8 @@ int main(int argc, char *argv[])
|
||||
|
||||
Qt_launchpad *launchpad = new Qt_launchpad(Genode::env()->ram_session()->quota());
|
||||
|
||||
launchpad->add_launcher("previewer", 23*1024*1024);
|
||||
launchpad->add_launcher("textedit", 18*1024*1024);
|
||||
launchpad->add_launcher("tetrix", 18*1024*1024);
|
||||
launchpad->add_launcher("calculatorform", 18*1024*1024);
|
||||
launchpad->add_launcher("tetrix", 18*1024*1024);
|
||||
|
||||
launchpad->move(300,100);
|
||||
launchpad->show();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user