Changeset d548fc0 in mainline


Ignore:
Timestamp:
2019-11-15T11:52:18Z (5 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
84876aa4, c6ac9a55
Parents:
b78300f
git-author:
Jiri Svoboda <jiri@…> (2019-11-14 22:44:04)
git-committer:
Jiri Svoboda <jiri@…> (2019-11-15 11:52:18)
Message:

Bring back helenos-bld-config and ammend XCW demo

Demonstrate use of helenos-bld-config and helenos-test

Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • meson/part/exports/config.mk.in

    rb78300f rd548fc0  
    11# Generated from config.mk.in using Meson. Do not modify.
    22# Do not forget to set HELENOS_EXPORT_ROOT when using the file.
     3HELENOS_OVERLAY_PATH="@HELENOS_OVERLAY_PATH@"
    34HELENOS_CROSS_PATH="@HELENOS_CROSS_PATH@"
    45HELENOS_ARCH="@HELENOS_ARCH@"

  • meson/part/exports/meson.build

    rb78300f rd548fc0  
    6262
    6363conf_data = configuration_data({
     64        'HELENOS_OVERLAY_PATH' : meson.source_root() / 'uspace/overlay',
    6465        'HELENOS_CROSS_PATH' : cc_path,
    6566        'HELENOS_ARCH' : cc_arch,

  • tools/xcw/bin/helenos-test

    rb78300f rd548fc0  
    11#!/bin/bash
    22#
    3 # Copyright (c) 2018 Jiri Svoboda
     3# Copyright (c) 2019 Jiri Svoboda
    44# All rights reserved.
    55#
    … …  
    3333
    3434XCW="$(dirname "$0")"
    35 SRC_ROOT="$XCW/../../.."
     35BUILD_ROOT="$(dirname "$(dirname "$(dirname "$XCW")")")"
    3636
    37 cd "$SRC_ROOT"
    38 make
     37cd "$BUILD_ROOT"
     38ninja image_path
    3939tools/ew.py

  • tools/xcw/demo/Makefile

    rb78300f rd548fc0  
    4848CC = helenos-cc
    4949LD = helenos-ld
     50INSTALL = install
     51TEST = helenos-test
    5052CFLAGS = -std=gnu11 -Wall `helenos-pkg-config --cflags libgui libdraw libmath` \
    5153    -D_HELENOS_SOURCE
    5254LIBS = `helenos-pkg-config --libs libgui libdraw libmath`
     55PREFIX = `helenos-bld-config --install-dir`
    5356output = viewer
    5457objects = viewer.o
    … …  
    6063        rm -f $(output) $(objects)
    6164
     65install: $(output)
     66        mkdir -p $(PREFIX)/app
     67        $(INSTALL) -T $(output) $(PREFIX)/app/$(output)-xcw
     68
     69uninstall:
     70        rm -f $(PREFIX)/app/$(output)-xcw
     71
     72test: install
     73        $(TEST)
     74
    6275$(output): $(objects)
    6376        $(CC) -o $@ $^ $(LIBS)
Note: See TracChangeset for help on using the changeset viewer.