aryal/coreutils
1
0
Fork 0
forked from bonsai/harakit
Code Pull Requests Activity

considering a different project directory struture

Browse Source 
inspired by freebsd source tree
This commit is contained in:
Aaditya Aryal 2024-03-31 00:12:21 +05:45
parent 8d9ac33566
commit 7ae3b46908
38 changed files with 161 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
Makefile
View File

@ -8,29 +8,18 @@
# permitted in any medium without royalty provided the copyright notice and this
# notice are preserved. This file is offered as-is, without any warranty.
.POSIX:
#.POSIX:
# if using BSD make(1), remove these pragmas because they break it
.PRAGMA: posix_202x # future POSIX standard support à la pdpmake(1)
.PRAGMA: command_comment # breaks without this?
DESTDIR ?= dist
PREFIX ?= /usr/local
SYSEXITS != printf '\043include <sysexits.h>\n' | cpp -M - | sed 's/ /\n/g' \
| sed -n 's/sysexits\.h//p' || printf 'include\n'
CC ?= cc
RUSTC ?= rustc
RUSTLIBS = --extern getopt=build/o/libgetopt.rlib \
--extern sysexits=build/o/libsysexits.rlib \
--extern strerror=build/o/libstrerror.rlib
CFLAGS += -I$(SYSEXITS)
include config.mk
.PHONY: all
all: dj false fop hru intcmp mm npc rpn scrut str strcmp swab true
all: prepare
@$(MAKE) -C lib
@$(MAKE) -C bin
build:
.PHONY: prepare
prepare:
# keep build/include until bindgen(1) has stdin support
# https://github.com/rust-lang/rust-bindgen/issues/2703
mkdir -p build/bin build/include build/lib build/o build/test
@ -42,100 +31,14 @@ clean:
dist: all
mkdir -p $(DESTDIR)/$(PREFIX)/bin $(DESTDIR)/$(PREFIX)/share/man/man1
cp build/bin/* $(DESTDIR)/$(PREFIX)/bin
cp docs/*.1 $(DESTDIR)/$(PREFIX)/share/man/man1
cp bin/*/*.1 $(DESTDIR)/$(PREFIX)/share/man/man1
.PHONY: install
install: dist
cp -r $(DESTDIR)/* /
.PHONY: test
test: build
test: prepare
tests/posix-compat.sh
$(RUSTC) --test src/getopt-rs/lib.rs -o build/test/getopt
.PHONY: rustlibs
rustlibs: build/o/libsysexits.rlib build/o/libgetopt.rlib \
build/o/libstrerror.rlib
build/o/libgetopt.rlib: build src/getopt-rs/lib.rs
$(RUSTC) $(RUSTFLAGS) --crate-type=lib --crate-name=getopt \
-o $@ src/getopt-rs/lib.rs
build/o/libstrerror.rlib: build src/strerror.rs
$(RUSTC) $(RUSTFLAGS) --crate-type=lib -o $@ \
src/strerror.rs
build/o/libsysexits.rlib: build $(SYSEXITS)sysexits.h
# bandage solution until bindgen(1) gets stdin support
printf '#define EXIT_FAILURE 1\n' | cat - $(SYSEXITS)sysexits.h \
> build/include/sysexits.h
bindgen --default-macro-constant-type signed --use-core --formatter=none \
build/include/sysexits.h | $(RUSTC) $(RUSTFLAGS) --crate-type lib -o $@ -
.PHONY: dj
dj: build/bin/dj
build/bin/dj: src/dj.c build
$(CC) $(CFLAGS) -o $@ src/dj.c
.PHONY: false
false: build/bin/false
build/bin/false: src/false.c build
$(CC) $(CFLAGS) -o $@ src/false.c
.PHONY: fop
fop: build/bin/fop
build/bin/fop: src/fop.rs build rustlibs
$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/fop.rs
.PHONY: hru
hru: build/bin/hru
build/bin/hru: src/hru.rs build rustlibs
$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/hru.rs
.PHONY: intcmp
intcmp: build/bin/intcmp
build/bin/intcmp: src/intcmp.c build
$(CC) $(CFLAGS) -o $@ src/intcmp.c
.PHONY: mm
mm: build/bin/mm
build/bin/mm: src/mm.c build
$(CC) $(CFLAGS) -o $@ src/mm.c
.PHONY: npc
npc: build/bin/npc
build/bin/npc: src/npc.c build
$(CC) $(CFLAGAS) -o $@ src/npc.c
.PHONY: rpn
rpn: build/bin/rpn
build/bin/rpn: src/rpn.rs build rustlibs
$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ src/rpn.rs
.PHONY: scrut
scrut: build/bin/scrut
build/bin/scrut: src/scrut.c build
$(CC) $(CFLAGS) -o $@ src/scrut.c
.PHONY: str
str: build/bin/str
build/bin/str: src/str.c build
$(CC) $(CFLAGS) -o $@ src/str.c
.PHONY: strcmp
strcmp: build/bin/strcmp
build/bin/strcmp: src/strcmp.c build
$(CC) $(CFLAGS) -o $@ src/strcmp.c
.PHONY: swab
swab: build/bin/swab
build/bin/swab: src/swab.rs build build/o/libsysexits.rlib
$(RUSTC) $(RUSTFLAGS) --extern getopt=build/o/libgetopt.rlib \
--extern sysexits=build/o/libsysexits.rlib \
-o $@ src/swab.rs
.PHONY: true
true: build/bin/true
build/bin/true: src/true.c build
$(CC) $(CFLAGS) -o $@ src/true.c

91
bin/Makefile Normal file
View File

@ -0,0 +1,91 @@
# Copyright (c) 2023–2024 Emma Tebibyte <emma@tebibyte.media>
# Copyright (c) 2023–2024 DTB <trinity@trinity.moe>
# Copyright (c) 2023 Sasha Koshka <sashakoshka@tebibyte.media>
# Copyright (c) 2024 Aaditya Aryal <aryalaadi123@gmail.com>
# SPDX-License-Identifier: FSFAP
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice and this
# notice are preserved. This file is offered as-is, without any warranty.
include ../config.mk
.PHONY: bin
bin: dj false fop hru intcmp mm npc rpn scrut str strcmp swab true
.PHONY: lib
# TODO: this does not have to be here
.PHONY: prepare
prepare:
# keep ..$(BUILD)/include until bindgen(1) has stdin support
# https://github.com/rust-lang/rust-bindgen/issues/2703
mkdir -p ../$(BUILD)/bin ../$(BUILD)/include ../$(BUILD)/lib
mkdir -p ../$(BUILD)/test ../$(BUILD)/o
.PHONY: dj
dj: ../$(BUILD)/bin/dj
../$(BUILD)/bin/dj: dj/dj.c prepare
$(CC) $(CFLAGS) -o $@ dj/dj.c
.PHONY: false
false: ../$(BUILD)/bin/false
../$(BUILD)/bin/false: false/false.c prepare
$(CC) $(CFLAGS) -o $@ false/false.c
.PHONY: fop
fop: ../$(BUILD)/bin/fop
../$(BUILD)/bin/fop: fop/fop.rs prepare lib
$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ fop/fop.rs
.PHONY: hru
hru: ../$(BUILD)/bin/hru
../$(BUILD)/bin/hru: hru/hru.rs prepare lib
$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ hru/hru.rs
.PHONY: intcmp
intcmp: ../$(BUILD)/bin/intcmp
../$(BUILD)/bin/intcmp: intcmp/intcmp.c prepare
$(CC) $(CFLAGS) -o $@ intcmp/intcmp.c
.PHONY: mm
mm: ../$(BUILD)/bin/mm
../$(BUILD)/bin/mm: mm/mm.c prepare
$(CC) $(CFLAGS) -o $@ mm/mm.c
.PHONY: npc
npc: ../$(BUILD)/bin/npc
../$(BUILD)/bin/npc: npc/npc.c prepare
$(CC) $(CFLAGAS) -o $@ npc/npc.c
.PHONY: rpn
rpn: ../$(BUILD)/bin/rpn
../$(BUILD)/bin/rpn: rpn/rpn.rs prepare lib
$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) -o $@ rpn/rpn.rs
.PHONY: scrut
scrut: ../$(BUILD)/bin/scrut
../$(BUILD)/bin/scrut: scrut/scrut.c prepare
$(CC) $(CFLAGS) -o $@ scrut/scrut.c
.PHONY: str
str: ../$(BUILD)/bin/str
../$(BUILD)/bin/str: str/str.c prepare
$(CC) $(CFLAGS) -o $@ str/str.c
.PHONY: strcmp
strcmp: ../$(BUILD)/bin/strcmp
../$(BUILD)/bin/strcmp: strcmp/strcmp.c prepare
$(CC) $(CFLAGS) -o $@ strcmp/strcmp.c
.PHONY: swab
swab: ../$(BUILD)/bin/swab
../$(BUILD)/bin/swab: swab/swab.rs prepare lib
$(RUSTC) $(RUSTFLAGS) --extern getopt=../$(BUILD)/o/libgetopt.rlib \
--extern sysexits=../$(BUILD)/o/libsysexits.rlib \
-o $@ swab/swab.rs
.PHONY: true
true: ../$(BUILD)/bin/true
../$(BUILD)/bin/true: true/true.c prepare
$(CC) $(CFLAGS) -o $@ true/true.c

0
docs/dj.1 → bin/dj/dj.1
View File

0
src/dj.c → bin/dj/dj.c
View File

0
docs/false.1 → bin/false/false.1
View File

0
src/false.c → bin/false/false.c
View File

0
src/fop.rs → bin/fop/fop.rs
View File

0
docs/hru.1 → bin/hru/hru.1
View File

0
src/hru.rs → bin/hru/hru.rs
View File

0
docs/intcmp.1 → bin/intcmp/intcmp.1
View File

0
src/intcmp.c → bin/intcmp/intcmp.c
View File

0
docs/mm.1 → bin/mm/mm.1
View File

0
src/mm.c → bin/mm/mm.c
View File

0
docs/npc.1 → bin/npc/npc.1
View File

0
src/npc.c → bin/npc/npc.c
View File

0
docs/rpn.1 → bin/rpn/rpn.1
View File

0
src/rpn.rs → bin/rpn/rpn.rs
View File

0
docs/scrut.1 → bin/scrut/scrut.1
View File

0
src/scrut.c → bin/scrut/scrut.c
View File

0
docs/str.1 → bin/str/str.1
View File

0
src/str.c → bin/str/str.c
View File

0
docs/strcmp.1 → bin/strcmp/strcmp.1
View File

0
src/strcmp.c → bin/strcmp/strcmp.c
View File

0
docs/swab.1 → bin/swab/swab.1
View File

0
src/swab.rs → bin/swab/swab.rs
View File

0
src/test.rs → bin/test/test.rs
View File

0
docs/true.1 → bin/true/true.1
View File

0
src/true.c → bin/true/true.c
View File

29
config.mk Normal file
View File

@ -0,0 +1,29 @@
# Copyright (c) 2023–2024 Emma Tebibyte <emma@tebibyte.media>
# Copyright (c) 2023–2024 DTB <trinity@trinity.moe>
# Copyright (c) 2023 Sasha Koshka <sashakoshka@tebibyte.media>
# Copyright (c) 2024 Aaditya Aryal <aryalaadi123@gmail.com>
# SPDX-License-Identifier: FSFAP
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice and this
# notice are preserved. This file is offered as-is, without any warranty.
# if using BSD make(1), remove these pragmas because they break it
.PRAGMA: posix_202x # future POSIX standard support à la pdpmake(1)
.PRAGMA: command_comment # breaks without this?
DESTDIR ?= dist
PREFIX ?= /usr/local
BUILD ?= build
SYSEXITS != printf '\043include <sysexits.h>\n' | cpp -M - | sed 's/ /\n/g' \
| sed -n 's/sysexits\.h//p' || printf 'include\n'
CC ?= cc
RUSTC ?= rustc
RUSTLIBS = --extern getopt=../$(BUILD)/o/libgetopt.rlib \
--extern sysexits=../$(BUILD)/o/libsysexits.rlib \
--extern strerror=../$(BUILD)/o/libstrerror.rlib
CFLAGs += --std=c99 -Wall -pedantic -Werror
CFLAGS += -I$(SYSEXITS)

30
lib/Makefile Normal file
View File

@ -0,0 +1,30 @@
# Copyright (c) 2023–2024 Emma Tebibyte <emma@tebibyte.media>
# Copyright (c) 2023–2024 DTB <trinity@trinity.moe>
# Copyright (c) 2023 Sasha Koshka <sashakoshka@tebibyte.media>
# Copyright (c) 2024 Aaditya Aryal <aryalaadi123@gmail.com>
# SPDX-License-Identifier: FSFAP
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice and this
# notice are preserved. This file is offered as-is, without any warranty.
include ../config.mk
.PHONY: lib
lib: ../$(BUILD)/o/libsysexits.rlib ../$(BUILD)/o/libgetopt.rlib \
../$(BUILD)/o/libstrerror.rlib
../$(BUILD)/o/libgetopt.rlib: getopt-rs/lib.rs
$(RUSTC) $(RUSTFLAGS) --crate-type=lib --crate-name=getopt \
-o $@ getopt-rs/lib.rs
../$(BUILD)/o/libstrerror.rlib: strerror.rs
$(RUSTC) $(RUSTFLAGS) --crate-type=lib -o $@ \
strerror.rs
../$(BUILD)/o/libsysexits.rlib: $(SYSEXITS)sysexits.h
# bandage solution until bindgen(1) gets stdin support
printf '#define EXIT_FAILURE 1\n' | cat - $(SYSEXITS)sysexits.h \
> ../$(BUILD)/include/sysexits.h
bindgen --default-macro-constant-type signed --use-core --formatter=none \
../$(BUILD)/include/sysexits.h | $(RUSTC) $(RUSTFLAGS) --crate-type lib -o $@ -

0
src/getopt-rs/error.rs → lib/getopt-rs/error.rs
View File

0
src/getopt-rs/errorkind.rs → lib/getopt-rs/errorkind.rs
View File

0
src/getopt-rs/lib.rs → lib/getopt-rs/lib.rs
View File

0
src/getopt-rs/opt.rs → lib/getopt-rs/opt.rs
View File

0
src/getopt-rs/parser.rs → lib/getopt-rs/parser.rs
View File

0
src/getopt-rs/result.rs → lib/getopt-rs/result.rs
View File

0
src/getopt-rs/tests.rs → lib/getopt-rs/tests.rs
View File

0
src/strerror.rs → lib/strerror.rs
View File