commit 9a27469a52ad20aefd48653b6836c49e65824e24 parent e75605959e02a6322de61714fcd5f025ed7bb64c Author: NunoSempere <nuno.semperelh@protonmail.com> Date: Thu, 14 Mar 2024 14:58:59 -0300 cleanup makefile slightly, restore ubuntu-20.04 files Diffstat:
16 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/.gitignore b/.gitignore diff --git a/license b/license @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022-2023 Nuño Sempere +Copyright (c) 2022-2024 Nuño Sempere Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/makefile b/makefile @@ -1,10 +1,10 @@ # C compiler CC=gcc # other options: tcc, clang, zig cc WARNINGS=-Wall -DEBUG= #'-g' -COMPILETIME_DEPRECATION_WARNINGS=#-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED # turns out that webkit2gtk-4.1 is using some deprecated stuff, lol +DEBUG=#'-g' OPTIMIZED_SOME=-O3 OPTIMIZED_MORE=-Ofast -march=native -funit-at-a-time -flto # binary will not be compatible with other computers, but may be much faster +# COMPILETIME_DEPRECATION_WARNINGS=#-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED # turns out that webkit2gtk-4.1 is using some deprecated stuff, lol # Dependencies DEPS='webkit2gtk-4.1' @@ -32,8 +32,8 @@ FORMATTER=clang-format -i -style=$(STYLE_BLUEPRINT) ## Data dirs USER=`whoami` DEFAULT_DATA_DIR=/home/nuno/.cache/rose -CURRENT_DATA_DIR=/home/$(USER)/.cache/rose -## dir +USER_DATA_DIR=/home/$(USER)/.cache/rose +## Startup image dir DEFAULT_DIR=/home/nuno/Documents/workspace/rosenrot CURRENT_DIR=`pwd` @@ -42,32 +42,16 @@ build: $(SRC) $(PLUGINS) $(CONFIG) cd plugins/readability/ && sh recompute_READABILITY_N.sh cd plugins/style && sh recompute_STYLE_N.sh # Make cache - mkdir -p $(CURRENT_DATA_DIR) + mkdir -p $(USER_DATA_DIR) # Hardcode cache path find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \ - sed -i "s|$(DEFAULT_DATA_DIR)|$(CURRENT_DATA_DIR)|g" {} + + sed -i "s|$(DEFAULT_DATA_DIR)|$(USER_DATA_DIR)|g" {} + # Hardcode git repository path find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \ sed -i "s|$(DEFAULT_DIR)|$(CURRENT_DIR)|g" {} + # Compile rosenrot GIO_MODULE_DIR=/usr/lib/x86_64-linux-gnu/gio/modules/ - $(CC) $(WARNINGS) $(OPTIMIZED_MORE) $(DEBUG) $(INCS) $(PLUGINS) $(SRC) $(COMPILETIME_DEPRECATION_WARNINGS) -o rose $(LIBS) $(ADBLOCK) - -fast: $(SRC) $(PLUGINS) $(CONFIG) - rm -f *.gcda - GIO_MODULE_DIR=/usr/lib/x86_64-linux-gnu/gio/modules/ - $(CC) $(WARNINGS) $(OPTIMIZED_MORE) -fprofile-generate $(INCS) $(PLUGINS) $(SRC) -o rose $(LIBS) $(ADBLOCK) - @echo "Now use the browser for a while to gather some profiling data" - sleep 2 - ./rose - $(CC) $(WARNINGS) $(OPTIMIZED_MORE) -fprofile-use $(INCS) $(PLUGINS) $(SRC) -o rose $(LIBS) $(ADBLOCK) - rm -f *.gcda - -lint: - clang-tidy $(SRC) $(PLUGINS) -- -Wall -O3 `pkg-config --cflags 'webkit2gtk-4.1'` -o rose `pkg-config --libs 'webkit2gtk-4.1'` - -inspect: build - GTK_DEBUG=interactive ./rose + $(CC) $(WARNINGS) $(OPTIMIZED_MORE) $(DEBUG) $(INCS) $(PLUGINS) $(SRC) -o rose $(LIBS) $(ADBLOCK) install: rose GIO_MODULE_DIR=/usr/lib/x86_64-linux-gnu/gio/modules/ @@ -91,6 +75,24 @@ clean: format: $(SRC) $(PLUGINS) $(FORMATTER) $(SRC) $(PLUGINS) $(rose.h) +lint: + clang-tidy $(SRC) $(PLUGINS) -- -Wall -O3 `pkg-config --cflags 'webkit2gtk-4.1'` -o rose `pkg-config --libs 'webkit2gtk-4.1'` + +## A few more commands: + +fast: $(SRC) $(PLUGINS) $(CONFIG) + rm -f *.gcda + GIO_MODULE_DIR=/usr/lib/x86_64-linux-gnu/gio/modules/ + $(CC) $(WARNINGS) $(OPTIMIZED_MORE) -fprofile-generate $(INCS) $(PLUGINS) $(SRC) -o rose $(LIBS) $(ADBLOCK) + @echo "Now use the browser for a while to gather some profiling data" + sleep 2 + ./rose + $(CC) $(WARNINGS) $(OPTIMIZED_MORE) -fprofile-use $(INCS) $(PLUGINS) $(SRC) -o rose $(LIBS) $(ADBLOCK) + rm -f *.gcda + +inspect: build + GTK_DEBUG=interactive ./rose + diagnose_deprecations: G_ENABLE_DIAGNOSTIC=1 ./rose diff --git a/user-scripts/.old/ubuntu-20.04/README.md b/user-scripts/.old/ubuntu-20.04/README.md @@ -1 +0,0 @@ -This uses the libwebkit2gtk-4.0 api. It is deprecated. See the debian version for how to use the -4.1 version instead. Package names might vary. diff --git a/user-scripts/ubuntu-20.04/README.md b/user-scripts/ubuntu-20.04/README.md @@ -0,0 +1 @@ +Code here uses the libwebkit2gtk-4.0 api. It is deprecated. See the debian version for how to use the -4.1 version instead. Package names might vary. diff --git a/user-scripts/.old/ubuntu-20.04/install-with-dependencies.sh b/user-scripts/ubuntu-20.04/install-with-dependencies.sh diff --git a/user-scripts/.old/ubuntu-20.04/rose-GIO_MODULE_DIR.desktop b/user-scripts/ubuntu-20.04/rose-GIO_MODULE_DIR.desktop diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-1.png b/user-scripts/ubuntu-20.04/rose-images/rose-1.png Binary files differ. diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-2.png b/user-scripts/ubuntu-20.04/rose-images/rose-2.png Binary files differ. diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-desktop-icon.png b/user-scripts/ubuntu-20.04/rose-images/rose-desktop-icon.png Binary files differ. diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage-1.6-zoom.png b/user-scripts/ubuntu-20.04/rose-images/rose-homepage-1.6-zoom.png Binary files differ. diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage-2.png b/user-scripts/ubuntu-20.04/rose-images/rose-homepage-2.png Binary files differ. diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage.png b/user-scripts/ubuntu-20.04/rose-images/rose-homepage.png Binary files differ. diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-src.txt b/user-scripts/ubuntu-20.04/rose-images/rose-src.txt diff --git a/user-scripts/.old/ubuntu-20.04/rose.desktop b/user-scripts/ubuntu-20.04/rose.desktop diff --git a/user-scripts/.old/ubuntu-20.04/rose.sh b/user-scripts/ubuntu-20.04/rose.sh
