Changeset 2434


Ignore:
Timestamp:
Jan 9, 2011, 6:45:08 PM (15 years ago)
Author:
bird
Message:

kBuild: Deprecating PATH_<target> and <target>_PATH in favor of <target>_0_OUTDIR and <target>_DEFPATH.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r2421 r2434  
    3333KBUILD_VERSION_MAJOR = 0
    3434KBUILD_VERSION_MINOR = 1
    35 KBUILD_VERSION_PATCH = 98
    36 KBUILD_VERSION = 0.1.98
     35KBUILD_VERSION_PATCH = 99
     36KBUILD_VERSION = 0.1.99
    3737DEFS += \
    3838        KBUILD_VERSION_MAJOR=$(KBUILD_VERSION_MAJOR) \

  • trunk/kBuild/footer.kmk

    r2433 r2434  
    158158        $(TOOL.$(bld_trg)) \
    159159        $(TOOL) \
     160))
    160161else
    161162_TARGET_TOOL = $(strip $(firstword \
    … …  
    188189        $(TOOL.$(bld_type)) \
    189190        $(TOOL) \
    190         ))
     191))
    191192endif
    192193
    … …  
    22182219        $(SUFF_LIB))
    22192220local out         := $(outbase)$(suff)
    2220 local defpath     := $(firstword $($(target)_PATH) $($(target)_DEFPATH))
     2221local defpath     := $($(target)_DEFPATH)
     2222ifeq ($(defpath),)
     2223 local defpath    := $($(target)_PATH)
     2224endif
    22212225TARGET_$(target)  := $(out)
    22222226$(target)_1_TARGET:= $(out)
    … …  
    24742478TARGET_$(target)  := $(out)
    24752479$(target)_1_TARGET:= $(out)
    2476 local defpath     := $(firstword $($(target)_PATH) $($(target)_DEFPATH))
     2480local defpath     := $($(target)_DEFPATH)
     2481ifeq ($(defpath),)
     2482 local defpath    := $($(target)_PATH)
     2483endif
    24772484# no local here - must be writable across some foreachs.
    24782485othersrc          :=
    … …  
    31273134
    31283135# Adjust the source if we got a default PATH. (This must be done this late!)
    3129 local defpath := $(firstword $($(target)_PATH) $($(target)_DEFPATH))
     3136local defpath     := $($(target)_DEFPATH)
     3137ifeq ($(defpath),)
     3138 local defpath    := $($(target)_PATH)
     3139endif
    31303140ifneq ($(defpath),)
    31313141 local srcsrc := $(abspathex $(srcsrc),$(defpath))

  • trunk/kBuild/header.kmk

    r2413 r2434  
    764764endef
    765765
     766##
     767# Make an assignment to a deprecated variable.
     768#
     769# @param   $1   The variable name.
     770# @param   $2   The value.
     771# @param   $3   The variable to use instead.
     772#
     773ifdef KBUILD_WITH_DEPREATED_AS_ERROR
     774 KB_FN_ASSIGN_DEPRECATED = $(eval $1 = $2$$(error $1 is deprecated, use $3 instead))
     775else
     776 KB_FN_ASSIGN_DEPRECATED = $(eval $1 = $2$$(warning $1 is deprecated, use $3 instead))
     777endif
    766778
    767779

  • trunk/kBuild/subfooter.kmk

    r2413 r2434  
    4444define def_subheader
    4545 ifndef $(target)_PATH
    46   ifdef $(target)_DEFPATH
    47    $(target)_PATH := $($(target)_DEFPATH)
    48   else
    49    $(target)_PATH := $(PATH_SUB_CURRENT)
     46  ifndef $(target)_DEFPATH
    5047   $(target)_DEFPATH := $(PATH_SUB_CURRENT)
    5148  endif
     49  $(call KB_FN_ASSIGN_DEPRECATED,$(target)_PATH,$($(target)_DEFPATH), $(target)_DEFPATH)
    5250 else ifndef $(target)_DEFPATH
    5351  $(target)_DEFPATH := $($(target)_PATH)
    … …  
    5856 ifndef $(target)_0_OUTDIR
    5957  $(target)_0_OUTDIR := $(call TARGET_PATH,$(target))
    60   PATH_$(target) := $($(target)_0_OUTDIR)
     58  $(call KB_FN_ASSIGN_DEPRECATED,PATH_$(target),$($(target)_0_OUTDIR), $(target)_0_OUTDIR)
    6159 endif
    6260endef

  • trunk/kBuild/subheader.kmk

    r2413 r2434  
    5555 define def_subfooter
    5656  ifndef $(target)_PATH
    57    ifdef $(target)_DEFPATH
    58     $(target)_PATH := $($(target)_DEFPATH)
    59    else
    60     $(target)_PATH := $(PATH_SUB_CURRENT)
     57   ifndef $(target)_DEFPATH
    6158    $(target)_DEFPATH := $(PATH_SUB_CURRENT)
    6259   endif
     60   $(call KB_FN_ASSIGN_DEPRECATED,$(target)_PATH,$($(target)_DEFPATH), $(target)_DEFPATH)
    6361  else ifndef $(target)_DEFPATH
    6462   $(target)_DEFPATH := $($(target)_PATH)
    … …  
    6967  ifndef $(target)_0_OUTDIR
    7068   $(target)_0_OUTDIR := $(call TARGET_PATH,$(target))
    71    PATH_$(target) := $($(target)_0_OUTDIR)
     69   $(call KB_FN_ASSIGN_DEPRECATED,PATH_$(target),$($(target)_0_OUTDIR), $(target)_0_OUTDIR)
    7270  endif
    7371 endef

  • trunk/src/ash/Makefile.kmk

    r2422 r2434  
    5050kmk_ash_DEFS.openbsd = \
    5151        HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME
    52 kmk_ash_INCS = $(PATH_kmk_ash) . # (the last is because of error.h)
     52kmk_ash_INCS = $(kmk_ash_0_OUTDIR) . # (the last is because of error.h)
    5353kmk_ash_CFLAGS.win = -I. ## @todo kBuild bug?
    5454kmk_ash_INCS.win = win
    … …  
    7979        bltin/kill.c \
    8080        bltin/test.c \
    81         $(PATH_kmk_ash)/builtins.c \
    82         $(PATH_kmk_ash)/init.c \
    83         $(PATH_kmk_ash)/nodes.c
     81        $(kmk_ash_0_OUTDIR)/builtins.c \
     82        $(kmk_ash_0_OUTDIR)/init.c \
     83        $(kmk_ash_0_OUTDIR)/nodes.c
    8484kmk_ash_SOURCES.linux = \
    8585        sys_signame.c \
    … …  
    9999
    100100kmk_ash_INTERMEDIATES = \
    101         $(PATH_kmk_ash)/builtins.h \
    102         $(PATH_kmk_ash)/nodes.h \
    103         $(PATH_kmk_ash)/token.h
     101        $(kmk_ash_0_OUTDIR)/builtins.h \
     102        $(kmk_ash_0_OUTDIR)/nodes.h \
     103        $(kmk_ash_0_OUTDIR)/token.h
    104104kmk_ash_CLEAN = \
    105105        $(kmk_ash_INTERMEDIATES) \
    106         $(PATH_kmk_ash)/builtins.c \
    107         $(PATH_kmk_ash)/init.c \
    108         $(PATH_kmk_ash)/nodes.c
     106        $(kmk_ash_0_OUTDIR)/builtins.c \
     107        $(kmk_ash_0_OUTDIR)/init.c \
     108        $(kmk_ash_0_OUTDIR)/nodes.c
    109109
    110110kmk_ash.man_TEMPLATE = usr.bin.man
    … …  
    119119#
    120120kmk_ash_DEPS :=
    121 kmk_ash_SOURCES += $(PATH_kmk_ash)/arith_lex.c
     121kmk_ash_SOURCES += $(kmk_ash_0_OUTDIR)/arith_lex.c
    122122
    123123include $(FILE_KBUILD_SUB_FOOTER)
    124124
    125125define def_copy_generated
    126 $(PATH_kmk_ash)/$(src): generated/$(src)
     126$(kmk_ash_0_OUTDIR)/$(src): generated/$(src)
    127127        $$(RM) -f $$@
    128128        $$(CP) -f $$^ $$@
    … …  
    162162BOOTSTRAP_SHELL ?= $(SHELL)
    163163
    164 $(PATH_kmk_ash)/builtins.h + $(PATH_kmk_ash)/builtins.c: \
     164$(kmk_ash_0_OUTDIR)/builtins.h + $(kmk_ash_0_OUTDIR)/builtins.c: \
    165165                $(kmk_ash_PATH)/mkbuiltins \
    166166                $(kmk_ash_PATH)/shell.h \
    167167                $(kmk_ash_PATH)/builtins.def \
    168                 | $(call DIRDEP,$(PATH_kmk_ash))
     168                | $(call DIRDEP,$(kmk_ash_0_OUTDIR))
    169169        $(BOOTSTRAP_SHELL) $+ $(dir $@)
    170         [ -f $(PATH_kmk_ash)/builtins.h ]
     170        [ -f $(kmk_ash_0_OUTDIR)/builtins.h ]
    171171
    172 $(PATH_kmk_ash)/nodes.h + $(PATH_kmk_ash)/nodes.c: \
     172$(kmk_ash_0_OUTDIR)/nodes.h + $(kmk_ash_0_OUTDIR)/nodes.c: \
    173173                $(kmk_ash_PATH)/mknodes.sh \
    174174                $(kmk_ash_PATH)/nodetypes \
    175175                $(kmk_ash_PATH)/nodes.c.pat \
    176                 | $(call DIRDEP,$(PATH_kmk_ash))
     176                | $(call DIRDEP,$(kmk_ash_0_OUTDIR))
    177177        $(BOOTSTRAP_SHELL) $+ $(dir $@)
    178178        [ -f $(dir $@)/nodes.h ]
    179179
    180 $(PATH_kmk_ash)/token.h: $(kmk_ash_PATH)/mktokens | $(call DIRDEP,$(PATH_kmk_ash))
     180$(kmk_ash_0_OUTDIR)/token.h: $(kmk_ash_PATH)/mktokens | $(call DIRDEP,$(kmk_ash_0_OUTDIR))
    181181        $(BOOTSTRAP_SHELL) $+
    182182        $(MV) token.h $@
    183183
    184 $(PATH_kmk_ash)/init.c: \
     184$(kmk_ash_0_OUTDIR)/init.c: \
    185185                $(kmk_ash_PATH)/mkinit.sh \
    186                 $(abspathex $(filter-out $(PATH_kmk_ash)/%,$(kmk_ash_SOURCES)), $(kmk_ash_PATH)) \
    187                 | $(call DIRDEP,$(PATH_kmk_ash))
     186                $(abspathex $(filter-out $(kmk_ash_0_OUTDIR)/%,$(kmk_ash_SOURCES)), $(kmk_ash_PATH)) \
     187                | $(call DIRDEP,$(kmk_ash_0_OUTDIR))
    188188        $(BOOTSTRAP_SHELL) $+
    189189        $(MV) init.c $@

  • trunk/src/kmk/Makefile.kmk

    r2421 r2434  
    3939        KBUILD_TYPE=\"$(KBUILD_TYPE)\"
    4040TEMPLATE_BIN-KMK_DEPS = \
    41         $(PATH_kmk)/config.h \
    42         $(PATH_kmk)/fts.h
     41        $(kmk_0_OUTDIR)/config.h \
     42        $(kmk_0_OUTDIR)/fts.h
    4343TEMPLATE_BIN-KMK_CLEAN = $(TEMPLATE_BIN-KMK_DEPS)
    4444TEMPLATE_BIN-KMK_DEPS.solaris = \
    45         $(PATH_kmk)/paths.h
     45        $(kmk_0_OUTDIR)/paths.h
    4646TEMPLATE_BIN-KMK_CLEAN.solaris = $(TEMPLATE_BIN-KMK_DEPS.solaris)
    4747TEMPLATE_BIN-KMK_DEPS.win     = \
    48         $(PATH_kmk)/sysexits.h \
    49         $(PATH_kmk)/unistd.h \
    50         $(PATH_kmk)/paths.h \
    51         $(PATH_kmk)/grp.h \
    52         $(PATH_kmk)/pwd.h \
    53         $(PATH_kmk)/inttypes.h
     48        $(kmk_0_OUTDIR)/sysexits.h \
     49        $(kmk_0_OUTDIR)/unistd.h \
     50        $(kmk_0_OUTDIR)/paths.h \
     51        $(kmk_0_OUTDIR)/grp.h \
     52        $(kmk_0_OUTDIR)/pwd.h \
     53        $(kmk_0_OUTDIR)/inttypes.h
    5454TEMPLATE_BIN-KMK_CFLAGS.win.amd64 = $(TEMPLATE_BIN-THREADED_CFLAGS.win.amd64) -wd4244 -wd4267
    5555TEMPLATE_BIN-KMK_CLEAN.win = $(TEMPLATE_BIN-KMK_DEPS.win)
    56 TEMPLATE_BIN-KMK_INCS = $(PATH_kmk) . $(TEMPLATE_BIN-THREADED_INCS)
     56TEMPLATE_BIN-KMK_INCS = $(kmk_0_OUTDIR) . $(TEMPLATE_BIN-THREADED_INCS)
    5757TEMPLATE_BIN-KMK_INCS.darwin = glob
    5858TEMPLATE_BIN-KMK_INCS.dragonfly = glob
    … …  
    6363ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
    6464ifeq ($(KBUILD_TARGET),win)
    65  TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_PATH)/electric.h -DELECTRIC_HEAP=1
     65 TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
    6666else
    67  TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) -include $(kmk_PATH)/electric.h -DELECTRIC_HEAP=1
     67 TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) -include $(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
    6868endif
    6969endif
    … …  
    491491# Use checked in config.h instead of running ./Configure for it.
    492492#
    493 kmk_config.h.$(KBUILD_TARGET) := $(kmk_PATH)/config.h.$(KBUILD_TARGET)
    494 $(PATH_kmk)/config.h: $(kmk_config.h.$(KBUILD_TARGET))
     493kmk_config.h.$(KBUILD_TARGET) := $(kmk_DEFPATH)/config.h.$(KBUILD_TARGET)
     494$(kmk_0_OUTDIR)/config.h: $(kmk_config.h.$(KBUILD_TARGET))
    495495        $(MKDIR) -p $(dir $@)
    496496        $(CP) $^ $@
    … …  
    499499# Some missing headers.
    500500#
    501 $(PATH_kmk)/fts.h: $(kmk_PATH)/kmkbuiltin/ftsfake.h | $(call DIRDEP,$(PATH_kmk))
     501$(kmk_0_OUTDIR)/fts.h: $(kmk_DEFPATH)/kmkbuiltin/ftsfake.h | $(call DIRDEP,$(kmk_0_OUTDIR))
    502502        $(CP) $^ $@
    503503
    504 $(PATH_kmk)/unistd.h: | $(call DIRDEP,$(PATH_kmk))
     504$(kmk_0_OUTDIR)/unistd.h: | $(call DIRDEP,$(kmk_0_OUTDIR))
    505505        $(ECHO_EXT) > $@
    506506
    507 $(PATH_kmk)/sysexits.h: | $(call DIRDEP,$(PATH_kmk))
     507$(kmk_0_OUTDIR)/sysexits.h: | $(call DIRDEP,$(kmk_0_OUTDIR))
    508508        $(ECHO_EXT) > $@
    509509
    510 $(PATH_kmk)/inttypes.h: | $(call DIRDEP,$(PATH_kmk))
     510$(kmk_0_OUTDIR)/inttypes.h: | $(call DIRDEP,$(kmk_0_OUTDIR))
    511511        $(ECHO_EXT) > $@
    512512
    513 $(PATH_kmk)/paths.h: | $(call DIRDEP,$(PATH_kmk))
     513$(kmk_0_OUTDIR)/paths.h: | $(call DIRDEP,$(kmk_0_OUTDIR))
    514514        $(ECHO_EXT) > $@
    515515
    516 $(PATH_kmk)/pwd.h: | $(call DIRDEP,$(PATH_kmk))
     516$(kmk_0_OUTDIR)/pwd.h: | $(call DIRDEP,$(kmk_0_OUTDIR))
    517517        $(ECHO_EXT) > $@
    518518
    519 $(PATH_kmk)/grp.h: | $(call DIRDEP,$(PATH_kmk))
     519$(kmk_0_OUTDIR)/grp.h: | $(call DIRDEP,$(kmk_0_OUTDIR))
    520520        $(ECHO_EXT) > $@
    521521
    … …  
    571571
    572572test_stack:
    573         $(MAKE) -f $(kmk_PATH)/testcase-stack.kmk
     573        $(MAKE) -f $(kmk_DEFPATH)/testcase-stack.kmk
    574574
    575575test_math:
    576         $(MAKE) -f $(kmk_PATH)/testcase-math.kmk
     576        $(MAKE) -f $(kmk_DEFPATH)/testcase-math.kmk
    577577
    578578test_if1of:
    579         $(MAKE) -f $(kmk_PATH)/testcase-if1of.kmk
     579        $(MAKE) -f $(kmk_DEFPATH)/testcase-if1of.kmk
    580580
    581581test_local:
    582         $(MAKE) -f $(kmk_PATH)/testcase-local.kmk
     582        $(MAKE) -f $(kmk_DEFPATH)/testcase-local.kmk
    583583
    584584test_includedep:
    585         $(MAKE) -f $(kmk_PATH)/testcase-includedep.kmk
     585        $(MAKE) -f $(kmk_DEFPATH)/testcase-includedep.kmk
    586586
    587587test_2ndtargetexp:
    588         $(MAKE) -f $(kmk_PATH)/testcase-2ndtargetexp.kmk
     588        $(MAKE) -f $(kmk_DEFPATH)/testcase-2ndtargetexp.kmk
    589589
    590590test_30_continued_on_failure_worker:
    … …  
    603603
    604604test_lazy_deps_vars:
    605         $(MAKE) -C $(kmk_PATH) -f testcase-lazy-deps-vars.kmk
     605        $(MAKE) -C $(kmk_DEFPATH) -f testcase-lazy-deps-vars.kmk
    606606
    607607

  • trunk/src/sed/Makefile.kmk

    r2422 r2434  
    3434kmk_sed_TEMPLATE = BIN
    3535kmk_sed_DEPS = \
    36         $(PATH_kmk_sed)/config.h \
    37         $(PATH_kmk_sed)/regex.h
     36        $(kmk_sed_0_OUTDIR)/config.h \
     37        $(kmk_sed_0_OUTDIR)/regex.h
    3838kmk_sed_CLEAN = $(kmk_sed_DEPS)
    3939kmk_sed_INCS = \
    40         $(PATH_kmk_sed) \
     40        $(kmk_sed_0_OUTDIR) \
    4141        . \
    4242        lib \
    … …  
    8787# Use checked in config.h instead of running ./configure for it.
    8888#
    89 kmk_sed_config.h.$(KBUILD_TARGET) := $(kmk_sed_PATH)/config.h.$(KBUILD_TARGET)
     89kmk_sed_config.h.$(KBUILD_TARGET) := $(kmk_sed_DEFPATH)/config.h.$(KBUILD_TARGET)
    9090
    91 $(PATH_kmk_sed)/config.h: $(kmk_sed_config.h.$(KBUILD_TARGET)) | $(call DIRDEP,$(PATH_kmk_sed))
     91$(kmk_sed_0_OUTDIR)/config.h: $(kmk_sed_config.h.$(KBUILD_TARGET)) | $(call DIRDEP,$(kmk_sed_0_OUTDIR))
    9292        $(CP) -f $^ $@
    9393
    … …  
    9595# Use the regex lib shipped with sed and not anything installed on the system.
    9696#
    97 $(PATH_kmk_sed)/regex.h: $(kmk_sed_PATH)/lib/regex_.h | $(call DIRDEP,$(PATH_kmk_sed))
     97$(kmk_sed_0_OUTDIR)/regex.h: $(kmk_sed_DEFPATH)/lib/regex_.h | $(call DIRDEP,$(kmk_sed_0_OUTDIR))
    9898        $(CP) -f $^ $@
    9999
Note: See TracChangeset for help on using the changeset viewer.