Changeset 2afb22b in rtems for automake


Ignore:
Timestamp:
Dec 23, 2017, 7:18:56 AM (23 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
d8de6b9
Parents:
9704efb4
git-author:
Chris Johns <chrisj@…> (12/23/17 07:18:56)
git-committer:
Sebastian Huber <sebastian.huber@…> (01/25/18 07:45:26)
Message:

Remove make preinstall

A speciality of the RTEMS build system was the make preinstall step. It
copied header files from arbitrary locations into the build tree. The
header files were included via the -Bsome/build/tree/path GCC command
line option.

This has at least seven problems:

  • The make preinstall step itself needs time and disk space.
  • Errors in header files show up in the build tree copy. This makes it hard for editors to open the right file to fix the error.
  • There is no clear relationship between source and build tree header files. This makes an audit of the build process difficult.
  • The visibility of all header files in the build tree makes it difficult to enforce API barriers. For example it is discouraged to use BSP-specifics in the cpukit.
  • An introduction of a new build system is difficult.
  • Include paths specified by the -B option are system headers. This may suppress warnings.
  • The parallel build had sporadic failures on some hosts.

This patch removes the make preinstall step. All installed header
files are moved to dedicated include directories in the source tree.
Let @RTEMS_CPU@ be the target architecture, e.g. arm, powerpc, sparc,
etc. Let @RTEMS_BSP_FAMILIY@ be a BSP family base directory, e.g.
erc32, imx, qoriq, etc.

The new cpukit include directories are:

  • cpukit/include
  • cpukit/score/cpu/@RTEMS_CPU@/include
  • cpukit/libnetworking

The new BSP include directories are:

  • bsps/include
  • bsps/@RTEMS_CPU@/include
  • bsps/@RTEMS_CPU@/@RTEMS_BSP_FAMILIY@/include

There are build tree include directories for generated files.

The include directory order favours the most general header file, e.g.
it is not possible to override general header files via the include path
order.

The "bootstrap -p" option was removed. The new "bootstrap -H" option
should be used to regenerate the "headers.am" files.

Update #3254.

Location:
automake
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • automake/host.am

    r9704efb4 r2afb22b  
    44## and this file will probably be removed
    55
    6 preinstall-am: $(PREINSTALL_FILES)
    7 preinstall: preinstall-am
    8 .PHONY: preinstall preinstall-am
  • automake/local.am

    r9704efb4 r2afb22b  
    1 preinstall-am: $(PREINSTALL_FILES)
    2 preinstall: preinstall-am
    3 .PHONY: preinstall preinstall-am
     1PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
    42
    5 PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
     3all-local: $(TMPINSTALL_FILES)
  • automake/subdirs.am

    r9704efb4 r2afb22b  
    66## and this file will probably be removed
    77
    8 preinstall-recursive:
    9         @set fnord $(MAKEFLAGS); amf=$$2; \
    10         dot_seen=no; \
    11         target=`echo $@ | sed s/-recursive//`; \
    12         list='$(SUBDIRS)'; for subdir in $$list; do \
    13           echo "Making $$target in $$subdir"; \
    14           if test "$$subdir" = "."; then \
    15             dot_seen=yes; \
    16             local_target="$$target-am"; \
    17           else \
    18             local_target="$$target"; \
    19           fi; \
    20           (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
    21 ## This trick allows "-k" to keep its natural meaning when running a
    22 ## recursive rule.
    23            || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
    24         done; \
    25         if test "$$dot_seen" = "no"; then \
    26           $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
    27         fi; test -z "$$fail"
    28 
    29 preinstall: preinstall-recursive
    30 .PHONY: preinstall-recursive
Note: See TracChangeset for help on using the changeset viewer.