From d21546caeb1906d1feb28eea50a596277fa099c3 Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Tue, 6 Apr 2021 16:39:34 +0530 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=A4=9D=E2=80=8D?= =?UTF-8?q?=F0=9F=A7=91=20Group=20Make=20commands?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ Makefile | 57 +++++++++++++++++++++------------------------------- 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfeb2076..9cc4a8ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] +### Added + +### Changed + +- `Makefile` build commands re-arrange with groups + ## [Bibata v1.1.1] - 26 Mar 2021 ### Added diff --git a/Makefile b/Makefile index b1f17f1b..1e53e53f 100644 --- a/Makefile +++ b/Makefile @@ -1,57 +1,46 @@ all: clean render build +.PHONY: all + +# Default +clean: + @rm -rf bitmaps themes + +render: bitmapper svg + @cd bitmapper && make install render_modern render_original + +build: bitmaps + @cd builder && make setup build clean + + +# Specific platform build unix: clean render bitmaps @cd builder && make setup build_unix windows: clean render bitmaps @cd builder && make setup build_windows -.PHONY: all - -clean: - @rm -rf bitmaps themes - +# Bibata Modern modern: clean render_modern build_modern -original:clean render_original build_original - -# -# Render Bibata Bitmaps -# - -render: bitmapper svg - @cd bitmapper && make install render_modern render_original - -render_original: bitmapper svg - @cd bitmapper && make install render_original render_modern: bitmapper svg @cd bitmapper && make install render_modern -# -# Build Bibata Unix & Windows cursors -# - -build: bitmaps - @cd builder && make setup build clean - -build_unix: bitmaps - @rm -rf themes - @cd builder && make setup build_unix clean - -build_windows: bitmaps - @rm -rf themes - @cd builder && make setup build_windows clean - build_modern: bitmaps @cd builder && make setup build_modern clean + +# Bibata Original +original:clean render_original build_original + +render_original: bitmapper svg + @cd bitmapper && make install render_original + build_original: bitmaps @cd builder && make setup build_original clean -# -# Installation -# +# Installation .ONESHELL: SHELL:=/bin/bash From e616f06803604577f748bc5e4b0f69c313f44171 Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Wed, 7 Apr 2021 16:37:55 +0530 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=A6=F0=9F=94=A7=20Windows=20Cursor?= =?UTF-8?q?=20canvas=20dynamic=20size=20in=20"build.py"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- builder/bbpkg/configure.py | 6 ------ builder/build.py | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/builder/bbpkg/configure.py b/builder/bbpkg/configure.py index 4f4cbda4..44461f1c 100644 --- a/builder/bbpkg/configure.py +++ b/builder/bbpkg/configure.py @@ -82,12 +82,6 @@ def get_config(bitmaps_dir: Union[str, Path], **kwargs) -> Dict[str, Any]: canvas_size = win_data.get("canvas_size", w_canvas_size) win_size = win_data.get("size", w_size) - # Because provided cursor size is bigger than cursor's canvas. - # Also, "position" settings will not effect on cursor because the - # cursor's canvas and cursor sizes are equals. - if (win_size[0] > canvas_size[0]) | (win_size[1] > canvas_size[1]): - canvas_size = win_size - config[key] = { **data, "win_key": win_key, diff --git a/builder/build.py b/builder/build.py index 319d7c3f..d7fe7c9a 100644 --- a/builder/build.py +++ b/builder/build.py @@ -94,7 +94,8 @@ parser.add_argument( # Preparing build args = parser.parse_args() -bitmaps_dir = Path(args.png_dir).absolute() +bitmaps_dir = Path(args.png_dir) + name = bitmaps_dir.stem comments = { "Bibata-Modern-Classic": "Dark & Rounded-edge Bibata", @@ -104,22 +105,27 @@ comments = { "Bibata-Modern-Ice": "Light & Rounded-edge Bibata", "Bibata-Original-Ice": "Light & Sharp-edge Bibata", } +info = Info(name=name, comment=comments.get(name, f"{name} Cursors")) x_out_dir = Path(args.out_dir) / name win_out_dir = Path(args.out_dir) / f"{name}-Windows" -print(f"Getting '{name}' bitmaps ready for build...") +# Windows Canvas & Cursor sizes +win_size: int = args.win_size +win_canvas_size: int = args.win_canvas_size +if win_canvas_size < win_size: + win_canvas_size = win_size + +print(f"Getting '{name}' bitmaps ready for build...") config = get_config( bitmaps_dir, x_sizes=args.xsizes, - win_canvas_size=args.win_canvas_size, - win_size=args.win_size, + win_canvas_size=win_canvas_size, + win_size=win_size, ) -info = Info(name=name, comment=comments.get(name, f"{name} Cursors")) - if args.platform == "unix": xbuild(config, x_out_dir, info) elif args.platform == "windows": From cc87cbba2aa29863ccd43498bf1d611ffeae520e Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Wed, 7 Apr 2021 16:41:06 +0530 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=93=83=20Changes=20log=20added=20insi?= =?UTF-8?q?de=20"CHANGELOG.md"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cc4a8ab..ad4986b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - `Makefile` build commands re-arrange with groups +- Dynamic determine **Windows canvas size** on **Windows cursor size** inside build.py` ## [Bibata v1.1.1] - 26 Mar 2021