Changeset e428bec in mainline

Timestamp:

2019-08-17T12:49:43Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2c38a55b

Parents:

9810fc3

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-26 12:46:06)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

Allow changing build directory

Files:

• .gitignore (modified) (2 diffs)
• Makefile (modified) (2 diffs)
• boot/Makefile.common (modified) (1 diff)
• tools/xcw/bin/helenos-cc (modified) (1 diff)
• tools/xcw/bin/helenos-pkg-config (modified) (1 diff)

.gitignore

@@ -1 +1 @@
 *.a
-*.check.c
 *.d
 *.deflate
 *.disasm
-*.la
-*.lo
 *.map
 *.o
 *.prev
 *.pyc
-*.so.*
-*.so
 /Makefile.common
 /Makefile.config
-/PKG
-/common.h
 /config.h
 /cscope.out
-/downloads
 /hdisk.img
 /image.boot
 /image.iso
 /uImage.bin
+/build
 autotool/
 boot/arch/arm32/_link.ld
@@ -42 +35 @@
 boot/initrd.img
 boot/initrd.img.gz
-common.h.new
-deps.mk
 doxygen/doxygen.cfg
 doxygen/doxygen.cfg.gen
 doxygen/html/
 doxygen/latex/
-kernel/arch/abs32le/_link.ld
-kernel/arch/amd64/_link.ld
-kernel/arch/arm32/_link.ld
-kernel/arch/arm64/_link.ld
-kernel/arch/ia32/_link.ld
-kernel/arch/ia64/_link.ld
-kernel/arch/mips32/_link.ld
-kernel/arch/ppc32/_link.ld
-kernel/arch/sparc64/_link.ld
-kernel/generic/src/debug/real_map.bin
-kernel/kernel.bin
-kernel/kernel.bin.gz
-kernel/kernel.dump
-kernel/kernel.elf
-kernel/kernel.elf.gz
-kernel/kernel.raw
-tag
 tags
-tools/amd64-unknown-elf
-tools/arm-linux-gnueabi
-tools/binutils-*.tar.bz2
-tools/downloads/
-tools/gcc-*.tar.bz2
-tools/gdb-*.tar.gz
-tools/i686-pc-linux-gnu
-tools/ia64-pc-linux-gnu
-tools/mips-linux-gnu
-tools/mips64el-linux-gnu
-tools/mipsel-linux-gnu
-tools/ppc-linux-gnu
-tools/ppc64-linux-gnu
-tools/riscv64-unknown-linux-gnu
-tools/sparc64-linux-gnu
 tools/sycek/
 tools/xcw/demo/viewer

Makefile

@@ -39 +39 @@
 MESON = meson
 
+BUILD_DIR=$(abspath build)
+
 CONFIG_RULES = HelenOS.config
 
@@ -64 +66 @@
 
 all: common export-cross test-xcw
-        $(MAKE) -r -C boot PRECHECK=$(PRECHECK)
+        $(MAKE) -r -C boot PRECHECK=$(PRECHECK) BUILD_DIR=$(BUILD_DIR)
 
-build/build.ninja: Makefile.config version
-        PATH="$(CROSS_PATH):$$PATH" meson . build --cross-file meson/cross/$(UARCH) $(MESON_ARGS)
+$(BUILD_DIR)/build.ninja: Makefile.config version
+        PATH="$(CROSS_PATH):$$PATH" meson . $(BUILD_DIR) --cross-file meson/cross/$(UARCH) $(MESON_ARGS)
 
-common: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) build/build.ninja
-        PATH="$(CROSS_PATH):$$PATH" ninja -C build
-        PATH="$(CROSS_PATH):$$PATH" DESTDIR="$$PWD/dist" meson install --no-rebuild --only-changed -C build > build/install.log
+common: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) $(BUILD_DIR)/build.ninja
+        PATH="$(CROSS_PATH):$$PATH" ninja -C $(BUILD_DIR)
+        PATH="$(CROSS_PATH):$$PATH" DESTDIR="$(BUILD_DIR)/dist" meson install --no-rebuild --only-changed -C $(BUILD_DIR) > $(BUILD_DIR)/install.log
 
 test-xcw: common export-cross

boot/Makefile.common

@@ -44 +44 @@
 
 USPACE_PATH = $(ROOT_PATH)/uspace
-DIST_PATH = $(ROOT_PATH)/dist
+DIST_PATH = $(BUILD_DIR)/dist
 DIST_OVERLAY_PATH = $(USPACE_PATH)/overlay
 TOOLS_PATH = $(ROOT_PATH)/tools

tools/xcw/bin/helenos-cc

@@ -37 +37 @@
 SRC_ROOT="$XCW/../../.."
 if [ -z "$EXPORT_DIR" ]; then
-        EXPORT_DIR="$SRC_ROOT/dist"
+        EXPORT_DIR="$SRC_ROOT/build/dist"
 fi
 

tools/xcw/bin/helenos-pkg-config

@@ -35 +35 @@
 SRC_ROOT="$XCW/../../.."
 if [ -z "$EXPORT_DIR" ]; then
-        EXPORT_DIR="$SRC_ROOT/dist"
+        EXPORT_DIR="$SRC_ROOT/build/dist"
 fi
 INCLUDE_DIR="$EXPORT_DIR/include"