From 9a27469a52ad20aefd48653b6836c49e65824e24 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Thu, 14 Mar 2024 14:58:59 -0300 Subject: cleanup makefile slightly, restore ubuntu-20.04 files --- .gitignore | 0 license | 2 +- makefile | 48 +++++++++++---------- user-scripts/.old/ubuntu-20.04/README.md | 1 - .../.old/ubuntu-20.04/install-with-dependencies.sh | 24 ----------- .../.old/ubuntu-20.04/rose-GIO_MODULE_DIR.desktop | 9 ---- .../.old/ubuntu-20.04/rose-images/rose-1.png | Bin 640116 -> 0 bytes .../.old/ubuntu-20.04/rose-images/rose-2.png | Bin 485022 -> 0 bytes .../ubuntu-20.04/rose-images/rose-desktop-icon.png | Bin 756923 -> 0 bytes .../rose-images/rose-homepage-1.6-zoom.png | Bin 104014 -> 0 bytes .../ubuntu-20.04/rose-images/rose-homepage-2.png | Bin 145422 -> 0 bytes .../ubuntu-20.04/rose-images/rose-homepage.png | Bin 485022 -> 0 bytes .../.old/ubuntu-20.04/rose-images/rose-src.txt | 1 - user-scripts/.old/ubuntu-20.04/rose.desktop | 9 ---- user-scripts/.old/ubuntu-20.04/rose.sh | 3 -- user-scripts/ubuntu-20.04/README.md | 1 + .../ubuntu-20.04/install-with-dependencies.sh | 24 +++++++++++ .../ubuntu-20.04/rose-GIO_MODULE_DIR.desktop | 9 ++++ user-scripts/ubuntu-20.04/rose-images/rose-1.png | Bin 0 -> 640116 bytes user-scripts/ubuntu-20.04/rose-images/rose-2.png | Bin 0 -> 485022 bytes .../ubuntu-20.04/rose-images/rose-desktop-icon.png | Bin 0 -> 756923 bytes .../rose-images/rose-homepage-1.6-zoom.png | Bin 0 -> 104014 bytes .../ubuntu-20.04/rose-images/rose-homepage-2.png | Bin 0 -> 145422 bytes .../ubuntu-20.04/rose-images/rose-homepage.png | Bin 0 -> 485022 bytes user-scripts/ubuntu-20.04/rose-images/rose-src.txt | 1 + user-scripts/ubuntu-20.04/rose.desktop | 9 ++++ user-scripts/ubuntu-20.04/rose.sh | 3 ++ 27 files changed, 73 insertions(+), 71 deletions(-) delete mode 100644 .gitignore delete mode 100644 user-scripts/.old/ubuntu-20.04/README.md delete mode 100644 user-scripts/.old/ubuntu-20.04/install-with-dependencies.sh delete mode 100755 user-scripts/.old/ubuntu-20.04/rose-GIO_MODULE_DIR.desktop delete mode 100644 user-scripts/.old/ubuntu-20.04/rose-images/rose-1.png delete mode 100644 user-scripts/.old/ubuntu-20.04/rose-images/rose-2.png delete mode 100644 user-scripts/.old/ubuntu-20.04/rose-images/rose-desktop-icon.png delete mode 100644 user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage-1.6-zoom.png delete mode 100644 user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage-2.png delete mode 100644 user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage.png delete mode 100644 user-scripts/.old/ubuntu-20.04/rose-images/rose-src.txt delete mode 100755 user-scripts/.old/ubuntu-20.04/rose.desktop delete mode 100755 user-scripts/.old/ubuntu-20.04/rose.sh create mode 100644 user-scripts/ubuntu-20.04/README.md create mode 100644 user-scripts/ubuntu-20.04/install-with-dependencies.sh create mode 100755 user-scripts/ubuntu-20.04/rose-GIO_MODULE_DIR.desktop create mode 100644 user-scripts/ubuntu-20.04/rose-images/rose-1.png create mode 100644 user-scripts/ubuntu-20.04/rose-images/rose-2.png create mode 100644 user-scripts/ubuntu-20.04/rose-images/rose-desktop-icon.png create mode 100644 user-scripts/ubuntu-20.04/rose-images/rose-homepage-1.6-zoom.png create mode 100644 user-scripts/ubuntu-20.04/rose-images/rose-homepage-2.png create mode 100644 user-scripts/ubuntu-20.04/rose-images/rose-homepage.png create mode 100644 user-scripts/ubuntu-20.04/rose-images/rose-src.txt create mode 100755 user-scripts/ubuntu-20.04/rose.desktop create mode 100755 user-scripts/ubuntu-20.04/rose.sh diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/license b/license index 1f76182..514be1d 100644 --- 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 index 084f15f..03c8129 100644 --- 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 deleted file mode 100644 index 2b1a61a..0000000 --- a/user-scripts/.old/ubuntu-20.04/README.md +++ /dev/null @@ -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/.old/ubuntu-20.04/install-with-dependencies.sh b/user-scripts/.old/ubuntu-20.04/install-with-dependencies.sh deleted file mode 100644 index 25721db..0000000 --- a/user-scripts/.old/ubuntu-20.04/install-with-dependencies.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Key dependencies -sudo apt install git vim gcc make -sudo apt install libwebkit2gtk-4.0-dev - -# Optional adblock -git clone https://github.com/jun7/wyebadblock -cd wyebadblock -sudo apt install gstreamer1.0-plugins-good gstreamer1.0-libav -make -sudo make install -cd .. -mkdir -p ~/.config/wyebadblock -cd ~/.config/wyebadblock -wget https://easylist.to/easylist/easylist.txt -cd - - -cd ../.. -make build # or just make -sudo make install - -cd - -# Ubuntu desktop icon -chmod +x rose.desktop -sudo cp rose.desktop /usr/share/applications diff --git a/user-scripts/.old/ubuntu-20.04/rose-GIO_MODULE_DIR.desktop b/user-scripts/.old/ubuntu-20.04/rose-GIO_MODULE_DIR.desktop deleted file mode 100755 index 9eb5add..0000000 --- a/user-scripts/.old/ubuntu-20.04/rose-GIO_MODULE_DIR.desktop +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env xdg-open -[Desktop Entry] -Version=1.0 -Type=Application -Terminal=false -Exec=/home/nuno/Documents/workspace/rosenrot/user-scripts/ubuntu-20.04/rose.sh %u -Name=Rose -Comment=Minimalistic browser -Icon=/home/nuno/Documents/workspace/rosenrot/user-scripts/ubuntu-20.04/rose-images/rose-desktop-icon.png diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-1.png b/user-scripts/.old/ubuntu-20.04/rose-images/rose-1.png deleted file mode 100644 index f2c546a..0000000 Binary files a/user-scripts/.old/ubuntu-20.04/rose-images/rose-1.png and /dev/null differ diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-2.png b/user-scripts/.old/ubuntu-20.04/rose-images/rose-2.png deleted file mode 100644 index 9944beb..0000000 Binary files a/user-scripts/.old/ubuntu-20.04/rose-images/rose-2.png and /dev/null differ diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-desktop-icon.png b/user-scripts/.old/ubuntu-20.04/rose-images/rose-desktop-icon.png deleted file mode 100644 index 163494f..0000000 Binary files a/user-scripts/.old/ubuntu-20.04/rose-images/rose-desktop-icon.png and /dev/null differ diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage-1.6-zoom.png b/user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage-1.6-zoom.png deleted file mode 100644 index 97183ac..0000000 Binary files a/user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage-1.6-zoom.png and /dev/null differ diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage-2.png b/user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage-2.png deleted file mode 100644 index 2770c78..0000000 Binary files a/user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage-2.png and /dev/null differ diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage.png b/user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage.png deleted file mode 100644 index 9944beb..0000000 Binary files a/user-scripts/.old/ubuntu-20.04/rose-images/rose-homepage.png and /dev/null differ diff --git a/user-scripts/.old/ubuntu-20.04/rose-images/rose-src.txt b/user-scripts/.old/ubuntu-20.04/rose-images/rose-src.txt deleted file mode 100644 index 30650de..0000000 --- a/user-scripts/.old/ubuntu-20.04/rose-images/rose-src.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/user-scripts/.old/ubuntu-20.04/rose.desktop b/user-scripts/.old/ubuntu-20.04/rose.desktop deleted file mode 100755 index 94e5b04..0000000 --- a/user-scripts/.old/ubuntu-20.04/rose.desktop +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env xdg-open -[Desktop Entry] -Version=1.0 -Type=Application -Terminal=false -Exec=/bin/rose %u -Name=Rose -Comment=Minimalistic browser -Icon=/home/nuno/Documents/workspace/rosenrot/user-scripts/ubuntu-20.04/rose-images/rose-desktop-icon.png diff --git a/user-scripts/.old/ubuntu-20.04/rose.sh b/user-scripts/.old/ubuntu-20.04/rose.sh deleted file mode 100755 index 62baac9..0000000 --- a/user-scripts/.old/ubuntu-20.04/rose.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -GIO_MODULE_DIR=/usr/lib/x86_64-linux-gnu/gio/modules/ /bin/rose "$1" - diff --git a/user-scripts/ubuntu-20.04/README.md b/user-scripts/ubuntu-20.04/README.md new file mode 100644 index 0000000..5fcc6f4 --- /dev/null +++ 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/ubuntu-20.04/install-with-dependencies.sh b/user-scripts/ubuntu-20.04/install-with-dependencies.sh new file mode 100644 index 0000000..25721db --- /dev/null +++ b/user-scripts/ubuntu-20.04/install-with-dependencies.sh @@ -0,0 +1,24 @@ +# Key dependencies +sudo apt install git vim gcc make +sudo apt install libwebkit2gtk-4.0-dev + +# Optional adblock +git clone https://github.com/jun7/wyebadblock +cd wyebadblock +sudo apt install gstreamer1.0-plugins-good gstreamer1.0-libav +make +sudo make install +cd .. +mkdir -p ~/.config/wyebadblock +cd ~/.config/wyebadblock +wget https://easylist.to/easylist/easylist.txt +cd - + +cd ../.. +make build # or just make +sudo make install + +cd - +# Ubuntu desktop icon +chmod +x rose.desktop +sudo cp rose.desktop /usr/share/applications diff --git a/user-scripts/ubuntu-20.04/rose-GIO_MODULE_DIR.desktop b/user-scripts/ubuntu-20.04/rose-GIO_MODULE_DIR.desktop new file mode 100755 index 0000000..9eb5add --- /dev/null +++ b/user-scripts/ubuntu-20.04/rose-GIO_MODULE_DIR.desktop @@ -0,0 +1,9 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Version=1.0 +Type=Application +Terminal=false +Exec=/home/nuno/Documents/workspace/rosenrot/user-scripts/ubuntu-20.04/rose.sh %u +Name=Rose +Comment=Minimalistic browser +Icon=/home/nuno/Documents/workspace/rosenrot/user-scripts/ubuntu-20.04/rose-images/rose-desktop-icon.png diff --git a/user-scripts/ubuntu-20.04/rose-images/rose-1.png b/user-scripts/ubuntu-20.04/rose-images/rose-1.png new file mode 100644 index 0000000..f2c546a Binary files /dev/null and b/user-scripts/ubuntu-20.04/rose-images/rose-1.png differ diff --git a/user-scripts/ubuntu-20.04/rose-images/rose-2.png b/user-scripts/ubuntu-20.04/rose-images/rose-2.png new file mode 100644 index 0000000..9944beb Binary files /dev/null and b/user-scripts/ubuntu-20.04/rose-images/rose-2.png differ diff --git a/user-scripts/ubuntu-20.04/rose-images/rose-desktop-icon.png b/user-scripts/ubuntu-20.04/rose-images/rose-desktop-icon.png new file mode 100644 index 0000000..163494f Binary files /dev/null and b/user-scripts/ubuntu-20.04/rose-images/rose-desktop-icon.png differ diff --git a/user-scripts/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 new file mode 100644 index 0000000..97183ac Binary files /dev/null and b/user-scripts/ubuntu-20.04/rose-images/rose-homepage-1.6-zoom.png differ diff --git a/user-scripts/ubuntu-20.04/rose-images/rose-homepage-2.png b/user-scripts/ubuntu-20.04/rose-images/rose-homepage-2.png new file mode 100644 index 0000000..2770c78 Binary files /dev/null and b/user-scripts/ubuntu-20.04/rose-images/rose-homepage-2.png differ diff --git a/user-scripts/ubuntu-20.04/rose-images/rose-homepage.png b/user-scripts/ubuntu-20.04/rose-images/rose-homepage.png new file mode 100644 index 0000000..9944beb Binary files /dev/null and b/user-scripts/ubuntu-20.04/rose-images/rose-homepage.png differ diff --git a/user-scripts/ubuntu-20.04/rose-images/rose-src.txt b/user-scripts/ubuntu-20.04/rose-images/rose-src.txt new file mode 100644 index 0000000..30650de --- /dev/null +++ b/user-scripts/ubuntu-20.04/rose-images/rose-src.txt @@ -0,0 +1 @@ + diff --git a/user-scripts/ubuntu-20.04/rose.desktop b/user-scripts/ubuntu-20.04/rose.desktop new file mode 100755 index 0000000..94e5b04 --- /dev/null +++ b/user-scripts/ubuntu-20.04/rose.desktop @@ -0,0 +1,9 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Version=1.0 +Type=Application +Terminal=false +Exec=/bin/rose %u +Name=Rose +Comment=Minimalistic browser +Icon=/home/nuno/Documents/workspace/rosenrot/user-scripts/ubuntu-20.04/rose-images/rose-desktop-icon.png diff --git a/user-scripts/ubuntu-20.04/rose.sh b/user-scripts/ubuntu-20.04/rose.sh new file mode 100755 index 0000000..62baac9 --- /dev/null +++ b/user-scripts/ubuntu-20.04/rose.sh @@ -0,0 +1,3 @@ +#!/bin/sh +GIO_MODULE_DIR=/usr/lib/x86_64-linux-gnu/gio/modules/ /bin/rose "$1" + -- cgit v1.2.3