This repository has been archived by the owner on Feb 24, 2020. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build: Rework to use nonrecursive makefile.
This largely keeps the same configure interface, that is - ./autogen.sh for the first time and then ./configure --enable-foo --with-bar=baz && make. There is new way of running functional tests - ./configure --enable-functional-tests && make check Removes the generation of aggregate script in favor of using make to install files into ACI rootfs. Adds dependency tracking for binaries (both go and C). See rkt-bs-todo for a list of things that are left to be done.
- Loading branch information
Showing
67 changed files
with
5,171 additions
and
836 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,8 @@ | ||
bin/ | ||
gopath/ | ||
*.sw[ponm] | ||
.DS_Store | ||
.vagrant | ||
tests/image/rootfs/ | ||
tests/inspect/inspect | ||
tests/*.aci | ||
tests/*.log | ||
autom4te.cache | ||
Makefile | ||
config.log | ||
config.status | ||
build-* | ||
*.test | ||
*~ | ||
|
||
/autom4te.cache | ||
/config.log | ||
/config.status | ||
/configure | ||
/makelib/variables.mk | ||
/build-rkt-* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
# make "all" a default target | ||
all: | ||
|
||
# makelib/inc.mk must be included first! | ||
include makelib/inc.mk | ||
include makelib/file-ops-prolog.mk | ||
include makelib/variables.mk | ||
include makelib/misc.mk | ||
|
||
SHELL := $(BASH_SHELL) | ||
TOPLEVEL_STAMPS := | ||
TOPLEVEL_CHECK_STAMPS := | ||
TOPLEVEL_SUBDIRS := rkt tests | ||
|
||
ifneq ($(RKT_STAGE1_USR_FROM),none) | ||
TOPLEVEL_SUBDIRS += stage1 | ||
endif | ||
|
||
$(call inc-one,actool.mk) | ||
$(call inc-many,$(foreach sd,$(TOPLEVEL_SUBDIRS),$(sd)/$(sd).mk)) | ||
|
||
all: $(TOPLEVEL_STAMPS) | ||
|
||
$(TOPLEVEL_CHECK_STAMPS): $(TOPLEVEL_STAMPS) | ||
|
||
.INTERMEDIATE: $(TOPLEVEL_CHECK_STAMPS) | ||
|
||
check: $(TOPLEVEL_CHECK_STAMPS) | ||
|
||
include makelib/file-ops-epilog.mk | ||
|
||
.PHONY: all check |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
$(call setup-stamp-file,ACTOOL_STAMP) | ||
|
||
# variables for makelib/build_go.mk | ||
BGB_PKG_IN_REPO := Godeps/_workspace/src/github.com/appc/spec/actool | ||
BGB_BINARY := $(ACTOOL) | ||
|
||
CLEAN_FILES += $(ACTOOL) | ||
|
||
$(ACTOOL_STAMP): $(ACTOOL) | ||
touch "$@" | ||
|
||
$(ACTOOL): $(MK_PATH) | $(BINDIR) | ||
|
||
include makelib/build_go_bin.mk | ||
|
||
# ACTOOL_STAMP deliberately not cleared |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
#!/bin/bash -e | ||
autoreconf --install | ||
autoreconf --install --warnings=all --force |
Oops, something went wrong.