ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-07 11:50:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: fix examples

Browse Source 
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 2013-08-14 15:24:01 +02:00 committed by Norman Feske
parent d47468c005
commit d39dfef98f
6 changed files with 93 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libports/run/qt5.run
View File

@ -12,7 +12,7 @@ build {
server/nitpicker server/nitpicker
server/liquid_framebuffer server/liquid_framebuffer
app/qt5/qt_launchpad app/qt5/qt_launchpad
app/qt5/examples/textedit app/qt5/examples/calculatorform
app/qt5/examples/tetrix app/qt5/examples/tetrix
} }
@ -117,7 +117,7 @@ set boot_modules {
qt5_ui_tools.lib.so qt5_ui_tools.lib.so
zlib.lib.so zlib.lib.so
stdcxx.lib.so stdcxx.lib.so
textedit calculatorform
tetrix tetrix
} }
@ -133,4 +133,3 @@ build_boot_image $boot_modules
append qemu_args " -m 512" append qemu_args " -m 512"
run_genode_until forever run_genode_until forever

63
libports/run/qt5_textedit.run
View File

@ -5,10 +5,8 @@
set build_components { set build_components {
core core
init init
drivers/atapi
drivers/framebuffer drivers/framebuffer
drivers/timer drivers/timer
server/ffat_fs
server/nitpicker server/nitpicker
server/liquid_framebuffer server/liquid_framebuffer
app/qt5/examples/textedit 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_sd_card_driver [expr [have_spec omap4] || [have_spec exynos5]]
set use_usb_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_sd_card_driver build_components drivers/sd_card
lappend_if $use_usb_driver build_components drivers/usb 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/pci
lappend_if [have_spec acpi] build_components drivers/acpi lappend_if [have_spec pci] build_components drivers/atapi
lappend_if [have_spec ps2] build_components drivers/input/ps2 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 build $build_components
create_boot_directory create_boot_directory
@ -69,7 +70,7 @@ append_if [have_spec pci] config {
<config ata="yes" /> <config ata="yes" />
</start>} </start>}
append_if [expr [have_spec pl180] || [have_spec omap4]] config { append_if $use_sd_card_driver config {
<start name="sd_card_drv"> <start name="sd_card_drv">
<resource name="RAM" quantum="1M" /> <resource name="RAM" quantum="1M" />
<provides><service name="Block"/></provides> <provides><service name="Block"/></provides>
@ -94,6 +95,27 @@ append_if [have_spec ps2] config {
<provides><service name="Input"/></provides> <provides><service name="Input"/></provides>
</start>} </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 { append config {
<start name="timer"> <start name="timer">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
@ -103,14 +125,6 @@ append config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides><service name="Nitpicker"/></provides> <provides><service name="Nitpicker"/></provides>
</start> </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"> <start name="textedit">
<resource name="RAM" quantum="70M"/> <resource name="RAM" quantum="70M"/>
<config xpos="3" ypos="0" width="500" height="710"/> <config xpos="3" ypos="0" width="500" height="710"/>
@ -136,7 +150,6 @@ set boot_modules {
timer timer
nitpicker nitpicker
liquid_fb liquid_fb
ffat_fs
textedit textedit
freetype.lib.so freetype.lib.so
icu.lib.so icu.lib.so
@ -159,13 +172,15 @@ set boot_modules {
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl lappend_if [have_spec linux] boot_modules fb_sdl
lappend_if [have_spec pci] boot_modules pci_drv lappend_if [have_spec linux] boot_modules ram_fs
lappend_if [have_spec pci] boot_modules atapi_drv lappend_if [expr ![have_spec linux]] boot_modules ffat_fs
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec framebuffer] boot_modules fb_drv lappend_if [have_spec pci] boot_modules atapi_drv
lappend_if $use_sd_card_driver boot_modules sd_card_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if $use_usb_driver boot_modules usb_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 build_boot_image $boot_modules

5
libports/src/app/qt5/qt_launchpad/main.cpp
View File

@ -29,9 +29,8 @@ int main(int argc, char *argv[])
Qt_launchpad *launchpad = new Qt_launchpad(Genode::env()->ram_session()->quota()); Qt_launchpad *launchpad = new Qt_launchpad(Genode::env()->ram_session()->quota());
launchpad->add_launcher("previewer", 25*1024*1024); launchpad->add_launcher("calculatorform", 30*1024*1024);
launchpad->add_launcher("textedit", 25*1024*1024); launchpad->add_launcher("tetrix", 40*1024*1024);
launchpad->add_launcher("tetrix", 40*1024*1024);
launchpad->move(300,100); launchpad->move(300,100);
launchpad->show(); launchpad->show();

4
qt4/run/qt4.run
View File

@ -10,7 +10,7 @@ build {
drivers/framebuffer drivers/framebuffer
drivers/timer drivers/timer
server/nitpicker server/nitpicker
app/examples/textedit app/examples/calculatorform
app/examples/tetrix app/examples/tetrix
app/qt_launchpad app/qt_launchpad
} }
@ -95,7 +95,7 @@ set boot_modules {
timer timer
nitpicker nitpicker
qt_launchpad qt_launchpad
textedit calculatorform
tetrix tetrix
dejavusans.lib.so dejavusans.lib.so
freetype.lib.so freetype.lib.so

72
qt4/run/textedit.run
View File

@ -2,21 +2,28 @@
# Build # Build
# #
build { set build_components {
core core
init init
drivers/input/ps2
drivers/pci
drivers/atapi
drivers/sd_card
drivers/framebuffer drivers/framebuffer
drivers/timer drivers/timer
drivers/usb
server/ffat_fs
server/nitpicker server/nitpicker
app/examples/textedit 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 create_boot_directory
# #
@ -62,7 +69,7 @@ append_if [have_spec pci] config {
<config ata="yes" /> <config ata="yes" />
</start>} </start>}
append_if [expr [have_spec pl180] || [have_spec omap4]] config { append_if $use_sd_card_driver config {
<start name="sd_card_drv"> <start name="sd_card_drv">
<resource name="RAM" quantum="1M" /> <resource name="RAM" quantum="1M" />
<provides><service name="Block"/></provides> <provides><service name="Block"/></provides>
@ -78,7 +85,7 @@ append_if [expr ![have_spec ps2] && [have_spec usb]] config {
<start name="usb_drv"> <start name="usb_drv">
<resource name="RAM" quantum="12M"/> <resource name="RAM" quantum="12M"/>
<provides><service name="Input"/></provides> <provides><service name="Input"/></provides>
<config uhci="yes" ehci="yes" xhci="yes"> <hid/> </config> <config> <hid/> </config>
</start>} </start>}
append_if [have_spec ps2] config { append_if [have_spec ps2] config {
@ -87,6 +94,27 @@ append_if [have_spec ps2] config {
<provides><service name="Input"/></provides> <provides><service name="Input"/></provides>
</start>} </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 { append config {
<start name="timer"> <start name="timer">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
@ -96,14 +124,6 @@ append config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides><service name="Nitpicker"/></provides> <provides><service name="Nitpicker"/></provides>
</start> </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"> <start name="textedit">
<resource name="RAM" quantum="40M"/> <resource name="RAM" quantum="40M"/>
<config xpos="3" ypos="0" width="500" height="710"/> <config xpos="3" ypos="0" width="500" height="710"/>
@ -128,7 +148,6 @@ set boot_modules {
init init
timer timer
nitpicker nitpicker
ffat_fs
textedit textedit
dejavusans.lib.so dejavusans.lib.so
freetype.lib.so freetype.lib.so
@ -142,18 +161,19 @@ set boot_modules {
qt_core.lib.so qt_core.lib.so
qt_gui.lib.so qt_gui.lib.so
zlib.lib.so zlib.lib.so
usb_drv
stdcxx.lib.so stdcxx.lib.so
} }
# platform-specific modules # platform-specific modules
lappend_if [have_spec linux] boot_modules fb_sdl lappend_if [have_spec linux] boot_modules fb_sdl
lappend_if [have_spec pci] boot_modules pci_drv lappend_if [have_spec linux] boot_modules ram_fs
lappend_if [have_spec pci] boot_modules atapi_drv lappend_if [expr ![have_spec linux]] boot_modules ffat_fs
lappend_if [have_spec ps2] boot_modules ps2_drv lappend_if [have_spec pci] boot_modules pci_drv
lappend_if [have_spec framebuffer] boot_modules fb_drv lappend_if [have_spec pci] boot_modules atapi_drv
lappend_if [have_spec omap4] boot_modules sd_card_drv lappend_if [have_spec ps2] boot_modules ps2_drv
lappend_if [have_spec omap4] boot_modules usb_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 build_boot_image $boot_modules

5
qt4/src/app/qt_launchpad/main.cpp
View File

@ -29,9 +29,8 @@ int main(int argc, char *argv[])
Qt_launchpad *launchpad = new Qt_launchpad(Genode::env()->ram_session()->quota()); Qt_launchpad *launchpad = new Qt_launchpad(Genode::env()->ram_session()->quota());
launchpad->add_launcher("previewer", 23*1024*1024); launchpad->add_launcher("calculatorform", 18*1024*1024);
launchpad->add_launcher("textedit", 18*1024*1024); launchpad->add_launcher("tetrix", 18*1024*1024);
launchpad->add_launcher("tetrix", 18*1024*1024);
launchpad->move(300,100); launchpad->move(300,100);
launchpad->show(); launchpad->show();