Ignore:
Timestamp:
Dec 23, 2017, 7:18:56 AM (3 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
5, 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:
c/src/lib/libbsp/powerpc/haleakala
Files:
1 deleted
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/haleakala/Makefile.am

    r9704efb4 r2afb22b  
    55include $(top_srcdir)/../../bsp.am
    66
    7 include_bspdir = $(includedir)/bsp
     7dist_project_lib_DATA = startup/bsp_specs
    88
    9 dist_project_lib_DATA = bsp_specs
    10 
    11 include_HEADERS = include/bsp.h
    12 include_HEADERS += include/mmu_405.h
    13 include_HEADERS += include/tm27.h
    14 
    15 nodist_include_HEADERS = include/bspopts.h
    16 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
    179DISTCLEANFILES = include/bspopts.h
    1810
     
    2315project_lib_DATA = rtems_crti.$(OBJEXT)
    2416
    25 dist_project_lib_DATA += startup/linkcmds
     17project_lib_DATA += linkcmds
    2618
    2719noinst_LIBRARIES = libbsp.a
     
    4032libbsp_a_SOURCES += dlentry/dlentry.S
    4133
    42 include_bsp_HEADERS = ../../powerpc/shared/console/uart.h \
    43     ../../powerpc/shared/console/consoleIo.h
    4434# console
    4535libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
    4636    ../../powerpc/shared/console/console.c
    47 
    48 include_bsp_HEADERS += irq/irq.h
    4937
    5038# irq
     
    7159endif
    7260
    73 include $(srcdir)/preinstall.am
    7461include $(top_srcdir)/../../../../automake/local.am
     62include $(srcdir)/../../../../../../bsps/powerpc/haleakala/headers.am
  • c/src/lib/libbsp/powerpc/haleakala/configure.ac

    r9704efb4 r2afb22b  
    55AC_CONFIG_SRCDIR([make/custom/haleakala.cfg])
    66RTEMS_TOP(../../../../../..)
     7RTEMS_SOURCE_TOP
     8RTEMS_BUILD_TOP
     9RTEMS_BSP_LINKCMDS
    710
    811RTEMS_CANONICAL_TARGET_CPU
Note: See TracChangeset for help on using the changeset viewer.