From fbc9e3a001ccf4ee93bf960026f8a38c07c92685 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 15 Nov 2025 12:06:38 +0100 Subject: [PATCH] make, scripts: Rename projects.py -> jw-projects.py projects.py is too unspecific, rename it to jw-projects.py. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 2 +- make/projects.mk | 2 +- make/topdir.mk | 2 +- scripts/create-mkspec.sh | 4 ++-- scripts/{projects.py => jw-projects.py} | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) rename scripts/{projects.py => jw-projects.py} (77%) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index cf734b89..0c6b73ef 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -131,7 +131,7 @@ EDITOR ?= xdg-open ifeq ($(TIME),) TIME = $(shell which time) -p endif -PROJECTS_PY = PYTHONPATH=$(realpath $(JWBDIR)/src/python) $(TIME) python3 $(JWB_SCRIPT_DIR)/projects.py --prefix $(shell pwd) $(PROJECTS_PY_EXTRA_OPTS) +PROJECTS_PY = PYTHONPATH=$(realpath $(JWBDIR)/src/python) $(TIME) python3 $(JWB_SCRIPT_DIR)/jw-projects.py --prefix $(shell pwd) $(PROJECTS_PY_EXTRA_OPTS) PROJECTS_PY_BUILD = $(PROJECTS_PY) build $(PROJECTS_PY_EXTRA_BUILD_OPTS) PGIT_SH = /bin/bash $(JWB_SCRIPT_DIR)/pgit.sh PURGE_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/purge-stale-projects.sh $(JW_BUILD_BINDIR)/purge-stale-projects.sh) purge-not-found) diff --git a/make/projects.mk b/make/projects.mk index cf71f918..9804f883 100644 --- a/make/projects.mk +++ b/make/projects.mk @@ -30,7 +30,7 @@ endif include $(JWBDIR)/make/py-version.mk ifneq ($(TOPDIR),) - proj_query_cmd = PYTHONPATH=$(JWBDIR)/src/python $(PYTHON) $(JWB_SCRIPT_DIR)/projects.py -p $(PROJECTS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS) + proj_query_cmd = PYTHONPATH=$(JWBDIR)/src/python $(PYTHON) $(JWB_SCRIPT_DIR)/jw-projects.py -p $(PROJECTS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS) proj_query = $(shell $(proj_query_cmd) $(1)) proj_dir = $(call proj_query,proj-dir $(1)) htdocs_dir = $(call proj_query,htdocs-dir $(1)) diff --git a/make/topdir.mk b/make/topdir.mk index 781a81f8..2420efbe 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -162,7 +162,7 @@ git-update-project-description: ssh $(JANWARE_USER)@git.janware.com "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(PROJECT)" projects-%: - $(PYTHON) $(JWB_SCRIPT_DIR)/projects.py build $* $(PROJECT) + $(PYTHON) $(JWB_SCRIPT_DIR)/jw-projects.py build $* $(PROJECT) install-deps-devel: sudo zypper in $(shell echo $(RPM_REQUIRES_DEVEL) | sed "s/ *= */-/g; s/ [^ ]\+-__NEXT_VERSION__//") diff --git a/scripts/create-mkspec.sh b/scripts/create-mkspec.sh index ad18c092..3ec2324a 100644 --- a/scripts/create-mkspec.sh +++ b/scripts/create-mkspec.sh @@ -41,8 +41,8 @@ subpackage_description() os_cascade() { - # might want to run python3 path/to/projects.py --os=suse-tumbleweed os-cascade - # or turn this into a python script and use projects.py as a module. + # might want to run python3 path/to/jw-projects.py --os=suse-tumbleweed os-cascade + # or turn this into a python script and use jw-projects.py as a module. if [ "$DISTRIBUTION" ]; then echo os linux $DISTRIBUTION | sed 's/\([^-]\+\)-\([^-]\+\)/\1 \1-\2/g' diff --git a/scripts/projects.py b/scripts/jw-projects.py similarity index 77% rename from scripts/projects.py rename to scripts/jw-projects.py index 08d0eceb..2c5c94d2 100644 --- a/scripts/projects.py +++ b/scripts/jw-projects.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # -*- coding: utf-8 -*- from jw.build.App import App