Changeset 356c386 in mainline

Timestamp:

2017-04-04T14:35:03Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ff87f70

Parents:

4b583f4

Message:

distribute sample files only when needed

Files:

• boot/Makefile (modified) (4 diffs)
• boot/Makefile.common (modified) (3 diffs)
• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/app/bdsh/demo.txt (moved) (moved from uspace/dist/demo.txt )
• uspace/app/modplay/demo.xm (moved) (moved from uspace/dist/demo.xm )
• uspace/app/viewer/logo.tga (moved) (moved from uspace/dist/logo.tga )
• uspace/app/wavplay/demo.wav (moved) (moved from uspace/dist/demo.wav )

boot/Makefile

@@ -68 +68 @@
                 cp "$$file" "$(DIST_PATH)/app/" ; \
         done
+        for file in $(RD_DATA) ; do \
+                cp "$$file" "$(DIST_PATH)/" ; \
+        done
 ifeq ($(CONFIG_PCUT_TESTS),y)
         echo "echo Running all tests..." >"$(DIST_PATH)/test/run_all"
@@ -84 +87 @@
         echo "</ul></body></html>" >>"$(DIST_PATH)/test/test.html"
 endif
-
+        
 ifeq ($(CONFIG_PCUT_SELF_TESTS),y)
         echo "echo Running all PCUT self-tests..." >"$(DIST_PATH)/test/run_pcut"
@@ -102 +105 @@
         echo "</ul></body></html>" >>"$(DIST_PATH)/test/pcut.html"
 endif
-
+        
         for drv in $(RD_DRVS) ; do \
                 drv_dir="`dirname "$$drv"`" ; \
@@ -135 +138 @@
 clean_dist:
         rm -f $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
+        find $(USPACE_PATH)/dist -mindepth 1 -maxdepth 1 -type f -exec rm \{\} \;
         rm -f $(USPACE_PATH)/dist/srv/*
         rm -rf $(USPACE_PATH)/dist/drv/*

boot/Makefile.common

@@ -237 +237 @@
         $(USPACE_PATH)/app/bdsh/test-bdsh
 
+RD_DATA_ESSENTIAL = \
+        $(USPACE_PATH)/app/bdsh/demo.txt
+
+RD_DATA_NON_ESSENTIAL = \
+        $(USPACE_PATH)/app/modplay/demo.xm \
+        $(USPACE_PATH)/app/viewer/logo.tga
+
 
 COMPONENTS = \
@@ -254 +261 @@
 RD_DRVS = $(RD_DRVS_ESSENTIAL)
 RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL)
+RD_DATA = $(RD_DATA_ESSENTIAL)
 else
 RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
@@ -259 +267 @@
 RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
 RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL) $(RD_DRVS_FW_NON_ESSENTIAL)
+RD_DATA = $(RD_DATA_ESSENTIAL) $(RD_DATA_NON_ESSENTIAL)
 endif
 

boot/arch/amd64/Makefile.inc

@@ -66 +66 @@
         $(USPACE_PATH)/app/wavplay/wavplay
 
+RD_DATA_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/wavplay/demo.wav
+
 BOOT_OUTPUT = $(ROOT_PATH)/image.iso
 PREBUILD = $(INITRD).img