Changes in / [32b4302:fa70134] in mainline


Ignore:
Files:
275 added
301 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r32b4302 rfa70134  
    1 /build
    2 /build_all
    3 /doxygen/html
    4 /doxygen/latex
    5 /tools/*.pyc
     1*.a
     2*.check.c
     3*.d
     4*.deflate
     5*.disasm
     6*.la
     7*.lo
     8*.map
     9*.o
     10*.prev
     11*.pyc
     12*.so.*
     13/Makefile.common
     14/Makefile.config
     15/PKG
     16/common.h
     17/config.h
     18/cscope.out
     19/downloads
     20/hdisk.img
     21/image.boot
     22/image.iso
     23/uImage.bin
     24autotool/
     25boot/arch/arm32/_link.ld
     26boot/arch/arm64/_link.ld
     27boot/arch/ia64/_link.ld
     28boot/arch/mips32/_link.ld
     29boot/arch/ppc32/_link.ld
     30boot/arch/sparc64/_link.ld
     31boot/components.h
     32boot/components.o.new
     33boot/components.s
     34boot/components.tar
     35boot/components.zip
     36boot/components_desc.c
     37boot/distroot/
     38boot/image.bin
     39boot/image.boot
     40boot/image.raw
     41boot/initrd.img
     42boot/initrd.img.gz
     43common.h.new
     44deps.mk
     45doxygen/doxygen.cfg
     46doxygen/doxygen.cfg.gen
     47doxygen/html/
     48doxygen/latex/
     49kernel/arch/abs32le/_link.ld
     50kernel/arch/amd64/_link.ld
     51kernel/arch/arm32/_link.ld
     52kernel/arch/arm64/_link.ld
     53kernel/arch/ia32/_link.ld
     54kernel/arch/ia64/_link.ld
     55kernel/arch/mips32/_link.ld
     56kernel/arch/ppc32/_link.ld
     57kernel/arch/sparc64/_link.ld
     58kernel/generic/src/debug/real_map.bin
     59kernel/kernel.bin
     60kernel/kernel.bin.gz
     61kernel/kernel.dump
     62kernel/kernel.elf
     63kernel/kernel.elf.gz
     64kernel/kernel.raw
     65tag
    666tags
     67tools/amd64-unknown-elf
     68tools/arm-linux-gnueabi
     69tools/binutils-*.tar.bz2
     70tools/downloads/
     71tools/gcc-*.tar.bz2
     72tools/gdb-*.tar.gz
     73tools/i686-pc-linux-gnu
     74tools/ia64-pc-linux-gnu
     75tools/mips-linux-gnu
     76tools/mips64el-linux-gnu
     77tools/mipsel-linux-gnu
     78tools/ppc-linux-gnu
     79tools/ppc64-linux-gnu
     80tools/riscv64-unknown-linux-gnu
     81tools/sparc64-linux-gnu
    782tools/sycek/
    883tools/xcw/demo/viewer
     84uspace/app/barber/barber
     85uspace/app/barber/images.c
     86uspace/app/barber/images.h
     87uspace/app/barber/images.s
     88uspace/app/barber/images.zip
     89uspace/app/barber/images_desc.c
     90uspace/app/bdsh/bdsh
     91uspace/app/bdsh/test-bdsh
     92uspace/app/bithenge/bithenge
     93uspace/app/blkdump/blkdump
     94uspace/app/contacts/contacts
     95uspace/app/corecfg/corecfg
     96uspace/app/cpptest/cpptest
     97uspace/app/date/date
     98uspace/app/devctl/devctl
     99uspace/app/df/df
     100uspace/app/dltest/dltest
     101uspace/app/dltests/dltests
     102uspace/app/dnscfg/dnscfg
     103uspace/app/dnsres/dnsres
     104uspace/app/download/download
     105uspace/app/edit/edit
     106uspace/app/fdisk/fdisk
     107uspace/app/fontviewer/fontviewer
     108uspace/app/getterm/getterm
     109uspace/app/gunzip/gunzip
     110uspace/app/hbench/hbench
     111uspace/app/inet/inet
     112uspace/app/init/init
     113uspace/app/init/init.gz
     114uspace/app/lprint/lprint
     115uspace/app/kill/kill
     116uspace/app/killall/killall
     117uspace/app/kio/kio
     118uspace/app/loc/loc
     119uspace/app/logset/logset
     120uspace/app/mixerctl/mixerctl
     121uspace/app/mkbd/mkbd
     122uspace/app/mkexfat/mkexfat
     123uspace/app/mkext4/mkext4
     124uspace/app/mkfat/mkfat
     125uspace/app/mkmfs/mkmfs
     126uspace/app/modplay/modplay
     127uspace/app/netecho/netecho
     128uspace/app/netspeed/netspeed
     129uspace/app/nettest1/nettest1
     130uspace/app/nettest2/nettest2
     131uspace/app/nettest3/nettest3
     132uspace/app/nic/nic
     133uspace/app/nterm/nterm
     134uspace/app/pci/pci
     135uspace/app/ping/ping
     136uspace/app/ping6/ping6
     137uspace/app/pkg/pkg
     138uspace/app/redir/redir
     139uspace/app/sbi/sbi
     140uspace/app/sportdmp/sportdmp
     141uspace/app/stats/stats
     142uspace/app/sysinfo/sysinfo
     143uspace/app/sysinst/sysinst
     144uspace/app/taskdump/taskdump
     145uspace/app/tester/tester
     146uspace/app/testread/testread
     147uspace/app/testrunner/testrunner
     148uspace/app/testwrit/testwrit
     149uspace/app/tetris/tetris
     150uspace/app/tmon/tmon
     151uspace/app/top/top
     152uspace/app/trace/trace
     153uspace/app/untar/untar
     154uspace/app/usbinfo/usbinfo
     155uspace/app/vcalc/vcalc
     156uspace/app/vdemo/vdemo
     157uspace/app/viewer/viewer
     158uspace/app/vlaunch/images.c
     159uspace/app/vlaunch/images.h
     160uspace/app/vlaunch/images.s
     161uspace/app/vlaunch/images.zip
     162uspace/app/vlaunch/images_desc.c
     163uspace/app/vlaunch/vlaunch
     164uspace/app/vol/vol
     165uspace/app/vterm/vterm
     166uspace/app/vuhid/vuh
     167uspace/app/vuhid/vuhid
     168uspace/app/wavplay/wavplay
     169uspace/app/websrv/websrv
     170uspace/app/wifi_supplicant/wifi_supplicant
     171uspace/dist/app/
     172uspace/dist/app/barber
     173uspace/dist/app/bdsh
     174uspace/dist/app/bithenge
     175uspace/dist/app/blkdump
     176uspace/dist/app/corecfg
     177uspace/dist/app/cpptest
     178uspace/dist/app/date
     179uspace/dist/app/devctl
     180uspace/dist/app/df
     181uspace/dist/app/dltest
     182uspace/dist/app/dltests
     183uspace/dist/app/dnscfg
     184uspace/dist/app/dnsres
     185uspace/dist/app/download
     186uspace/dist/app/edit
     187uspace/dist/app/fdisk
     188uspace/dist/app/fontviewer
     189uspace/dist/app/getterm
     190uspace/dist/app/gunzip
     191uspace/dist/app/inet
     192uspace/dist/app/kill
     193uspace/dist/app/killall
     194uspace/dist/app/kio
     195uspace/dist/app/loc
     196uspace/dist/app/logset
     197uspace/dist/app/mixerctl
     198uspace/dist/app/mkbd
     199uspace/dist/app/mkexfat
     200uspace/dist/app/mkfat
     201uspace/dist/app/mkmfs
     202uspace/dist/app/modplay
     203uspace/dist/app/netecho
     204uspace/dist/app/netspeed
     205uspace/dist/app/nettest1
     206uspace/dist/app/nettest2
     207uspace/dist/app/nettest3
     208uspace/dist/app/nic
     209uspace/dist/app/nterm
     210uspace/dist/app/ping
     211uspace/dist/app/ping6
     212uspace/dist/app/pkg
     213uspace/dist/app/redir
     214uspace/dist/app/sbi
     215uspace/dist/app/sportdmp
     216uspace/dist/app/stats
     217uspace/dist/app/sysinfo
     218uspace/dist/app/sysinst
     219uspace/dist/app/taskdump
     220uspace/dist/app/tester
     221uspace/dist/app/testread
     222uspace/dist/app/testwrit
     223uspace/dist/app/tetris
     224uspace/dist/app/tmon
     225uspace/dist/app/top
     226uspace/dist/app/trace
     227uspace/dist/app/untar
     228uspace/dist/app/usbinfo
     229uspace/dist/app/vcalc
     230uspace/dist/app/vdemo
     231uspace/dist/app/viewer
     232uspace/dist/app/vlaunch
     233uspace/dist/app/vterm
     234uspace/dist/app/vuh
     235uspace/dist/app/wavplay
     236uspace/dist/app/websrv
     237uspace/dist/app/wifi_supplicant
     238uspace/dist/demo.txt
     239uspace/dist/demo.wav
     240uspace/dist/demo.xm
     241uspace/dist/drv/
     242uspace/dist/drv/ahci/
     243uspace/dist/drv/apic/
     244uspace/dist/drv/ar9271/
     245uspace/dist/drv/ata_bd/
     246uspace/dist/drv/atkbd/
     247uspace/dist/drv/cmos-rtc/
     248uspace/dist/drv/e1k/
     249uspace/dist/drv/ehci/
     250uspace/dist/drv/hdaudio/
     251uspace/dist/drv/i8042/
     252uspace/dist/drv/i8259/
     253uspace/dist/drv/icp-ic/
     254uspace/dist/drv/icp/
     255uspace/dist/drv/isa/
     256uspace/dist/drv/kfb/
     257uspace/dist/drv/msim-con/
     258uspace/dist/drv/ne2k/
     259uspace/dist/drv/ns8250/
     260uspace/dist/drv/ohci/
     261uspace/dist/drv/pc/
     262uspace/dist/drv/pciintel/
     263uspace/dist/drv/pl050/
     264uspace/dist/drv/ps2mouse/
     265uspace/dist/drv/root/
     266uspace/dist/drv/rootpc/
     267uspace/dist/drv/rtl8139/
     268uspace/dist/drv/rtl8169/
     269uspace/dist/drv/sb16/
     270uspace/dist/drv/ski-con/
     271uspace/dist/drv/sun4v-con/
     272uspace/dist/drv/test1/
     273uspace/dist/drv/test2/
     274uspace/dist/drv/test3/
     275uspace/dist/drv/uhci/
     276uspace/dist/drv/usbdiag/
     277uspace/dist/drv/usbflbk/
     278uspace/dist/drv/usbhid/
     279uspace/dist/drv/usbhub/
     280uspace/dist/drv/usbmast/
     281uspace/dist/drv/usbmid/
     282uspace/dist/drv/vhc/
     283uspace/dist/drv/virt/
     284uspace/dist/drv/xhci/
     285uspace/dist/drv/xtkbd/
     286uspace/dist/inc/
     287uspace/dist/inc/_link.ld
     288uspace/dist/inc/c/
     289uspace/dist/logo.tga
     290uspace/dist/srv/
     291uspace/dist/test/
     292uspace/drv/audio/hdaudio/hdaudio
     293uspace/drv/audio/sb16/sb16
     294uspace/drv/block/ahci/ahci
     295uspace/drv/block/ata_bd/ata_bd
     296uspace/drv/block/ddisk/ddisk
     297uspace/drv/block/usbmast/usbmast
     298uspace/drv/bus/adb/cuda_adb/cuda_adb
     299uspace/drv/bus/isa/isa
     300uspace/drv/bus/pci/pciintel/pciintel
     301uspace/drv/bus/usb/ehci/ehci
     302uspace/drv/bus/usb/ohci/ohci
     303uspace/drv/bus/usb/uhci/uhci
     304uspace/drv/bus/usb/usbdiag/usbdiag
     305uspace/drv/bus/usb/usbflbk/usbflbk
     306uspace/drv/bus/usb/usbhub/usbhub
     307uspace/drv/bus/usb/usbmid/usbmid
     308uspace/drv/bus/usb/vhc/vhc
     309uspace/drv/bus/usb/xhci/test-xhci
     310uspace/drv/bus/usb/xhci/xhci
     311uspace/drv/char/i8042/i8042
     312uspace/drv/char/msim-con/msim-con
     313uspace/drv/char/ns8250/ns8250
     314uspace/drv/char/pc-lpt/pc-lpt
     315uspace/drv/char/pl011/pl011
     316uspace/drv/char/pl050/pl050
     317uspace/drv/char/ps2mouse/ps2mouse
     318uspace/drv/char/ski-con/ski-con
     319uspace/drv/char/sun4v-con/sun4v-con
     320uspace/drv/fb/amdm37x_dispc/amdm37x_dispc
     321uspace/drv/fb/kfb/kfb
     322uspace/drv/hid/adb-kbd/adb-kbd
     323uspace/drv/hid/adb-mouse/adb-mouse
     324uspace/drv/hid/atkbd/atkbd
     325uspace/drv/hid/ps2mouse/ps2mouse
     326uspace/drv/hid/usbhid/usbhid
     327uspace/drv/hid/xtkbd/xtkbd
     328uspace/drv/intctl/apic/apic
     329uspace/drv/intctl/gicv2/gicv2
     330uspace/drv/intctl/i8259/i8259
     331uspace/drv/intctl/icp-ic/icp-ic
     332uspace/drv/intctl/obio/obio
     333uspace/drv/nic/ar9271/ar9271
     334uspace/drv/nic/e1k/e1k
     335uspace/drv/nic/ne2k/ne2k
     336uspace/drv/nic/rtl8139/rtl8139
     337uspace/drv/nic/rtl8169/rtl8169
     338uspace/drv/nic/virtio-net/virtio-net
     339uspace/drv/platform/amdm37x/amdm37x
     340uspace/drv/platform/arm64virt/arm64virt
     341uspace/drv/platform/icp/icp
     342uspace/drv/platform/mac/mac
     343uspace/drv/platform/malta/malta
     344uspace/drv/platform/msim/msim
     345uspace/drv/platform/pc/pc
     346uspace/drv/platform/rootpc/rootpc
     347uspace/drv/platform/ski/ski
     348uspace/drv/platform/sun4v/sun4v
     349uspace/drv/root/root/root
     350uspace/drv/root/virt/virt
     351uspace/drv/test/test1/test1
     352uspace/drv/test/test2/test2
     353uspace/drv/test/test3/test3
     354uspace/drv/time/cmos-rtc/cmos-rtc
     355uspace/export
     356uspace/lib/c/test-libc
     357uspace/lib/label/test-liblabel
     358uspace/lib/math/test-libmath
     359uspace/lib/pcut/test-libpcut-*
     360uspace/lib/posix/gcc.specs
     361uspace/lib/posix/link.ld
     362uspace/lib/posix/test-libposix
     363uspace/lib/sif/test-libsif
     364uspace/lib/uri/test-liburi
     365uspace/srv/audio/hound/hound
     366uspace/srv/bd/file_bd/file_bd
     367uspace/srv/bd/rd/rd
     368uspace/srv/bd/rd/rd.gz
     369uspace/srv/bd/sata_bd/sata_bd
     370uspace/srv/bd/vbd/vbd
     371uspace/srv/clipboard/clipboard
     372uspace/srv/devman/devman
     373uspace/srv/fs/cdfs/cdfs
     374uspace/srv/fs/exfat/exfat
     375uspace/srv/fs/ext4fs/ext4fs
     376uspace/srv/fs/ext4fs/ext4fs.gz
     377uspace/srv/fs/fat/fat
     378uspace/srv/fs/fat/fat.gz
     379uspace/srv/fs/locfs/locfs
     380uspace/srv/fs/mfs/mfs
     381uspace/srv/fs/tmpfs/tmpfs
     382uspace/srv/fs/udf/udf
     383uspace/srv/hid/compositor/compositor
     384uspace/srv/hid/compositor/images.c
     385uspace/srv/hid/compositor/images.h
     386uspace/srv/hid/console/console
     387uspace/srv/hid/input/input
     388uspace/srv/hid/isdv4_tablet/isdv4_tablet
     389uspace/srv/hid/output/output
     390uspace/srv/hid/remcons/remcons
     391uspace/srv/hid/rfb/rfb
     392uspace/srv/hid/s3c24xx_ts/s3c24xx_ts
     393uspace/srv/hw/bus/cuda_adb/cuda_adb
     394uspace/srv/hw/char/s3c24xx_uart/s3c24ser
     395uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart
     396uspace/srv/hw/irc/obio/obio
     397uspace/srv/klog/klog
     398uspace/srv/loader/loader
     399uspace/srv/loader/loader.gz
     400uspace/srv/locsrv/locsrv
     401uspace/srv/locsrv/locsrv.gz
     402uspace/srv/logger/logger
     403uspace/srv/logger/logger.gz
     404uspace/srv/net/dhcp/dhcp
     405uspace/srv/net/dnsrsrv/dnsrsrv
     406uspace/srv/net/ethip/ethip
     407uspace/srv/net/inetsrv/inetsrv
     408uspace/srv/net/loopip/loopip
     409uspace/srv/net/nconfsrv/nconfsrv
     410uspace/srv/net/slip/slip
     411uspace/srv/net/tcp/tcp
     412uspace/srv/net/tcp/test-tcp
     413uspace/srv/net/udp/udp
     414uspace/srv/ns/ns
     415uspace/srv/ns/ns.gz
     416uspace/srv/taskmon/taskmon
     417uspace/srv/test/chardev-test/chardev-test
     418uspace/srv/test/ipc-test/ipc-test
     419uspace/srv/vfs/vfs
     420uspace/srv/vfs/vfs.gz
     421uspace/srv/volsrv/test-volsrv
     422uspace/srv/volsrv/volsrv
     423uspace/drv/block/virtio-blk/virtio-blk

  • .travis.yml

    r32b4302 rfa70134  
    6161  - sudo apt-get update -qq
    6262  - sudo apt-get install -qq genisoimage
    63   - sudo apt-get install -qq python3-pip
    64   - sudo apt-get install -qq python3-setuptools
    65   - pip3 install ninja
    66   - pip3 install meson
    6763  - ./tools/travis.sh install
    6864script:

  • Makefile

    r32b4302 rfa70134  
    2727#
    2828
     29# Just for this Makefile. Sub-makes will run in parallel if requested.
     30.NOTPARALLEL:
     31
     32CCHECK = tools/sycek/ccheck
    2933CSCOPE = cscope
    3034FORMAT = clang-format
     35CHECK = tools/check.sh
     36CONFIG = tools/config.py
     37AUTOTOOL = tools/autotool.py
     38SANDBOX = autotool
    3139
     40CONFIG_RULES = HelenOS.config
     41
     42COMMON_MAKEFILE = Makefile.common
     43COMMON_HEADER = common.h
     44
     45CONFIG_MAKEFILE = Makefile.config
     46CONFIG_HEADER = config.h
    3247ERRNO_HEADER = abi/include/abi/errno.h
    3348ERRNO_INPUT = abi/include/abi/errno.in
    3449
    35 .PHONY: nothing cscope cscope_parts format ccheck ccheck-fix space check_errno
     50.PHONY: all precheck cscope cscope_parts autotool config_auto config_default config distclean clean check releasefile release common boot kernel uspace export-posix space
    3651
    37 nothing:
     52all: kernel uspace export-cross test-xcw
     53        $(MAKE) -r -C boot PRECHECK=$(PRECHECK)
     54
     55common: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER)
     56
     57kernel: common
     58        $(MAKE) -r -C kernel PRECHECK=$(PRECHECK)
     59
     60uspace: common
     61        $(MAKE) -r -C uspace PRECHECK=$(PRECHECK)
     62
     63test-xcw: uspace export-cross
     64        export PATH=$$PATH:$(abspath tools/xcw/bin) && $(MAKE) -r -C tools/xcw/demo
     65
     66export-posix: common
     67ifndef EXPORT_DIR
     68        @echo ERROR: Variable EXPORT_DIR is not defined. && false
     69else
     70        $(MAKE) -r -C uspace export EXPORT_DIR=$(abspath $(EXPORT_DIR))
     71endif
     72
     73export-cross: common
     74        $(MAKE) -r -C uspace export EXPORT_DIR=$(abspath uspace/export)
     75
     76precheck: clean
     77        $(MAKE) -r all PRECHECK=y
    3878
    3979cscope:
    … …  
    4989        find abi kernel boot uspace -type f -regex '^.*\.[ch]$$' | xargs $(FORMAT) -i -sort-includes -style=file
    5090
    51 ccheck:
     91ccheck: $(CCHECK)
    5292        cd tools && ./build-ccheck.sh
    5393        tools/ccheck.sh
    5494
    55 ccheck-fix:
     95ccheck-fix: $(CCHECK)
    5696        cd tools && ./build-ccheck.sh
    5797        tools/ccheck.sh --fix
    5898
     99$(CCHECK):
     100        cd tools && ./build-ccheck.sh
     101
    59102space:
    60103        tools/srepl '[ \t]\+$$' ''
     104
     105doxy:
     106        $(MAKE) -r -C doxygen
     107
     108# Pre-integration build check
     109check: ccheck $(CHECK)
     110ifdef JOBS
     111        $(CHECK) -j $(JOBS)
     112else
     113        $(CHECK) -j $(shell nproc)
     114endif
    61115
    62116# `sed` pulls a list of "compatibility-only" error codes from `errno.in`,
    … …  
    67121        git grep -n -f - -- ':(exclude)abi' ':(exclude)uspace/lib/posix'
    68122
     123# Autotool (detects compiler features)
     124
     125autotool $(COMMON_MAKEFILE) $(COMMON_HEADER): $(CONFIG_MAKEFILE) $(AUTOTOOL)
     126        $(AUTOTOOL)
     127        diff -q $(COMMON_HEADER).new $(COMMON_HEADER) 2> /dev/null; if [ $$? -ne 0 ]; then mv -f $(COMMON_HEADER).new $(COMMON_HEADER); fi
     128
     129# Build-time configuration
     130
     131config_default $(CONFIG_MAKEFILE) $(CONFIG_HEADER): $(CONFIG_RULES)
     132ifeq ($(HANDS_OFF),y)
     133        $(CONFIG) $< hands-off $(PROFILE)
     134else
     135        $(CONFIG) $< default $(PROFILE)
     136endif
     137
     138config: $(CONFIG_RULES)
     139        $(CONFIG) $<
     140
     141random-config: $(CONFIG_RULES)
     142        $(CONFIG) $< random
     143
     144# Release files
     145
     146releasefile: all
     147        $(MAKE) -r -C release releasefile
     148
     149release:
     150        $(MAKE) -r -C release release
     151
     152# Cleaning
     153
     154distclean: clean
     155        rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
     156
     157clean:
     158        rm -fr $(SANDBOX)
     159        $(MAKE) -r -C kernel clean
     160        $(MAKE) -r -C uspace clean
     161        $(MAKE) -r -C boot clean
     162        $(MAKE) -r -C doxygen clean
     163        $(MAKE) -r -C tools/xcw/demo clean
     164
    69165$(ERRNO_HEADER): $(ERRNO_INPUT)
    70166        echo '/* Generated file. Edit errno.in instead. */' > $@.new
    71167        sed 's/__errno_entry(\([^,]*\),\([^,]*\),.*/#define \1 __errno_t(\2)/' < $< >> $@.new
    72168        mv $@.new $@
     169
     170-include Makefile.local

  • boot/arch/ia64/_link.ld.in

    r32b4302 rfa70134  
    77                *(BOOTSTRAP);
    88                *(.text);
    9                 *(.text.*);
    109                *(.sdata);
    1110                *(.sdata2);

  • boot/arch/ppc32/_link.ld.in

    r32b4302 rfa70134  
    77                *(BOOTSTRAP);
    88                *(.text);
    9                 *(.text.*);
    109        }
    1110        .data : {

  • boot/arch/sparc64/_link.ld.in

    r32b4302 rfa70134  
    66                loader_start = .;
    77                *(BOOTSTRAP);
    8                 *(.text.*);
     8                *(.text);
    99
    1010                *(.data);       /* initialized data */

  • boot/generic/src/version.c

    r32b4302 rfa70134  
    3232
    3333static const char *project = "HelenOS bootloader";
    34 static const char *copyright = STRING(HELENOS_COPYRIGHT);
    35 static const char *release = STRING(HELENOS_RELEASE);
    36 static const char *name = STRING(HELENOS_CODENAME);
     34static const char *copyright = STRING(COPYRIGHT);
     35static const char *release = STRING(RELEASE);
     36static const char *name = STRING(NAME);
    3737static const char *arch = STRING(KARCH);
    3838

  • kernel/generic/src/main/version.c

    r32b4302 rfa70134  
    3838
    3939static const char *project = "SPARTAN kernel";
    40 static const char *copyright = STRING(HELENOS_COPYRIGHT);
    41 static const char *release = STRING(HELENOS_RELEASE);
    42 static const char *name = STRING(HELENOS_CODENAME);
     40static const char *copyright = STRING(COPYRIGHT);
     41static const char *release = STRING(RELEASE);
     42static const char *name = STRING(NAME);
    4343static const char *arch = STRING(KARCH);
    4444

  • tools/cc.sh

    r32b4302 rfa70134  
    3636EOF
    3737
    38 # Find out the path to the script.
    39 SOURCE_DIR=`which -- "$0" 2>/dev/null`
    40 # Maybe we are running bash.
    41 [ -z "$SOURCE_DIR" ] && SOURCE_DIR=`which -- "$BASH_SOURCE"`
    42 [ -z "$SOURCE_DIR" ] && exit 1
    43 SOURCE_DIR=`dirname -- "$SOURCE_DIR"`
    44 SOURCE_DIR=`cd $SOURCE_DIR && cd .. && echo $PWD`
    45 
    4638echo ""
    4739
    48 git -C "$SOURCE_DIR" grep 'Copyright ([cC])' | \
     40git grep 'Copyright ([cC])' | \
    4941        sed -E -n 's/^.*(Copyright \([cC]\) (20[0-9][0-9]-)?20[0-9][0-9],? [-a-zA-Z., ]*[-a-zA-Z.]$)/\1/p' | \
    5042        sed -E 's/ ( )+/ /' | \

  • tools/config.py

    r32b4302 rfa70134  
    4343
    4444ARGPOS_RULES = 1
    45 ARGPOS_PRESETS_DIR = 2
    46 ARGPOS_CHOICE = 3
    47 ARGPOS_PRESET = 4
    48 ARGPOS_MASK_PLATFORM = 3
     45ARGPOS_CHOICE = 2
     46ARGPOS_PRESET = 3
    4947
    5048RULES_FILE = sys.argv[ARGPOS_RULES]
    5149MAKEFILE = 'Makefile.config'
    5250MACROS = 'config.h'
    53 PRESETS_DIR = sys.argv[ARGPOS_PRESETS_DIR]
     51PRESETS_DIR = 'defaults'
    5452
    5553class BinaryOp:
    … …  
    538536
    539537        try:
    540                 version = subprocess.Popen(['git', '-C', os.path.dirname(RULES_FILE), 'log', '-1', '--pretty=%h'], stdout = subprocess.PIPE).communicate()[0].decode().strip()
     538                version = subprocess.Popen(['git', 'log', '-1', '--pretty=%h'], stdout = subprocess.PIPE).communicate()[0].decode().strip()
    541539                sys.stderr.write("ok\n")
    542540        except:
    … …  
    691689        else:
    692690                preset = None
    693 
    694         mask_platform = (len(sys.argv) > ARGPOS_MASK_PLATFORM and sys.argv[ARGPOS_MASK_PLATFORM] == "--mask-platform")
    695691
    696692        # Input configuration file can be specified on command line
    … …  
    759755                        options = []
    760756                        opt2row = {}
    761                         cnt = 0
    762 
    763                         if not mask_platform:
    764                                 cnt += 1
    765                                 options.append("  --- Load preconfigured defaults ... ")
     757                        cnt = 1
     758
     759                        options.append("  --- Load preconfigured defaults ... ")
    766760
    767761                        for rule in rules:
    … …  
    770764                                if cond and not cond.evaluate(config):
    771765                                        continue
    772 
    773                                 if mask_platform and (varname == "PLATFORM" or varname == "MACHINE" or varname == "COMPILER"):
    774                                         rule = varname, vartype, "(locked) " + name, choices, cond
    775766
    776767                                if varname == selname:
    … …  
    820811                                        continue
    821812
    822                         if value == 0 and not mask_platform:
     813                        if value == 0:
    823814                                profile = choose_profile(PRESETS_DIR, MAKEFILE, screen, config)
    824815                                if profile != None:
    … …  
    837828                        else:
    838829                                value = config[selname]
    839 
    840                         if mask_platform and (selname == "PLATFORM" or selname == "MACHINE" or selname == "COMPILER"):
    841                                         continue
    842830
    843831                        if seltype == 'choice':

  • tools/ew.py

    r32b4302 rfa70134  
    3333"""
    3434
    35 import inspect
    3635import os
     36import sys
     37import subprocess
     38import autotool
    3739import platform
    38 import re
    39 import subprocess
    40 import sys
    4140import thread
    4241import time
    4342
    4443overrides = {}
    45 
    46 CONFIG = 'Makefile.config'
    47 
    48 TOOLS_DIR = os.path.dirname(inspect.getabsfile(inspect.currentframe()))
    49 
    50 def read_config():
    51         "Read HelenOS build configuration"
    52 
    53         inf = open(CONFIG, 'r')
    54         config = {}
    55 
    56         for line in inf:
    57                 res = re.match(r'^(?:#!# )?([^#]\w*)\s*=\s*(.*?)\s*$', line)
    58                 if (res):
    59                         config[res.group(1)] = res.group(2)
    60 
    61         inf.close()
    62         return config
    6344
    6445def is_override(str):
    … …  
    183164def hdisk_mk():
    184165        if not os.path.exists('hdisk.img'):
    185                 subprocess.call(TOOLS_DIR + '/mkfat.py 1048576 dist/data hdisk.img', shell = True)
     166                subprocess.call('tools/mkfat.py 1048576 uspace/dist/data hdisk.img', shell = True)
    186167
    187168def qemu_bd_options():
    … …  
    317298
    318299def ski_run(platform, machine, processor):
    319         run_in_console('ski -i ' + TOOLS_DIR + '/conf/ski.conf', 'HelenOS/ia64 on ski')
     300        run_in_console('ski -i tools/conf/ski.conf', 'HelenOS/ia64 on ski')
    320301
    321302def msim_run(platform, machine, processor):
    322303        hdisk_mk()
    323         run_in_console('msim -c ' + TOOLS_DIR + '/conf/msim.conf', 'HelenOS/mips32 on msim')
     304        run_in_console('msim -c tools/conf/msim.conf', 'HelenOS/mips32 on msim')
    324305
    325306def spike_run(platform, machine, processor):
    … …  
    514495                        exit()
    515496
    516         config = read_config()
     497        config = {}
     498        autotool.read_config(autotool.CONFIG, config)
    517499
    518500        if 'PLATFORM' in config.keys():

  • tools/srepl

    r32b4302 rfa70134  
    11#!/bin/sh
    2 
    3 #
    4 # Copyright (c) 2019 Jiří Zárevúcky
    5 # All rights reserved.
    6 #
    7 # Redistribution and use in source and binary forms, with or without
    8 # modification, are permitted provided that the following conditions
    9 # are met:
    10 #
    11 # - Redistributions of source code must retain the above copyright
    12 #   notice, this list of conditions and the following disclaimer.
    13 # - Redistributions in binary form must reproduce the above copyright
    14 #   notice, this list of conditions and the following disclaimer in the
    15 #   documentation and/or other materials provided with the distribution.
    16 # - The name of the author may not be used to endorse or promote products
    17 #   derived from this software without specific prior written permission.
    18 #
    19 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
    20 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
    21 # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
    22 # IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
    23 # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
    24 # NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
    25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
    26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    28 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    29 #
    302
    313usage()

  • tools/travis.sh

    r32b4302 rfa70134  
    8787    echo "Will try to run C style check."
    8888    echo
    89     cd tools
    90     ./build-ccheck.sh || exit 1
    91     cd ..
    92     tools/ccheck.sh || exit 1
     89    make ccheck || exit 1
    9390    echo "C style check passed."
    9491    exit 0
    … …  
    157154    fi
    158155
     156
    159157    # Build it
    160     SRCDIR="$PWD"
    161 
    162     mkdir -p build/$H_ARCH || exit 1
    163     cd build/$H_ARCH
    164 
    165     export PATH="/usr/local/cross/bin:$PATH"
    166 
    167     $SRCDIR/configure.sh $H_ARCH || exit 1
    168     ninja || exit 1
    169     ninja image_path || exit 1
    170 
    171     cd $SRCDIR
     158    make "PROFILE=$H_ARCH" HANDS_OFF=y || exit 1
     159    test -s "$H_OUTPUT_FILENAME" || exit 1
    172160
    173161    echo

  • tools/xcw/bin/helenos-cc

    r32b4302 rfa70134  
    3232#
    3333
    34 
    35 
    3634XCW="$(dirname "$0")"
    3735SRC_ROOT="$XCW/../../.."
    3836if [ -z "$EXPORT_DIR" ]; then
    39         EXPORT_DIR="$SRC_ROOT/build/dist"
     37        EXPORT_DIR="$SRC_ROOT/uspace/export"
    4038fi
     39UARCH="$("$XCW"/helenos-bld-config --uarch)"
     40CC="$("$XCW"/helenos-bld-config --cc)"
     41CFLAGS="$("$XCW"/helenos-bld-config --cflags)"
     42ENDIAN="$("$XCW"/helenos-bld-config --endian)"
    4143
    42 HELENOS_EXPORT_ROOT="$EXPORT_DIR"
    43 
    44 source "${EXPORT_DIR}/config/config.sh"
    45 
    46 # CC is a compilation driver, so we should check which stage of compilation
    47 # is actually running and select which flags to provide. This makes no
    48 # difference for GCC, but e.g. clang warns when a flag is provided that is
    49 # unused
    50 
    51 needs_cflags=true
    52 needs_ldflags=true
    53 
    54 for flag in "$@"; do
    55         case "$flag" in
    56                 -E)
    57                         needs_cflags=false
    58                         needs_ldflags=false
    59                         break
    60                         ;;
    61                 -c|-S)
    62                         needs_ldflags=false
    63                         break
    64                         ;;
    65         esac
    66 done
    67 
    68 flags="-fwide-exec-charset=UTF-32LE -finput-charset=UTF-8 -fexec-charset=UTF-8"
    69 flags="$flags -isystem ${HELENOS_EXPORT_ROOT}/include/libc -idirafter ${HELENOS_EXPORT_ROOT}/include"
    70 
    71 if $needs_cflags; then
    72         flags="$flags -O3 \
    73             -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
    74             -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings -ggdb"
    75 
    76         flags="$flags $HELENOS_CFLAGS"
    77 fi
    78 
    79 if $needs_ldflags; then
    80         flags="$flags $HELENOS_LDFLAGS"
    81 fi
    82 
    83 flags="$flags $@"
    84 
    85 if $needs_ldflags; then
    86         flags="$flags $HELENOS_LDLIBS"
    87 fi
    88 
    89 echo "helenos-cc" "$@"
    90 PATH="$HELENOS_CROSS_PATH:$PATH" "${HELENOS_TARGET}-gcc" $flags
     44echo helenos-cc "$@"
     45"$CC" \
     46    -O3 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32LE -finput-charset=UTF-8 \
     47    $CFLAGS \
     48    -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
     49    -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings -ggdb \
     50    -fno-omit-frame-pointer \
     51    -D "$ENDIAN" \
     52    "$@" \
     53    -I"$XCW"/../include \
     54    -I"$EXPORT_DIR"/include/libc \
     55    -I"$EXPORT_DIR"/include

  • tools/xcw/bin/helenos-pkg-config

    r32b4302 rfa70134  
    3434XCW="$(dirname "$0")"
    3535SRC_ROOT="$XCW/../../.."
     36UARCH="$("$XCW"/helenos-bld-config --uarch)"
    3637if [ -z "$EXPORT_DIR" ]; then
    37         EXPORT_DIR="$SRC_ROOT/build/dist"
     38        EXPORT_DIR="$SRC_ROOT/uspace/export"
    3839fi
    3940INCLUDE_DIR="$EXPORT_DIR/include"

  • tools/xcw/demo/Makefile

    r32b4302 rfa70134  
    5757
    5858$(output): $(objects)
    59         $(CC) -o $@ $^ $(LIBS)
     59        $(LD) -o $@ $^ $(LIBS)
    6060
    6161%.o: %.c

  • uspace/app/download/main.c

    r32b4302 rfa70134  
    4949#define NAME "download"
    5050#ifdef TIMESTAMP_UNIX
    51 #define VERSION STRING(HELENOS_RELEASE) "-" STRING(TIMESTAMP_UNIX)
     51#define VERSION STRING(RELEASE) "-" STRING(TIMESTAMP_UNIX)
    5252#else
    53 #define VERSION STRING(HELENOS_RELEASE)
     53#define VERSION STRING(RELEASE)
    5454#endif
    5555#define USER_AGENT "HelenOS-" NAME "/" VERSION

  • uspace/app/getterm/version.c

    r32b4302 rfa70134  
    3939#include "version.h"
    4040
    41 static const char *copyright = STRING(HELENOS_COPYRIGHT);
    42 static const char *release = STRING(HELENOS_RELEASE);
    43 static const char *name = STRING(HELENOS_CODENAME);
     41static const char *copyright = STRING(COPYRIGHT);
     42static const char *release = STRING(RELEASE);
     43static const char *name = STRING(NAME);
    4444static const char *arch = STRING(UARCH);
    4545

  • uspace/lib/pcut/update-from-master.sh

    r32b4302 rfa70134  
    2828# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929#
    30 
    31 # FIXME: update for meson config
    3230
    3331run_echo() {

  • version

    r32b4302 rfa70134  
    2727#
    2828
     29## This file defines the release information of HelenOS.
     30#
     31# The release string RELEASE consists of three or four components
     32# (version, patch level, sublevel and optionally an extra level).
     33#
     34# The NAME string is the code name of the given release.
     35#
    2936
    30 HELENOS_RELEASE = 0.9.1
    31 HELENOS_CODENAME = Armonia
    32 HELENOS_COPYRIGHT = Copyright (c) 2001-2019 HelenOS project
     37VERSION = 0
     38PATCHLEVEL = 9
     39SUBLEVEL = 1
     40
     41ifdef EXTRAVERSION
     42        RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL).$(EXTRAVERSION)
     43else
     44        RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
     45endif
     46
     47NAME = Armonia
     48COPYRIGHT = Copyright (c) 2001-2019 HelenOS project
Note: See TracChangeset for help on using the changeset viewer.