Skip to content
Permalink
Browse files

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...
krnowak committed Jun 15, 2015
1 parent c1f54c8 commit 831a343c4ef3e16d4bef6db56af64df141a2a809
Showing with 5,171 additions and 836 deletions.
  1. +8 −15 .gitignore
  2. +3 −2 .travis.yml
  3. +32 −0 Makefile
  4. +0 −145 Makefile.in
  5. +16 −0 actool.mk
  6. +1 −1 autogen.sh
  7. +1,420 −0 config.guess
  8. +1,798 −0 config.sub
  9. +137 −112 configure.ac
  10. +40 −0 makelib/aci_simple_go_bin.mk
  11. +41 −0 makelib/aci_simple_static_c_bin.mk
  12. +63 −0 makelib/build_go_bin.mk
  13. +27 −0 makelib/build_static_c_bin.mk
  14. +122 −0 makelib/file-ops-epilog.mk
  15. +6 −0 makelib/file-ops-prolog.mk
  16. +202 −0 makelib/inc.mk
  17. +0 −93 makelib/lib.mk
  18. +82 −0 makelib/misc.mk
  19. +81 −0 makelib/variables.mk.in
  20. +67 −0 rkt-bs-todo
  21. +24 −0 rkt/rkt.mk
  22. +0 −2 stage0/.gitignore
  23. +0 −21 stage1/.gitignore
  24. +25 −5 stage1/aci/aci.mk
  25. +0 −20 stage1/aci/install.tpl.sh
  26. +0 −16 stage1/bash/bash.mk
  27. +2 −15 stage1/diagexec/diagexec.mk
  28. BIN stage1/enter/enter
  29. +1 −16 stage1/enter/enter.mk
  30. +1 −12 stage1/gc/gc.mk
  31. +1 −12 stage1/init/init.mk
  32. +0 −1 stage1/net-plugins/.gitignore
  33. +57 −11 stage1/net-plugins/net-plugins.mk
  34. +30 −7 stage1/net/net.mk
  35. +1 −16 stage1/prepare-app/prepare-app.mk
  36. +13 −6 stage1/reaper/reaper.mk
  37. 0 stage1/reaper/reaper.sh
  38. +83 −31 stage1/stage1.mk
  39. +0 −18 stage1/units/install.tpl.sh
  40. +38 −8 stage1/units/units.mk
  41. +0 −1 stage1/usr_from_coreos/.gitignore
  42. +4 −6 stage1/usr_from_coreos/cache.sh
  43. +0 −5 stage1/usr_from_coreos/manifest.d/systemd
  44. +82 −13 stage1/usr_from_coreos/usr_from_coreos.mk
  45. +6 −6 stage1/usr_from_host/usr_from_host.mk
  46. +13 −0 stage1/usr_from_src/bash.mk
  47. +146 −56 stage1/usr_from_src/usr_from_src.mk
  48. +0 −31 tests/build
  49. +57 −0 tests/functional.mk
  50. +2 −4 tests/rkt_app_isolator_test.go
  51. +9 −1 tests/rkt_auth_test.go
  52. +7 −10 tests/rkt_caps_test.go
  53. +2 −3 tests/rkt_cat_manifest_test.go
  54. +29 −21 tests/rkt_env_test.go
  55. +6 −4 tests/rkt_exit_test.go
  56. +6 −5 tests/rkt_image_rm_test.go
  57. +9 −8 tests/rkt_interactive_test.go
  58. +8 −8 tests/rkt_pid_file_test.go
  59. +3 −3 tests/rkt_run_pod_manifest_test.go
  60. +6 −1 tests/rkt_service_file_test.go
  61. +29 −7 tests/rkt_tests.go
  62. +25 −19 tests/rkt_volume_test.go
  63. +10 −7 tests/run-build.sh
  64. +41 −32 tests/tests.mk
  65. +25 −0 tools/deps-gen.pl
  66. +78 −0 tools/go-deps-gen.pl
  67. +146 −0 tools/libdepsgen.pm
@@ -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-*
@@ -14,5 +14,6 @@ install:
- go get golang.org/x/tools/cmd/vet

script:
- ./configure
- make stage0-test SHELL="/bin/bash -v"
- ./autogen.sh
- ./configure --with-stage1=none
- make check
@@ -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.
@@ -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
@@ -1,2 +1,2 @@
#!/bin/bash -e
autoreconf --install
autoreconf --install --warnings=all --force
Oops, something went wrong.

0 comments on commit 831a343

Please sign in to comment.
You can’t perform that action at this time.