1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
|
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,14 @@
BANNER = \n \033[38;5;196m██████\033[38;5;240m╗ \033[38;5;196m████████\033[38;5;240m╗ \033[38;5;196m██████\033[38;5;240m╗ \033[38;5;196m██████\033[38;5;240m╗\n \033[38;5;160m██\033[38;5;239m╔══\033[38;5;160m██\033[38;5;239m╗╚══\033[38;5;160m██\033[38;5;239m╔══╝\033[38;5;160m██\033[38;5;239m╔═══\033[38;5;160m██\033[38;5;239m╗\033[38;5;160m██\033[38;5;239m╔══\033[38;5;160m██\033[38;5;239m╗ \033[38;5;160m██\033[38;5;239m╗ \033[38;5;160m██\033[38;5;239m╗\n \033[38;5;124m██████\033[38;5;238m╔╝ \033[38;5;124m██\033[38;5;238m║ \033[38;5;124m██\033[38;5;238m║ \033[38;5;124m██\033[38;5;238m║\033[38;5;124m██████\033[38;5;238m╔╝ \033[38;5;124m██████\033[38;5;238m╗\033[38;5;124m██████\033[38;5;238m╗\n \033[38;5;88m██\033[38;5;237m╔══\033[38;5;88m██\033[38;5;237m╗ \033[38;5;88m██\033[38;5;237m║ \033[38;5;88m██\033[38;5;237m║ \033[38;5;88m██\033[38;5;237m║\033[38;5;88m██\033[38;5;237m╔═══╝ ╚═\033[38;5;88m██\033[38;5;237m╔═╝╚═\033[38;5;88m██\033[38;5;237m╔═╝\n \033[38;5;52m██████\033[38;5;236m╔╝ \033[38;5;52m██\033[38;5;236m║ ╚\033[38;5;52m██████\033[38;5;236m╔╝\033[38;5;52m██\033[38;5;236m║ ╚═╝ ╚═╝\n \033[38;5;235m╚═════╝ ╚═╝ ╚═════╝ ╚═╝ \033[1;3;38;5;240mMakefile v1.5\033[0m
-override BTOP_VERSION := $(shell head -n100 src/btop.cpp 2>/dev/null | grep "Version =" | cut -f2 -d"\"" || echo " unknown")
-override TIMESTAMP := $(shell date +%s 2>/dev/null || echo "0")
-override DATESTAMP := $(shell date '+%Y-%m-%d %H:%M:%S' || echo "5 minutes ago")
-ifeq ($(shell command -v gdate >/dev/null; echo $$?),0)
- DATE_CMD := gdate
-else
- DATE_CMD := date
-endif
+#override BTOP_VERSION := $(shell head -n100 src/btop.cpp 2>/dev/null | grep "Version =" | cut -f2 -d"\"" || echo " unknown")
+#override TIMESTAMP := $(shell date +%s 2>/dev/null || echo "0")
+#override DATESTAMP := $(shell date '+%Y-%m-%d %H:%M:%S' || echo "5 minutes ago")
+#ifeq ($(shell command -v gdate >/dev/null; echo $$?),0)
+# DATE_CMD := gdate
+#else
+# DATE_CMD := date
+#endif
ifneq ($(QUIET),true)
override PRE := info info-quiet
@@ -21,26 +21,26 @@ endif
PREFIX ?= /usr/local
#? Detect PLATFORM and ARCH from uname/gcc if not set
-PLATFORM ?= $(shell uname -s || echo unknown)
-ifneq ($(filter unknown Darwin, $(PLATFORM)),)
- override PLATFORM := $(shell $(CXX) -dumpmachine | awk -F"-" '{ print (NF==4) ? $$3 : $$2 }')
- ifeq ($(PLATFORM),apple)
- override PLATFORM := macos
- endif
-endif
-ifeq ($(shell uname -v | grep ARM64 >/dev/null 2>&1; echo $$?),0)
- ARCH ?= arm64
-else
- ARCH ?= $(shell $(CXX) -dumpmachine | cut -d "-" -f 1)
-endif
-
-override PLATFORM_LC := $(shell echo $(PLATFORM) | tr '[:upper:]' '[:lower:]')
+#PLATFORM ?= $(shell uname -s || echo unknown)
+#ifneq ($(filter unknown Darwin, $(PLATFORM)),)
+# override PLATFORM := $(shell $(CXX) -dumpmachine | awk -F"-" '{ print (NF==4) ? $$3 : $$2 }')
+# ifeq ($(PLATFORM),apple)
+# override PLATFORM := macos
+# endif
+#endif
+#ifeq ($(shell uname -v | grep ARM64 >/dev/null 2>&1; echo $$?),0)
+# ARCH ?= arm64
+#else
+# ARCH ?= $(shell $(CXX) -dumpmachine | cut -d "-" -f 1)
+#endif
+
+#override PLATFORM_LC := $(shell echo $(PLATFORM) | tr '[:upper:]' '[:lower:]')
#? Any flags added to TESTFLAGS must not contain whitespace for the testing to work
-override TESTFLAGS := -fexceptions -fstack-clash-protection -fcf-protection
-ifneq ($(PLATFORM) $(ARCH),macos arm64)
- override TESTFLAGS += -fstack-protector
-endif
+#override TESTFLAGS := -fexceptions -fstack-clash-protection -fcf-protection
+#ifneq ($(PLATFORM) $(ARCH),macos arm64)
+# override TESTFLAGS += -fstack-protector
+#endif
ifeq ($(STATIC),true)
override ADDFLAGS += -static-libgcc -static-libstdc++
@@ -54,55 +54,55 @@ ifeq ($(STRIP),true)
endif
#? Compiler and Linker
-ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0)
- CXX := g++-11
-else ifeq ($(shell command -v g++11 >/dev/null; echo $$?),0)
- CXX := g++11
-else ifeq ($(shell command -v g++ >/dev/null; echo $$?),0)
- CXX := g++
-endif
-override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
+#ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0)
+# CXX := g++-11
+#else ifeq ($(shell command -v g++11 >/dev/null; echo $$?),0)
+# CXX := g++11
+#else ifeq ($(shell command -v g++ >/dev/null; echo $$?),0)
+# CXX := g++
+#endif
+#override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
#? Try to make sure we are using GCC/G++ version 11 or later if not instructed to use g++-10
-ifeq ($(CXX),g++)
- ifeq ($(shell g++ --version | grep clang >/dev/null 2>&1; echo $$?),0)
- V_MAJOR := 0
- else
- V_MAJOR := $(shell echo $(CXX_VERSION) | cut -f1 -d".")
- endif
- ifneq ($(shell test $(V_MAJOR) -ge 11; echo $$?),0)
- ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0)
- override CXX := g++-11
- override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
- endif
- endif
-endif
+#ifeq ($(CXX),g++)
+# ifeq ($(shell g++ --version | grep clang >/dev/null 2>&1; echo $$?),0)
+# V_MAJOR := 0
+# else
+# V_MAJOR := $(shell echo $(CXX_VERSION) | cut -f1 -d".")
+# endif
+# ifneq ($(shell test $(V_MAJOR) -ge 11; echo $$?),0)
+# ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0)
+# override CXX := g++-11
+# override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
+# endif
+# endif
+#endif
#? Pull in platform specific source files and get thread count
-ifeq ($(PLATFORM_LC),linux)
- PLATFORM_DIR := linux
- THREADS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
- SU_GROUP := root
-else ifeq ($(PLATFORM_LC),freebsd)
- PLATFORM_DIR := freebsd
- THREADS := $(shell getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)
- SU_GROUP := wheel
- override ADDFLAGS += -lstdc++ -lm -lkvm -ldevstat -Wl,-rpath=/usr/local/lib/gcc11
- export MAKE = gmake
-else ifeq ($(PLATFORM_LC),macos)
- PLATFORM_DIR := osx
- THREADS := $(shell sysctl -n hw.ncpu || echo 1)
- override ADDFLAGS += -framework IOKit -framework CoreFoundation -Wno-format-truncation
- SU_GROUP := wheel
-else
-$(error $(shell printf "\033[1;91mERROR: \033[97mUnsupported platform ($(PLATFORM))\033[0m"))
-endif
+#ifeq ($(PLATFORM_LC),linux)
+PLATFORM_DIR := linux
+# THREADS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+# SU_GROUP := root
+#else ifeq ($(PLATFORM_LC),freebsd)
+# PLATFORM_DIR := freebsd
+# THREADS := $(shell getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)
+# SU_GROUP := wheel
+# override ADDFLAGS += -lstdc++ -lm -lkvm -ldevstat -Wl,-rpath=/usr/local/lib/gcc11
+# export MAKE = gmake
+#else ifeq ($(PLATFORM_LC),macos)
+# PLATFORM_DIR := osx
+# THREADS := $(shell sysctl -n hw.ncpu || echo 1)
+# override ADDFLAGS += -framework IOKit -framework CoreFoundation -Wno-format-truncation
+# SU_GROUP := wheel
+#else
+#$(error $(shell printf "\033[1;91mERROR: \033[97mUnsupported platform ($(PLATFORM))\033[0m"))
+#endif
#? Use all CPU cores (will only be set if using Make 4.3+)
-MAKEFLAGS := --jobs=$(THREADS)
-ifeq ($(THREADS),1)
- override THREADS := auto
-endif
+#MAKEFLAGS := --jobs=$(THREADS)
+#ifeq ($(THREADS),1)
+# override THREADS := auto
+#endif
#? The Directories, Source, Includes, Objects and Binary
SRCDIR := src
@@ -114,18 +114,21 @@ DEPEXT := d
OBJEXT := o
#? Filter out unsupported compiler flags
-override GOODFLAGS := $(foreach flag,$(TESTFLAGS),$(strip $(shell echo "int main() {}" | $(CXX) -o /dev/null $(flag) -x c++ - >/dev/null 2>&1 && echo $(flag) || true)))
+#override GOODFLAGS := $(foreach flag,$(TESTFLAGS),$(strip $(shell echo "int main() {}" | $(CXX) -o /dev/null $(flag) -x c++ - >/dev/null 2>&1 && echo $(flag) || true)))
#? Flags, Libraries and Includes
override REQFLAGS := -std=c++20
WARNFLAGS := -Wall -Wextra -pedantic
OPTFLAGS := -O2 -ftree-loop-vectorize -flto=$(THREADS)
LDCXXFLAGS := -pthread -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS $(GOODFLAGS) $(ADDFLAGS)
-override CXXFLAGS += $(REQFLAGS) $(LDCXXFLAGS) $(OPTFLAGS) $(WARNFLAGS)
-override LDFLAGS += $(LDCXXFLAGS) $(OPTFLAGS) $(WARNFLAGS)
+#override CXXFLAGS += $(REQFLAGS) $(LDCXXFLAGS) $(OPTFLAGS) $(WARNFLAGS)
+#override LDFLAGS += $(LDCXXFLAGS) $(OPTFLAGS) $(WARNFLAGS)
INC := -I$(INCDIR) -I$(SRCDIR)
SU_USER := root
+CXXFLAGS += -std=c++20 -pthread
+LDFLAGS += -pthread
+
ifdef DEBUG
override OPTFLAGS := -O0 -g
endif
@@ -139,18 +142,18 @@ SOURCE_COUNT := $(words $(SOURCES))
OBJECTS := $(patsubst $(SRCDIR)/%,$(BUILDDIR)/%,$(SOURCES:.$(SRCEXT)=.$(OBJEXT)))
-ifeq ($(shell find $(BUILDDIR) -type f -newermt "$(DATESTAMP)" -name *.o >/dev/null 2>&1; echo $$?),0)
- ifneq ($(wildcard $(BUILDDIR)/.*),)
- SKIPPED_SOURCES := $(foreach fname,$(SOURCES),$(shell find $(BUILDDIR) -type f -newer $(fname) -name *.o | grep "$(basename $(notdir $(fname))).o" 2>/dev/null))
- override SOURCE_COUNT := $(shell expr $(SOURCE_COUNT) - $(words $(SKIPPED_SOURCES)))
- ifeq ($(SOURCE_COUNT),0)
- override SOURCE_COUNT = $(words $(SOURCES))
- endif
- endif
- PROGRESS = expr $$(find $(BUILDDIR) -type f -newermt "$(DATESTAMP)" -name *.o | wc -l || echo 1) '*' 90 / $(SOURCE_COUNT) | cut -c1-2
-else
- PROGRESS = expr $$(find $(BUILDDIR) -type f -name *.o | wc -l || echo 1) '*' 90 / $(SOURCE_COUNT) | cut -c1-2
-endif
+#ifeq ($(shell find $(BUILDDIR) -type f -newermt "$(DATESTAMP)" -name *.o >/dev/null 2>&1; echo $$?),0)
+# ifneq ($(wildcard $(BUILDDIR)/.*),)
+# SKIPPED_SOURCES := $(foreach fname,$(SOURCES),$(shell find $(BUILDDIR) -type f -newer $(fname) -name *.o | grep "$(basename $(notdir $(fname))).o" 2>/dev/null))
+# override SOURCE_COUNT := $(shell expr $(SOURCE_COUNT) - $(words $(SKIPPED_SOURCES)))
+# ifeq ($(SOURCE_COUNT),0)
+# override SOURCE_COUNT = $(words $(SOURCES))
+# endif
+# endif
+# PROGRESS = expr $$(find $(BUILDDIR) -type f -newermt "$(DATESTAMP)" -name *.o | wc -l || echo 1) '*' 90 / $(SOURCE_COUNT) | cut -c1-2
+#else
+# PROGRESS = expr $$(find $(BUILDDIR) -type f -name *.o | wc -l || echo 1) '*' 90 / $(SOURCE_COUNT) | cut -c1-2
+#endif
P := %%
@@ -171,8 +174,7 @@ info:
@printf "\033[1;95mLDFLAGS \033[1;92m+| \033[0;37m\$$(\033[93mLDCXXFLAGS\033[37m) \$$(\033[94mOPTFLAGS\033[37m) \$$(\033[91mWARNFLAGS\033[37m)\n"
info-quiet:
- @sleep 0.1 2>/dev/null || true
- @printf "\n\033[1;92mBuilding btop++ \033[91m(\033[97mv$(BTOP_VERSION)\033[91m) \033[93m$(PLATFORM) \033[96m$(ARCH)\033[0m\n"
+ @printf "Building btop++\n"
help:
@printf " $(BANNER)\n"
@@ -194,8 +196,7 @@ directories:
#? Clean only Objects
clean:
- @printf "\033[1;91mRemoving: \033[1;97mbuilt objects...\033[0m\n"
- @rm -rf $(BUILDDIR)
+ rm -rf $(BUILDDIR)
#? Clean Objects and Binaries
distclean: clean
@@ -249,21 +250,12 @@ uninstall:
#? Link
.ONESHELL:
btop: $(OBJECTS)
- @sleep 0.2 2>/dev/null || true
- @TSTAMP=$$(date +%s 2>/dev/null || echo "0")
- @$(QUIET) || printf "\n\033[1;92mLinking and optimizing binary\033[37m...\033[0m\n"
- @$(CXX) -o $(TARGETDIR)/btop $^ $(LDFLAGS) || exit 1
- @printf "\033[1;92m100$(P) -> \033[1;37m$(TARGETDIR)/btop \033[100D\033[38C\033[1;93m(\033[1;97m$$(du -ah $(TARGETDIR)/btop | cut -f1)iB\033[1;93m) \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$(date +%s 2>/dev/null || echo "0") - $${TSTAMP} 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo '')\033[92m)\033[0m\n"
- @printf "\n\033[1;92mBuild complete in \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$(date +%s 2>/dev/null || echo "0") - $(TIMESTAMP) 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo "unknown")\033[92m)\033[0m\n"
+ $(CXX) -o $(TARGETDIR)/btop $^ $(LDFLAGS)
#? Compile
.ONESHELL:
$(BUILDDIR)/%.$(OBJEXT): $(SRCDIR)/%.$(SRCEXT)
- @sleep 0.3 2>/dev/null || true
- @TSTAMP=$$(date +%s 2>/dev/null || echo "0")
- @$(QUIET) || printf "\033[1;97mCompiling $<\033[0m\n"
- @$(CXX) $(CXXFLAGS) $(INC) -MMD -c -o $@ $< || exit 1
- @printf "\033[1;92m$$($(PROGRESS))$(P)\033[10D\033[5C-> \033[1;37m$@ \033[100D\033[38C\033[1;93m(\033[1;97m$$(du -ah $@ | cut -f1)iB\033[1;93m) \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$($(DATE_CMD) +%s 2>/dev/null || echo "0") - $${TSTAMP} 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo '')\033[92m)\033[0m\n"
+ $(CXX) $(CXXFLAGS) $(INC) -MMD -c -o $@ $<
#? Non-File Targets
.PHONY: all msg help pre
|