Commit graph

2,086 commits

Author SHA1 Message Date
fb2f57b7b9 py-mod.mk, py-rules.mk: Split up py-mod.mk in py-mod.mk and py-rules.mk
py-rules.mk is meant to be usable outside of a jw Python module
context, just for generating .pyc, for example

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-22 10:11:44 +00:00
3ddd952187 swig.mk: Swith to Python 3
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-22 09:32:31 +00:00
0ad800315d proj.mk: Remove references to cfg_dist.mk and cfg_dev.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-21 11:52:45 +00:00
5f396a1f95 defs.mk:: Define variables empty, space and comma
Move definitions of empty, space and comma from targets-tools.mk into
defs.mk.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-21 09:32:54 +00:00
6518c78297 cfg_dev.mk, cfg_dist.mk: Remove empty cfg_dist.mk cfg_dev.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-21 09:27:18 +00:00
753ad90160 project.conf: Make OpenEmbedded build work
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-19 10:11:02 +00:00
548b4bc960 subtree.mk: Beautify target dependencies
Not tested, but can't hurt to have the installed regular files
depend on their install directories

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-19 10:08:28 +00:00
a627b1273e projects-dir.mk: Beautify header
Remove CVS macros, because that breaks using it as a symlink from projects-dir,
and add SPDX-License-Identifier GPL2.0+.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-19 08:10:35 +00:00
2b7896d55f scripts.mk: Remove include defs-cpp.mk from scripts.mk
I don't know why it's there. This commit could break something.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 15:17:53 +00:00
0c04c0fccd project.conf: Add some dependencies for building with yocto
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 15:12:03 +00:00
ab51bdd20d proj.mk: Remove legacy variables
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 15:10:32 +00:00
cbbd8011e3 projects-dir.mk: Remove links.done machinery
Remove legacy links.done, since dspider-shared and dspider-btools are now
converted to git projects below the toplevel directory.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 10:22:19 +00:00
cbd944d254 rules.mk: Use $(CXX) instead of $(LD) for linking
CXX is used for linking instead of LD now, since LD might point to the real
linker, which doesn't understand -Wl,--blah options, of course.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 10:06:50 +00:00
b1187d9d8a rules.mk: Use $(CXX) instead of $(LD) for linking
CXX is used for linking instead of LD now, since LD might point to the real
linker, which doesn't understand -Wl,--blah options, of course.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 10:03:22 +00:00
458fe33260 conf/profile, make, scripts: Search-and-replace cvs.jannet.de -> cvs.janware.com
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 08:15:28 +00:00
7e811aa755 rpmdist.mk: Rename target tgz to pkg-tgz for consistency
Rename tgz to pkg-tgz, even though at this point it isn't functional

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 08:14:44 +00:00
d84260a2ad listfiles.mk: Fix cpio --directory option
cpio -D doesn't mean the same thing for different versions of cpio,
--directory does, so use that

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-13 11:50:10 +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
386f9304c6 py-defs.mk: Add automatic detection of PY_CPYTHON_PREFIX
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-11 08:47:46 +00:00
ab5fc0c334 py-defs.mk: Fix installation with predefined PY_INSTALL_DIR
Predefined PY_INSTALL_DIR was ignored prior to this commit, which shuffles the
py-defs.mk variables around considerably. Still some temporary variables
unnecessarily defined with ?=, but some testing would be good prior to further
changes.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-11 08:31:11 +00:00
42e01d9dd8 py-mod.mk: Fix python version conditional
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-11 07:41:45 +00:00
2852ca136d defs-cpp.mk: Code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-10 12:32:17 +00:00
4e9be149ef py-defs.mk: Fix PY_INSTALL_XXX_MOD generation
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-09 06:24:43 +00:00
0bf05a5959 projects-dir.mk: Add targets echo-projects and echo-target-projects
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-04 12:56:15 +00:00
c67ce9fa1b py-mod.mk: Make python compilation errors fatal
Pass doraise=True to py_compile.compile()

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-04 10:38:07 +00:00
f7b41f0652 mcu-flash.mk: Work around broken clean target
If MCU_BOARD_LC is empty, rm $(MCU_MEM|FLASH_FETCH_FILE_BIN) fails with unknown options.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-03 21:01:32 +00:00
c480eeaaca defs.mk, make.mk: Add CREATE_PKG_CONFIG variable
It was possible for DEVEL_TARGETS to contain install_PKG_CONFIG without a
package config file being built, fixed that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-03 09:06:41 +00:00
956aea82eb py-*.mk: Fix python version detection
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-03 08:00:39 +00:00
ae48f6aab6 projects-dir.mk: Ditch auto-detection of interactive use
PS1 isn't set if make is run interactively, which is why auto-detection of
interactive use doesn't work. Ditch that and introduce the INTERACTIVE
variable, which can be passed as INTERACTIVE=[y|n]. Default value als of now
is "n".

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-03 07:41:43 +00:00
13fa28e23f make, scripts: Flip some more switches from pathon 2 to 3 (untested!)
This commit flips some more switches from Python 2 to Python 3 in makefiles and
Python code. Build runs through, but it's still likely to break things.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-02 12:28:13 +00:00
0d2e255bff projects-dir.mk: Only clean projects which have .done files lying around
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-05-30 13:33:12 +00:00
5f92c65b0f project.conf: Add build dependency on xdg-utils
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-05-25 07:47:29 +00:00
fb22c800dc projects-dir.mk: Add xdg-utils to BASE_PKGS (for xdg-open)
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-05-25 07:35:32 +00:00
55cc335140 fix: PROJECT = jw-pf-3dprinter -> jw-pf
The contents of the PROJECT variable was misdetected from the directory name in
that everything after a number was discarded. This commit fixes that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-05-19 13:13:14 +00:00
09a4c0a89f js.mk: Beautify error for non-existent closure-compiler.jar
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-05-17 12:33:24 +00:00
91d7ba8aa4 projects-dir.mk: Add time to BASE_PKGS
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-05-16 20:34:07 +00:00
bdeb2be59b subtree.mk: Files were RPM-shipped with development user id
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-05-16 15:39:27 +00:00
a91420c3d2 defs-cpp.mk: Add support for openocd-st-xxx-jlink.cfg
Add support for openocd-st-nucleo-f103rb-jlink.cfg and
openocd-stmqspi-st-stm32f769i-disco-jlink.cfg

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-05-12 18:24:31 +00:00
73ced2f4ec debugger.mk performance: Don't run gdb if no core file is present
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-04-27 15:28:14 +00:00
49f269bdfe make: Modify only BUILD_*FLAGS in jw-build/make/*.mk
Assign only to BUILD_XXXFLAGS in jw-build/make/*.mk, and leave PROJECT_XXXFLAGS
and LOCAL_XXXFLAGS alone.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-04-10 06:43:40 +00:00
17a080138c make: Prefix BUILD_ to a couple of makefile variables
Rename variables to avoid collision:

  OBJ      -> BUILD_OBJ
  INCLUDE  -> BUILD_INCLUDE
  LIBFLAGS -> BUILD_LIBFLAGS
  LPPFLAGS -> BUILD_LPPFLAGS

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-04-08 18:26:45 +00:00
8e0bd97eae git-submod.mk: Fix multiple branches in SUBMOD_MAIN_BRANCH
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-04-08 13:18:47 +00:00
3ae0916ff4 defs-cpp.mk, platform.mk: Add support for st-disc1-f429i
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-04-04 14:36:38 +00:00
e7d9cc3701 defs-cpp.mk: Don't use -ldl for MinGW targets
-ldl breaks build on MinGW: cannot find -ldl

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-30 13:20:41 +00:00
32b9837373 defs.mk, mcu-exe.mk: Code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-30 10:47:48 +00:00
80f9466648 mcu-flash.mk: Prefix flash commands with time -p
Flashing 64MB of external flash turns out to be really slow

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-30 10:17:26 +00:00
c6fa2f3807 defs-cpp.mk, mcu-defs.mk: Do MCU_OPENOCD_CFG_NAME definition from one place
MCU_OPENOCD_CFG_NAME was defined in cfg-cpp.mk and mcu-defs.mk. Not sure which
is the best place, but have them compete is clearly the worst idea. This patch
puts them into defs-cpp.mk. A future patch should place the whole bunch
somewhere else, I guess.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-30 10:17:19 +00:00
29b4d4f2a5 dev-utils.mk: Fix in-tree process-text-files.py location
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-29 16:45:39 +00:00
e54c20de8c defs.mk: Add function uniq
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-29 16:45:20 +00:00