Merge pull request #13 from ful1e5/dev

💅📦 GoogleDot Builder module updated

CHANGELOG.md

@@ -15,6 +15,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Makefile target re-arrange & installation process updated (Merged #10)
+- Compact code inside `builder/*`
+- Remove `setup.py`
+- Builder module renamed to `gdbuild`
+- Import `gdbuild` module directly inside `build.py`
+- Windows **True HiDPi Supports** inside build.py
 
 ## [v1.1.1] - 29 Mar 2021
 

builder/Makefile

@@ -13,17 +13,11 @@ WIN_CANVAS_SIZE ?= 32
 WIN_SIZE ?= 24
 
 clean:
-	@rm -rf src/*.egg-info build dist
 	@find -iname "*.pyc" -delete
+	@python3 -m pip uninstall -y clickgen
 
-	# Removing setup.py package files if installed
-	@if [ -f "files.txt" ]; then
-		@xargs rm -rf < files.txt
-		@rm -rf files.txt
-	@fi
-
-setup: setup.py
-	@python3 setup.py install --user --record files.txt
+setup:
+	@python3 -m pip install clickgen==1.1.9 --user
 
 build: setup build.py
 	@$(foreach theme,$(THEMES), python3 build.py -p "$(bitmaps_dir)/GoogleDot-$(theme)" --xsizes $(X_SIZES) --win-size $(WIN_SIZE) --win-canvas-size $(WIN_CANVAS_SIZE);)

builder/build.py

@@ -4,8 +4,8 @@
 import argparse
 from pathlib import Path
 
-from gbpkg.configure import get_config
-from gbpkg.generator import Info, build, wbuild, xbuild
+from gdbuild.configure import get_config
+from gdbuild.generator import Info, build, wbuild, xbuild
 
 parser = argparse.ArgumentParser(
     prog="google_dot_builder",
@@ -106,6 +106,12 @@
 x_out_dir = Path(args.out_dir) / name
 win_out_dir = Path(args.out_dir) / f"{name}-Windows"
 
+# 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(

builder/src/gbpkg/configure.py → builder/gdbuild/configure.py

@@ -4,7 +4,7 @@
 from typing import Any, Dict, Tuple, TypeVar
 
 from clickgen.util import PNGProvider
-from gbpkg.constants import WIN_CURSORS_CFG, WIN_DELAY, X_CURSORS_CFG, X_DELAY
+from .constants import WIN_CURSORS_CFG, WIN_DELAY, X_CURSORS_CFG, X_DELAY
 
 X = TypeVar("X")
 

builder/src/gbpkg/generator.py → builder/gdbuild/generator.py

@@ -7,8 +7,8 @@
 from clickgen.builders import WindowsCursor, XCursor
 from clickgen.core import CursorAlias
 from clickgen.packagers import WindowsPackager, XPackager
-from gbpkg.constants import AUTHOR, URL
-from gbpkg.symlinks import add_missing_xcursor
+from .constants import AUTHOR, URL
+from .symlinks import add_missing_xcursor
 
 
 class Info(NamedTuple):