Changeset 5fd05862 in mainline for boot/Makefile

Timestamp:

2019-08-17T12:49:43Z (6 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:

ecf56f80

Parents:

32355bc

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-15 13:55:37)

git-committer:

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

Message:

Convert uspace to meson

File:

• boot/Makefile (modified) (2 diffs)

boot/Makefile

@@ -38 +38 @@
 
 build_dist: clean_dist
+        cp -r -L -T -u "$(USPACE_PATH)/dist" "$(DIST_PATH)"
         mkdir -p "$(DIST_PATH)/app/"
         mkdir -p "$(DIST_PATH)/cfg/"
@@ -49 +50 @@
         mkdir -p "$(DIST_PATH)/w/"
 
-        for srv in $(RD_SRVS) ; do \
-                srv_dir="`dirname "$$srv"`" ; \
-                srv_name="`basename "$$srv"`" ; \
-                mkdir -p "$(DIST_PATH)/srv/$$srv_dir" ; \
-                cp "$(USPACE_PATH)/srv/$$srv/$$srv_name" "$(DIST_PATH)/srv/$$srv" ; \
-        done
-
-        for file in $(RD_LIBS) ; do \
-                cp "$$file" "$(DIST_PATH)/lib/" ; \
-        done
-
 ifeq ($(CONFIG_DEVEL_FILES), y)
-        mkdir -p "$(DIST_PATH)/inc/c/"
-        cp -r -L "$(USPACE_PATH)/lib/c/include/." "$(DIST_PATH)/inc/c/"
-        cp -r -L "$(ROOT_PATH)/abi/include/." "$(DIST_PATH)/inc/c/"
-        cp -r -L "$(USPACE_PATH)/lib/c/arch/$(UARCH)/include/." "$(DIST_PATH)/inc/c/"
-        cp -L "$(USPACE_PATH)/lib/c/crt0.o" "$(DIST_PATH)/lib/"
-        cp -L "$(USPACE_PATH)/lib/c/crt1.o" "$(DIST_PATH)/lib/"
         cp -L "$(LIBGCC_PATH)" "$(DIST_PATH)/lib/"
 endif
 
-        for app in $(RD_APPS) ; do \
-                app_dir="`dirname "$$app"`" ; \
-                app_name="`basename "$$app"`" ; \
-                mkdir -p "$(DIST_PATH)/app/$$app_dir" ; \
-                cp "$(USPACE_PATH)/app/$$app/$$app_name" "$(DIST_PATH)/app/$$app" ; \
-        done
-        for file in $(RD_DATA) ; do \
-                cp "$$file" "$(DIST_PATH)/" ; \
-        done
-
-ifeq ($(CONFIG_PCUT_TESTS),y)
-        for file in $(RD_TESTS) ; do \
-                cp "$$file" "$(DIST_PATH)/test/" ; \
-        done
-endif
-
-ifeq ($(CONFIG_PCUT_SELF_TESTS),y)
-        for file in $(USPACE_PATH)/lib/pcut/test-libpcut-*; do \
-                cp "$$file" "$(DIST_PATH)/test/" ; \
-        done
-endif
-
-        for drv in $(RD_DRVS) ; do \
-                drv_dir="`dirname "$$drv"`" ; \
-                drv_name="`basename "$$drv"`" ; \
-                mkdir -p "$(DIST_PATH)/$(DRVS_PATH)/$$drv_name" ; \
-                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv_dir/$$drv_name/$$drv_name" "$(DIST_PATH)/$(DRVS_PATH)/$$drv_name/" ; \
-                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv_dir/$$drv_name/$$drv_name.ma" "$(DIST_PATH)/$(DRVS_PATH)/$$drv_name/" ; \
-        done
-        for file in $(RD_DRV_CFG) ; do \
-                file_dir="`dirname "$$file"`" ; \
-                file_name="`basename "$$file"`" ; \
-                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/"*".dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
-        done
-        for file in $(RD_DRVS_FW) ; do \
-                file_dir="`dirname "$$file"`" ; \
-                file_name="`basename "$$file"`" ; \
-                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.fw" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
-        done
         if ls $(DIST_OVERLAY_PATH)/* >/dev/null 2>/dev/null; then \
                 cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \