Commit graph

100 commits

Author SHA1 Message Date
7152a811e9 topdir.mk: Add target git-pull-official
git-pull-official is currently an alias to git-pull-devops.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-11-24 11:34:03 +01:00
bf86f6c625 topdir.mk: Add targets git-pull-% and git-pull-maintainer
git-pull-% pulls whatever $(GIT_MAIN_BRANCH) happens to be
from the remote jw-% into the current branch, with --rebase and
--autostash.

git-pull-maintainer does the same with <maintainer>.  <maintainer> is
figured out from the configuration in projects.conf. If it's the
invoking user, origin is used.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-11-24 11:22:56 +01:00
fbc9e3a001 make, scripts: Rename projects.py -> jw-projects.py
projects.py is too unspecific, rename it to jw-projects.py.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-11-15 12:06:38 +01:00
2187d1b089 topdir.mk: Fix missing JANWARE_USER for git.janware.com login
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-01-12 14:36:38 +00:00
b35b87009b topdir.mk: Add pkg-manager targets
Add targets also present in projects-dir.mk:

  - Pkg-manager-refresh
  - Pkg-manager-install-build-deps
  - Pkg-manager-install-release-deps

Signed-off-by: Jan Lindemann <jan@janware.com>
2020-11-11 16:16:42 +00:00
6bdb16878a make: Replace "pereq" in targets by "deps"
"prereq" is simply impossible to use in explanations with a straight face.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-07 19:21:08 +00:00
31d11febd8 python-cli.mk, topdir.mk: Python2 -> $(PYTHON)
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-06 14:39:33 +00:00
07abf3f93e topdir.mk + dirs.mk fix: $(PREREQ_DIRS_DONE) was not checked
dirs-all.done doesn\'t check $(PREREQ_DIRS_DONE), this commit fixes that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-07-01 17:37:10 +00:00
bdd66dbc26 Everywhere: Rename MOD_SCRIPT_DIR -> JWB_SCRIPT_DIR
Follow name change of MODDIR -> JWBDIR.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 21:45:24 +00:00
b2d6e6f554 Everywhere: Rename MODDIR -> JWBDIR
Rename the omnipresent MODDIR variable to JWBDIR, since that's more to the
point.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 21:34:18 +00:00
3985c929ae topdir.mk: Ignore SUBDIRS without Makefile
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 19:09:08 +00:00
9b41d4eefc dev-utils.mk, list-files.mk, topdir.mk: Extract from dev-utils.mk and topdir.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-13 11:11:20 +00:00
7abbf1d044 projects.py: Rename command requires-pkg to required-os-pkg
Rename command requires-pkg to required-os-pkg to avoid confusion with
pkg-reqires. The command could be merged into pkg-requires at a later time.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-11 10:46:23 +00:00
4a1c5b94df topdir.mk: Make git-init-remote more robust (at least in theory)
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-13 15:45:01 +00:00
4d9d10540b topdir.mk: Use $(PROJECT) instead of $(RPM_PROJECT) for git
Identify the remote's name by $(PROJECT) instead of $(RPM_PROJECT) now.
Don't know the exact rationale for $(RPM_PROJECT), but in case of
arm-none-eabi-mcu-blink it was certainly wrong.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-13 12:37:25 +00:00
92d3d9c36d topdir.mk: Remove target list-files et al
These are now in dev-utils.mk (which isn't included from topdir.mk)

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-12 11:52:39 +00:00
685d642b9e topdir.mk: Topdir.mk add subdir exe as an alias for utils
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-06 12:48:28 +00:00
aa85417a17 Everywhere: Purge spaces in text files
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-06 12:38:20 +00:00
0eaef0c326 conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
f40356cf59 make/*.mk: More performance tweaks
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-02-28 16:12:58 +00:00
9fd2f3f9ec topdir.mk: Remove *dist* with topdir.distclean
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:20 +00:00
6a4092b8af topdir.mk: Don't set default SUBDIRS if ORDERED_SUBDIRS is set
If ORDERED_SUBDIRS is set, SUBDIRS should by default start with
$(ORDERED_SUBDIRS), and filled up with what $(FIND_SUBDIRS) turns up.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:07 +00:00
c17d563991 topdir.mk: Run make git-update-project-description after initializing git repo
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-03 11:33:31 +00:00
14c451854b projects.mk, topdir.mk: Minor code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 17:03:53 +00:00
823840d823 topdir.mk: Add target echo-hash to topdir.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 18:45:24 +00:00
e827efadd5 make, scripts: Replace list-vcs-files.sh by scm.sh ls-files
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 10:30:49 +00:00
9b532fd601 make, scripts: Rename list-cvs-files.sh to list-vcs-files.sh
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-13 18:15:12 +00:00
567dc2295a git-submod.mk, topdir.mk: Replace git.jannet.de by git.janware.com
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-11 15:07:39 +00:00
853d401d62 topdir.mk: Add target git-ssh-%
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-18 18:30:17 +00:00
1d0d09d11c topdir.mk: Add target git-ssh
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-18 18:26:02 +00:00
cd2efda598 topdir.mk: Replace jw-build's build.py by projects.py
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 11:26:10 +00:00
5b8c7fe738 topdir.mk: Fix wrong command in echo-prereq-build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-06 16:36:05 +00:00
5b737e50f8 defs.mk, dirs.mk, topdir.mk: Beautify cat-makefiles target output
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-04 10:01:10 +00:00
098a5f2a80 topdir.mk, pkg-manager.sh: Add archlinux package dependencies
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-02 14:10:48 +00:00
e68d4eb83b make, scripts: Now excplicitly calling python2 executable instead of python
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-02 13:12:00 +00:00
f70465cbd5 make: Replace pwd by $(PWD)
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-18 13:45:55 +00:00
f5c43f706a make: Replace some executables by absolute paths to improve performance
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-09-02 19:26:52 +00:00
b35a50944c project.conf, topdir.mk, projects.py: Replace pkg.required.xxx by pkg.requires.xxx
This opens up a more concise handling of pkg.conflicts.xxx in the future, and
prepares some code simplification in projects.py.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-06-26 09:33:53 +00:00
6be9da9d37 topdir.mk: Fix broken description creation
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-06-25 16:26:46 +00:00
48735e0c10 swig.mk: Add support for NON_C_BINDING preprocessor directive
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-06-01 14:03:57 +00:00
824e1795e9 topdir.mk: Add command echo-files
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-05-25 09:54:57 +00:00
1ff58ea7c5 topdir.mk: Add target git-update-project-description
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-04-12 19:45:36 +00:00
f136beba39 topdir.mk: Add htdocs and tmpl to standard directories
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-04-11 13:39:47 +00:00
14e8c9e279 Fix: Target echo-prereq-build asked the wrong tree
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-04-07 15:42:14 +00:00
55fa0eaec5 $(TOPDIR), make, scripts: Search-and-replace ytools -> jw-build
This project was copied from ytools, with anything not related to providing
build-functionality left out. This commit replaces the occurences of ytools
with jw-build, and removes some but most certainly not all legacy ytools
references.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-04-07 12:15:48 +00:00
d1d6f5d460 topdir.mk: Add target echo-prereq-build
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-04-05 13:31:19 +00:00
0e3a59a23d topdir.mk: Fix for JANWARE_USER not equal id -un, untested
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-12-07 13:30:06 +00:00
90157c6802 topdir.mk: Add support for OPT_JANWARE_PROJECT
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-11-27 15:55:08 +00:00
13c777047b topdir.mk, git-init-remote fix: Push failed because of missing commit before
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-05-08 13:11:06 +00:00
158070988d topdir.mk: Derive remote Git dir from RPM_PROJECT
- Derive remote Git dir from RPM_PROJECT instead of PROJECT
  - Add support for existing git dirs

Signed-off-by: Jan Lindemann <jan@janware.com>
2016-04-30 16:38:32 +00:00