From 961e15a816f594ceed021833cdeb70db84746c2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Tue, 29 Sep 2020 21:45:00 +0200 Subject: [PATCH] Improve build scripts --- src/themes/Kali/assets-renderer/gtk2/Makefile | 48 ++++++++----------- .../Kali/assets-renderer/gtk2/assets.txt | 5 -- .../Kali/assets-renderer/gtk2/menu_assets.txt | 5 ++ src/themes/Kali/assets-renderer/gtk3/Makefile | 15 +++--- .../Kali/assets-renderer/xfwm4/Makefile | 21 ++++---- src/themes/Kali/sass/Makefile | 39 +++++++-------- src/themes/Makefile | 8 ++-- src/themes/Makefile.inc | 3 ++ 8 files changed, 68 insertions(+), 76 deletions(-) create mode 100644 src/themes/Kali/assets-renderer/gtk2/menu_assets.txt create mode 100644 src/themes/Makefile.inc diff --git a/src/themes/Kali/assets-renderer/gtk2/Makefile b/src/themes/Kali/assets-renderer/gtk2/Makefile index ab69a818..e9584480 100644 --- a/src/themes/Kali/assets-renderer/gtk2/Makefile +++ b/src/themes/Kali/assets-renderer/gtk2/Makefile @@ -1,5 +1,4 @@ -INKSCAPE=/usr/bin/inkscape -OPTIPNG=/usr/bin/optipng +include ../../../Makefile.inc SRC_FILE=assets.svg ASSETS_DIR=assets @@ -9,50 +8,43 @@ ASSETS_DIR_DARK=assets-dark MENU_TOOLBAR_DIR=menubar-toolbar -INDEX=assets.txt +ASSETS=$(shell xargs < assets.txt) +MENU_ASSETS=$(shell xargs < menu_assets.txt) +DARK_MENU_EXTRA_ASSETS=button button-hover button-active button-insensitive THEMES_DIR=../../../../../share/themes/ .PHONY: build clean build: $(SRC_FILE) $(SRC_FILE_DARK) mkdir -p $(ASSETS_DIR) $(ASSETS_DIR_DARK) $(MENU_TOOLBAR_DIR) - for i in $$(xargs < $(INDEX)) ; \ + for i in $(ASSETS) $(MENU_ASSETS) ; \ do \ echo ; \ echo Rendering $(ASSETS_DIR)/$$i.png ; \ $(INKSCAPE) --export-id=$$i \ --export-id-only \ --export-png=$(ASSETS_DIR)/$$i.png $(SRC_FILE) > /dev/null 2>&1 \ - && $(OPTIPNG) -o7 --quiet $(ASSETS_DIR)/$$i.png ; \ + && $(OPTIPNG) $(ASSETS_DIR)/$$i.png ; \ echo ; \ echo Rendering $(ASSETS_DIR_DARK)/$$i.png ; \ $(INKSCAPE) --export-id=$$i \ --export-id-only \ --export-png=$(ASSETS_DIR_DARK)/$$i.png $(SRC_FILE_DARK) > /dev/null 2>&1 \ - && $(OPTIPNG) -o7 --quiet $(ASSETS_DIR_DARK)/$$i.png ; \ + && $(OPTIPNG) $(ASSETS_DIR_DARK)/$$i.png ; \ done - cp $(ASSETS_DIR)/entry-toolbar.png $(MENU_TOOLBAR_DIR)/entry-toolbar.png - cp $(ASSETS_DIR)/entry-active-toolbar.png $(MENU_TOOLBAR_DIR)/entry-active-toolbar.png - cp $(ASSETS_DIR)/entry-disabled-toolbar.png $(MENU_TOOLBAR_DIR)/entry-disabled-toolbar.png - cp $(ASSETS_DIR)/menubar.png $(MENU_TOOLBAR_DIR)/menubar.png - cp $(ASSETS_DIR)/menubar_button.png $(MENU_TOOLBAR_DIR)/menubar_button.png - cp $(ASSETS_DIR_DARK)/button.png $(MENU_TOOLBAR_DIR)/button.png - cp $(ASSETS_DIR_DARK)/button-hover.png $(MENU_TOOLBAR_DIR)/button-hover.png - cp $(ASSETS_DIR_DARK)/button-active.png $(MENU_TOOLBAR_DIR)/button-active.png - cp $(ASSETS_DIR_DARK)/button-insensitive.png $(MENU_TOOLBAR_DIR)/button-insensitive.png - cp $(ASSETS_DIR_DARK)/entry-toolbar.png $(MENU_TOOLBAR_DIR)/entry-toolbar-dark.png - cp $(ASSETS_DIR_DARK)/entry-active-toolbar.png $(MENU_TOOLBAR_DIR)/entry-active-toolbar-dark.png - cp $(ASSETS_DIR_DARK)/entry-disabled-toolbar.png $(MENU_TOOLBAR_DIR)/entry-disabled-toolbar-dark.png - cp $(ASSETS_DIR_DARK)/menubar.png $(MENU_TOOLBAR_DIR)/menubar-dark.png - cp $(ASSETS_DIR_DARK)/menubar_button.png $(MENU_TOOLBAR_DIR)/menubar_button-dark.png - mkdir -p $(THEMES_DIR)/Kali-Light/gtk-2.0/assets/ - cp assets/* $(THEMES_DIR)/Kali-Light/gtk-2.0/assets/ - mkdir -p $(THEMES_DIR)/Kali-Light/gtk-2.0/menubar-toolbar/ - cp menubar-toolbar/* $(THEMES_DIR)/Kali-Light/gtk-2.0/menubar-toolbar/ - mkdir -p $(THEMES_DIR)/Kali-Dark/gtk-2.0/assets/ - cp assets-dark/* $(THEMES_DIR)/Kali-Dark/gtk-2.0/assets/ - mkdir -p $(THEMES_DIR)/Kali-Dark/gtk-2.0/menubar-toolbar/ - cp menubar-toolbar/* $(THEMES_DIR)/Kali-Dark/gtk-2.0/menubar-toolbar/ + $(foreach ASSET, $(MENU_ASSETS), \ + cp $(ASSETS_DIR)/$(ASSET).png $(MENU_TOOLBAR_DIR)/$(ASSET).png && \ + cp $(ASSETS_DIR_DARK)/$(ASSET).png $(MENU_TOOLBAR_DIR)/$(ASSET)-dark.png &&) true + $(foreach ASSET, $(DARK_MENU_EXTRA_ASSETS), \ + cp $(ASSETS_DIR_DARK)/$(ASSET).png $(MENU_TOOLBAR_DIR)/$(ASSET).png &&) true + mkdir -p $(THEMES_DIR)Kali-Light/gtk-2.0/assets/ + cp assets/* $(THEMES_DIR)Kali-Light/gtk-2.0/assets/ + mkdir -p $(THEMES_DIR)Kali-Light/gtk-2.0/menubar-toolbar/ + cp menubar-toolbar/* $(THEMES_DIR)Kali-Light/gtk-2.0/menubar-toolbar/ + mkdir -p $(THEMES_DIR)Kali-Dark/gtk-2.0/assets/ + cp assets-dark/* $(THEMES_DIR)Kali-Dark/gtk-2.0/assets/ + mkdir -p $(THEMES_DIR)Kali-Dark/gtk-2.0/menubar-toolbar/ + cp menubar-toolbar/* $(THEMES_DIR)Kali-Dark/gtk-2.0/menubar-toolbar/ clean: -rm -r $(ASSETS_DIR) $(ASSETS_DIR_DARK) $(MENU_TOOLBAR_DIR) diff --git a/src/themes/Kali/assets-renderer/gtk2/assets.txt b/src/themes/Kali/assets-renderer/gtk2/assets.txt index 25a986b0..97491869 100644 --- a/src/themes/Kali/assets-renderer/gtk2/assets.txt +++ b/src/themes/Kali/assets-renderer/gtk2/assets.txt @@ -50,9 +50,6 @@ entry-disabled-bg entry-notebook entry-active-notebook entry-disabled-notebook -entry-toolbar -entry-active-toolbar -entry-disabled-toolbar combo-entry combo-entry-focus combo-entry-insensitive @@ -87,7 +84,6 @@ line-h line-v menu menuitem -menubar_button null tree_header progressbar @@ -121,5 +117,4 @@ tab-left-active tab-right-active inline-toolbar toolbar -menubar focus-line diff --git a/src/themes/Kali/assets-renderer/gtk2/menu_assets.txt b/src/themes/Kali/assets-renderer/gtk2/menu_assets.txt new file mode 100644 index 00000000..fafbbc75 --- /dev/null +++ b/src/themes/Kali/assets-renderer/gtk2/menu_assets.txt @@ -0,0 +1,5 @@ +entry-toolbar +entry-active-toolbar +entry-disabled-toolbar +menubar +menubar_button diff --git a/src/themes/Kali/assets-renderer/gtk3/Makefile b/src/themes/Kali/assets-renderer/gtk3/Makefile index c63ac5d4..3b786938 100644 --- a/src/themes/Kali/assets-renderer/gtk3/Makefile +++ b/src/themes/Kali/assets-renderer/gtk3/Makefile @@ -1,5 +1,4 @@ -INKSCAPE=/usr/bin/inkscape -OPTIPNG=/usr/bin/optipng +include ../../../Makefile.inc SRC_FILE=assets.svg ASSETS_DIR=assets @@ -19,19 +18,19 @@ build: $(SRC_FILE) $(INKSCAPE) --export-id=$$i \ --export-id-only \ --export-png=$(ASSETS_DIR)/$$i.png $(SRC_FILE) > /dev/null 2>&1 \ - && $(OPTIPNG) -o7 --quiet $(ASSETS_DIR)/$$i.png ; \ + && $(OPTIPNG) $(ASSETS_DIR)/$$i.png ; \ echo ; \ echo Rendering $(ASSETS_DIR)/$$i@2.png ; \ $(INKSCAPE) --export-id=$$i \ --export-dpi=180 \ --export-id-only \ --export-png=$(ASSETS_DIR)/$$i@2.png $(SRC_FILE) > /dev/null 2>&1 \ - && $(OPTIPNG) -o7 --quiet $(ASSETS_DIR)/$$i@2.png ; \ + && $(OPTIPNG) $(ASSETS_DIR)/$$i@2.png ; \ done - mkdir -p $(THEMES_DIR)/Kali-Light/gtk-3.0/assets/ - cp assets/* $(THEMES_DIR)/Kali-Light/gtk-3.0/assets/ - mkdir -p $(THEMES_DIR)/Kali-Dark/gtk-3.0/assets/ - cp assets/* $(THEMES_DIR)/Kali-Dark/gtk-3.0/assets/ + mkdir -p $(THEMES_DIR)Kali-Light/gtk-3.0/assets/ + cp assets/* $(THEMES_DIR)Kali-Light/gtk-3.0/assets/ + mkdir -p $(THEMES_DIR)Kali-Dark/gtk-3.0/assets/ + cp assets/* $(THEMES_DIR)Kali-Dark/gtk-3.0/assets/ clean: -rm -r $(ASSETS_DIR) diff --git a/src/themes/Kali/assets-renderer/xfwm4/Makefile b/src/themes/Kali/assets-renderer/xfwm4/Makefile index a93395c0..b82be567 100644 --- a/src/themes/Kali/assets-renderer/xfwm4/Makefile +++ b/src/themes/Kali/assets-renderer/xfwm4/Makefile @@ -1,5 +1,4 @@ -INKSCAPE=/usr/bin/inkscape -OPTIPNG=/usr/bin/optipng +include ../../../Makefile.inc ASSETS=assets*.svg INDEX=assets.txt @@ -19,29 +18,29 @@ build: $(ASSETS) $(INKSCAPE) --export-id=$$i \ --export-id-only \ --export-png=$$variant/$$i.png $$src_file > /dev/null 2>&1 \ - && $(OPTIPNG) -o7 --quiet $$variant/$$i.png ; \ + && $(OPTIPNG) $$variant/$$i.png ; \ echo ; \ echo Rendering $$variant@1.5/$$i.png ; \ $(INKSCAPE) --export-id=$$i \ --export-dpi=138 \ --export-id-only \ --export-png=$$variant@1.5/$$i.png $$src_file > /dev/null 2>&1 \ - && $(OPTIPNG) -o7 --quiet $$variant@1.5/$$i.png ; \ + && $(OPTIPNG) $$variant@1.5/$$i.png ; \ echo ; \ echo Rendering $$variant@2/$$i.png ; \ $(INKSCAPE) --export-id=$$i \ --export-dpi=192 \ --export-id-only \ --export-png=$$variant@2/$$i.png $$src_file > /dev/null 2>&1 \ - && $(OPTIPNG) -o7 --quiet $$variant@2/$$i.png ; \ + && $(OPTIPNG) $$variant@2/$$i.png ; \ done ; \ done - cp assets/* $(THEMES_DIR)/Kali-Light/xfwm4/ - cp assets-dark/* $(THEMES_DIR)/Kali-Dark/xfwm4/ - cp assets@1.5/* $(THEMES_DIR)/Kali-Light-HiDPI/xfwm4/ - cp assets-dark@1.5/* $(THEMES_DIR)/Kali-Dark-HiDPI/xfwm4/ - cp assets@2/* $(THEMES_DIR)/Kali-Light-xHiDPI/xfwm4/ - cp assets-dark@2/* $(THEMES_DIR)/Kali-Dark-xHiDPI/xfwm4/ + cp assets/* $(THEMES_DIR)Kali-Light/xfwm4/ + cp assets-dark/* $(THEMES_DIR)Kali-Dark/xfwm4/ + cp assets@1.5/* $(THEMES_DIR)Kali-Light-HiDPI/xfwm4/ + cp assets-dark@1.5/* $(THEMES_DIR)Kali-Dark-HiDPI/xfwm4/ + cp assets@2/* $(THEMES_DIR)Kali-Light-xHiDPI/xfwm4/ + cp assets-dark@2/* $(THEMES_DIR)Kali-Dark-xHiDPI/xfwm4/ clean: -rm -r assets assets@1.5 assets@2 assets-dark assets-dark@1.5 assets-dark@2 diff --git a/src/themes/Kali/sass/Makefile b/src/themes/Kali/sass/Makefile index 5cd49e02..388ca81c 100644 --- a/src/themes/Kali/sass/Makefile +++ b/src/themes/Kali/sass/Makefile @@ -1,33 +1,30 @@ -SCSS=sassc +include ../../../Makefile.inc + THEMES_DIR=../../../../share/themes/ .PHONY: build clean -build: - for scss in *.scss ; \ - do \ - echo ; \ - echo Generating $${scss%.scss}.css ; \ - $(SCSS) $$scss > $${scss%.scss}.css ; \ - done +build: $(patsubst %.scss, %.css, $(wildcard *.scss)) + mkdir -p $(THEMES_DIR)Kali-Light/gtk-3.0/applications + mkdir -p $(THEMES_DIR)Kali-Dark/gtk-3.0/applications + mkdir -p $(THEMES_DIR)Kali-Light/gnome-shell + mkdir -p $(THEMES_DIR)Kali-Dark/gnome-shell - mkdir -p $(THEMES_DIR)/Kali-Light/gtk-3.0/applications - mkdir -p $(THEMES_DIR)/Kali-Dark/gtk-3.0/applications - mkdir -p $(THEMES_DIR)/Kali-Light/gnome-shell - mkdir -p $(THEMES_DIR)/Kali-Dark/gnome-shell + cp -r gtk-sass/applications/* $(THEMES_DIR)Kali-Light/gtk-3.0/applications + cp -r gtk-sass/applications/* $(THEMES_DIR)Kali-Dark/gtk-3.0/applications - cp -r gtk-sass/applications/* $(THEMES_DIR)/Kali-Light/gtk-3.0/applications - cp -r gtk-sass/applications/* $(THEMES_DIR)/Kali-Dark/gtk-3.0/applications - - find $(THEMES_DIR)/Kali-*/gtk-3.0/applications \ + find $(THEMES_DIR)Kali-*/gtk-3.0/applications \ ! \( -type d -or -name "*.css" -or -name "*.scss" \) \ -exec rm {} \; - cp gtk.css $(THEMES_DIR)/Kali-Light/gtk-3.0/gtk.css - cp gtk-dark.css $(THEMES_DIR)/Kali-Light/gtk-3.0/gtk-dark.css - cp gtk-dark.css $(THEMES_DIR)/Kali-Dark/gtk-3.0/gtk.css - cp gnome-shell.css $(THEMES_DIR)/Kali-Light/gnome-shell/gnome-shell.css - cp gnome-shell-dark.css $(THEMES_DIR)/Kali-Dark/gnome-shell/gnome-shell.css + cp gtk.css $(THEMES_DIR)Kali-Light/gtk-3.0/gtk.css + cp gtk-dark.css $(THEMES_DIR)Kali-Light/gtk-3.0/gtk-dark.css + cp gtk-dark.css $(THEMES_DIR)Kali-Dark/gtk-3.0/gtk.css + cp gnome-shell.css $(THEMES_DIR)Kali-Light/gnome-shell/gnome-shell.css + cp gnome-shell-dark.css $(THEMES_DIR)Kali-Dark/gnome-shell/gnome-shell.css + +%.css: %.scss + $(SCSS) $< > $@ clean: -rm *.css diff --git a/src/themes/Makefile b/src/themes/Makefile index 9d8ecd80..8ec9016f 100644 --- a/src/themes/Makefile +++ b/src/themes/Makefile @@ -1,10 +1,12 @@ THEME_SRC=Kali/ SUBDIRS=$(foreach SUBDIR,gtk2 gtk3 xfwm4,assets-renderer/$(SUBDIR)) sass -.PHONY: build clean +.PHONY: build $(SUBDIRS) clean -build: - $(foreach SUBDIR,$(SUBDIRS),$(MAKE) -C $(THEME_SRC)$(SUBDIR) build &&) true +build: $(SUBDIRS) + +$(SUBDIRS): + $(MAKE) -C $(THEME_SRC)$@ build clean: $(foreach SUBDIR,$(SUBDIRS),$(MAKE) -C $(THEME_SRC)$(SUBDIR) clean &&) true diff --git a/src/themes/Makefile.inc b/src/themes/Makefile.inc new file mode 100644 index 00000000..fd72afbb --- /dev/null +++ b/src/themes/Makefile.inc @@ -0,0 +1,3 @@ +INKSCAPE=/usr/bin/inkscape +OPTIPNG=/usr/bin/optipng -o7 --strip all --quiet +SCSS=sassc