replaced makefile with meson
This commit is contained in:
parent
46ccebf956
commit
bf27804a4d
8 changed files with 23 additions and 90 deletions
1
cat.c
1
cat.c
|
@ -1,3 +1,4 @@
|
||||||
|
#include<version.h>
|
||||||
#include"stdin.h"
|
#include"stdin.h"
|
||||||
#include"utils.h"
|
#include"utils.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#include<version.h>
|
||||||
#include<stdio.h>
|
#include<stdio.h>
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include<stdlib.h>
|
#include<stdlib.h>
|
||||||
|
|
24
less
24
less
|
@ -1,24 +0,0 @@
|
||||||
-----BEGIN SSH SIGNATURE-----
|
|
||||||
U1NIU0lHAAAAAQAAAhcAAAAHc3NoLXJzYQAAAAMBAAEAAAIBALys9UBrAElWerdW5d3ael
|
|
||||||
wsKkgTr1SKV2dpITrcu3JVVZFxn7z2ghq7P1L3KT+bg5FhyFKCeXg+xji37qucjnwDE2aq
|
|
||||||
xaBgcLfYWXpFJ98d1We0KQgNpZFmlylC6Lnk3/nNDvvxipgne3AXrGpvr9H+I258cSV/8T
|
|
||||||
WCsFQXfafrBqC67fQtVTbEMcds4n4tIBHu/fqaSZdqakkapSOZJJ2CqvZuhlhAtiQBTpTd
|
|
||||||
qogz5cXOpKYi40AwVzd+5gZkGU150X9fAFsZRK59w28cI8iE/Nqh7O33Eployf2tfbCzC+
|
|
||||||
UMb/ssORiFBZ2oJep7WAqMcmGLPAji7mKUyk1tIxxH0OS8LsCEhpnM/fzJ+w+s1mEGKQOV
|
|
||||||
F+EuVGj++4Qi+e/DacU10u9OBPvApJHInXkPVLcXKrFke527C0GrnXqyOU3z1YtQTHWXRi
|
|
||||||
EpkfrbNM9a9wMt4xFiM+fPpZxXUnYbNmPDq8NzWPLBNOO1Ngx17EdlD+TjDozLp6z7DoA3
|
|
||||||
TBHUzaR+PGxhb3rzHFHqAJNEgzm5WaEC7sFFU5U2DMZrwm3S5NvF1BCPgUIsB700mICOw3
|
|
||||||
dziOYH7RzQvTcsx7A6zHcpw2v02Utz8TzZZb/qkEw2q8uUMd2DfpU/x/Vo1F8u6vYaq1/o
|
|
||||||
/XcovjW2IxFh7XcIkMB/ubegcP1ivL1NAAAABWdpdGVhAAAAAAAAAAZzaGE1MTIAAAIUAA
|
|
||||||
AADHJzYS1zaGEyLTUxMgAAAgAeSVq1blAlSQzJHCAEsRRwqIuGcLepAi+wdDgRDbWo18AP
|
|
||||||
//j1xw0HLU8DmyrvG5pectst3BJayMhHJfbXucOVEGe9NtU4r9e9CBPVV9JBibVMq22frX
|
|
||||||
U2A85C19sOYf+afMhcwe/ptVcIqIPdXCfLN51SXF0qnQqr5Q7/9qpDrvzg9coQCjMPJYh7
|
|
||||||
jKCrUnoc9y1JrTXni/MrHjCtSUVoosKJt/TiHXAMrK/NXYW/hXdcc9h51bU5Q0lKSS11MN
|
|
||||||
80ygOdpnfejXAu1I7mO9N/IX4107apEYa5Dm496xToTYPQoQEIxbUkSq+8gCxAxRD8gZtP
|
|
||||||
Co5XFbVzSFXAYX5+NQuJ5R11SSMAQrx9DiL7U2DrNzZZtGutufBkOOw7qfYuZU7BjoeZAP
|
|
||||||
q+Kq98bobkJJ1LD8gDqSK0Flsae+ynIJfPvsbtoHR52RcbDoSus3Qp8AMmdZ6D7AGBLGFJ
|
|
||||||
dtKN3R4rPAjtY9z0G1Aq/2zFtauyOXtyn4eZCNf3aRJGoP1mqrtPJUMHj4dSxMQDkOd1oF
|
|
||||||
1uRzonAL4ykyX3U0+3BUqJ57P4iabrgOsxlPPrcLRipzUh45nPp7t7uEtWLIkcxapZWhdF
|
|
||||||
5xDoH2Wg4sTJhuVjrwNE0ibNCRk9cXQ944FMZJ0yHl69N5gli3xpH8fyby2PYKPA0rZTN6
|
|
||||||
pI5KXBJA==
|
|
||||||
-----END SSH SIGNATURE-----
|
|
33
makefile
33
makefile
|
@ -1,33 +0,0 @@
|
||||||
all: build/cat build/cmpsize
|
|
||||||
|
|
||||||
# cat target
|
|
||||||
build/cat: cat.o stdin.o | build
|
|
||||||
clang $(CFLAGS) cat.o stdin.o -o $@
|
|
||||||
cat.o: cat.c
|
|
||||||
clang $(CFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
stdin.o: stdin.c
|
|
||||||
clang $(CFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
# cmpsize target
|
|
||||||
build/cmpsize: cmpsize.o bytes.o | build
|
|
||||||
clang $(CFLAGS) cmpsize.o bytes.o -o $@
|
|
||||||
|
|
||||||
cmpsize.o: cmpsize.c
|
|
||||||
clang $(CFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
bytes.o: bytes.c
|
|
||||||
clang $(CFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
# Ensure build dir exists
|
|
||||||
build:
|
|
||||||
@mkdir -p build
|
|
||||||
|
|
||||||
# Install target
|
|
||||||
install: build/cat build/cmpsize
|
|
||||||
install -m 755 build/cmpsize /usr/local/bin
|
|
||||||
install -m 755 build/cat /usr/local/bin
|
|
||||||
# Clean target
|
|
||||||
clean:
|
|
||||||
rm -f *.o
|
|
||||||
rm -rf build
|
|
24
meow
24
meow
|
@ -1,24 +0,0 @@
|
||||||
-----BEGIN SSH SIGNATURE-----
|
|
||||||
U1NIU0lHAAAAAQAAAhcAAAAHc3NoLXJzYQAAAAMBAAEAAAIBALys9UBrAElWerdW5d3ael
|
|
||||||
wsKkgTr1SKV2dpITrcu3JVVZFxn7z2ghq7P1L3KT+bg5FhyFKCeXg+xji37qucjnwDE2aq
|
|
||||||
xaBgcLfYWXpFJ98d1We0KQgNpZFmlylC6Lnk3/nNDvvxipgne3AXrGpvr9H+I258cSV/8T
|
|
||||||
WCsFQXfafrBqC67fQtVTbEMcds4n4tIBHu/fqaSZdqakkapSOZJJ2CqvZuhlhAtiQBTpTd
|
|
||||||
qogz5cXOpKYi40AwVzd+5gZkGU150X9fAFsZRK59w28cI8iE/Nqh7O33Eployf2tfbCzC+
|
|
||||||
UMb/ssORiFBZ2oJep7WAqMcmGLPAji7mKUyk1tIxxH0OS8LsCEhpnM/fzJ+w+s1mEGKQOV
|
|
||||||
F+EuVGj++4Qi+e/DacU10u9OBPvApJHInXkPVLcXKrFke527C0GrnXqyOU3z1YtQTHWXRi
|
|
||||||
EpkfrbNM9a9wMt4xFiM+fPpZxXUnYbNmPDq8NzWPLBNOO1Ngx17EdlD+TjDozLp6z7DoA3
|
|
||||||
TBHUzaR+PGxhb3rzHFHqAJNEgzm5WaEC7sFFU5U2DMZrwm3S5NvF1BCPgUIsB700mICOw3
|
|
||||||
dziOYH7RzQvTcsx7A6zHcpw2v02Utz8TzZZb/qkEw2q8uUMd2DfpU/x/Vo1F8u6vYaq1/o
|
|
||||||
/XcovjW2IxFh7XcIkMB/ubegcP1ivL1NAAAABWdpdGVhAAAAAAAAAAZzaGE1MTIAAAIUAA
|
|
||||||
AADHJzYS1zaGEyLTUxMgAAAgBzDHL/M6WxLLJSuPnPXnpHqaZxdPMuMvJrtES0FCWyJ0ct
|
|
||||||
p2xJRtUBjKsZDK++DgugqD7DYlDlK79XjFP2WA+3SX2MnHgiMIxX4TqR3clNef1VxVaXIq
|
|
||||||
2qTBHFuHs76toBtmhn7OqRP+6l4p+csHYJ4R7xEjTZcdXqe6jQ5Zx6TVvj8nZk1tTSpxyo
|
|
||||||
mci7dwpxF/o6uGoxTKDtyOsm1GXPHSes05F7tD9vVbNGuswZwBm/t5lCibat73Fv6jzw6r
|
|
||||||
6kN26ZHcbjab+FP06/WTfxiFwx22RxxO9qHEWbu5RI/qc6NN9meRPys2Wf45pPQjAIgR0v
|
|
||||||
ni4Q/u3RgpJEm+MTAemIVpNb/ye8l3QxpCagzqbJHRVMXFlFqstp2hE9uPeswljZRO8Ypv
|
|
||||||
KklN2zaTV8UX7JdiN6W1SiLjmdCld/eAqe/Lwa4cxYggVYK/E5anLSndsNqwRG/EnsJYnk
|
|
||||||
LnZ+FG/NKJBMiIM1aYr43GWBkaT2Gf+Ep5/yJIcI2EXeeKXv6soeUtEKSsy169VU6Iz/8c
|
|
||||||
JipJ+sYX7nF8jlNVWhO0OT8Gv1T650NkTe31HEcur5L5u3eoES7PYyHFOJsudkSfUdjiHJ
|
|
||||||
CNx3ChjZwYppzDBISj1v9raWpjMHAZXaj/8EgLt1TXvHTnuikvap28aKF6aNKtzP6t51ER
|
|
||||||
dhGSLSxw==
|
|
||||||
-----END SSH SIGNATURE-----
|
|
19
meson.build
Normal file
19
meson.build
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
project('myproject', 'c', version: '3.4')
|
||||||
|
|
||||||
|
# Get the short git commit hash
|
||||||
|
git_hash = run_command('git', 'rev-parse', '--short', 'HEAD', check: true).stdout().strip()
|
||||||
|
|
||||||
|
# Combine version and hash
|
||||||
|
full_version = '@0@(@1@)'.format(meson.project_version(), git_hash)
|
||||||
|
|
||||||
|
# Generate header
|
||||||
|
conf = configuration_data()
|
||||||
|
conf.set('version', '"@0@"'.format(full_version))
|
||||||
|
|
||||||
|
configure_file(
|
||||||
|
output: 'version.h',
|
||||||
|
configuration: conf
|
||||||
|
)
|
||||||
|
|
||||||
|
executable('cat', ['cat.c', 'stdin.c'], include_directories: '.')
|
||||||
|
executable('cmpsize', ['cmpsize.c', 'bytes.c'], include_directories: '.')
|
3
test
3
test
|
@ -1,3 +0,0 @@
|
||||||
./build/cat <<EOF
|
|
||||||
Hello, World!
|
|
||||||
EOF
|
|
8
utils.h
8
utils.h
|
@ -1,7 +1,3 @@
|
||||||
#ifdef __cosmo__
|
#ifndef _WIN64
|
||||||
#error "cosmopolitan libc got banned from usage, use clang from homebrew for macOS or msvc for windows"
|
#error "this version is windows only"
|
||||||
#endif
|
#endif
|
||||||
#ifdef __linux__
|
|
||||||
#error "linux isn't supported."
|
|
||||||
#endif
|
|
||||||
#define version "3.4"
|
|
Loading…
Add table
Add a link
Reference in a new issue