Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 356c386 in mainline


Ignore:
Timestamp:
2017-04-04T14:35:03Z (3 years ago)
Author:
Martin Decky <martin@…>
Branches:
master
Children:
ff87f70
Parents:
4b583f4
Message:

distribute sample files only when needed

Files:
3 edited
4 moved

Legend:

Unmodified
Added
Removed
  • boot/Makefile

    r4b583f4 r356c386  
    6868                cp "$$file" "$(DIST_PATH)/app/" ; \
    6969        done
     70        for file in $(RD_DATA) ; do \
     71                cp "$$file" "$(DIST_PATH)/" ; \
     72        done
    7073ifeq ($(CONFIG_PCUT_TESTS),y)
    7174        echo "echo Running all tests..." >"$(DIST_PATH)/test/run_all"
     
    8487        echo "</ul></body></html>" >>"$(DIST_PATH)/test/test.html"
    8588endif
    86 
     89       
    8790ifeq ($(CONFIG_PCUT_SELF_TESTS),y)
    8891        echo "echo Running all PCUT self-tests..." >"$(DIST_PATH)/test/run_pcut"
     
    102105        echo "</ul></body></html>" >>"$(DIST_PATH)/test/pcut.html"
    103106endif
    104 
     107       
    105108        for drv in $(RD_DRVS) ; do \
    106109                drv_dir="`dirname "$$drv"`" ; \
     
    135138clean_dist:
    136139        rm -f $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
     140        find $(USPACE_PATH)/dist -mindepth 1 -maxdepth 1 -type f -exec rm \{\} \;
    137141        rm -f $(USPACE_PATH)/dist/srv/*
    138142        rm -rf $(USPACE_PATH)/dist/drv/*
  • boot/Makefile.common

    r4b583f4 r356c386  
    237237        $(USPACE_PATH)/app/bdsh/test-bdsh
    238238
     239RD_DATA_ESSENTIAL = \
     240        $(USPACE_PATH)/app/bdsh/demo.txt
     241
     242RD_DATA_NON_ESSENTIAL = \
     243        $(USPACE_PATH)/app/modplay/demo.xm \
     244        $(USPACE_PATH)/app/viewer/logo.tga
     245
    239246
    240247COMPONENTS = \
     
    254261RD_DRVS = $(RD_DRVS_ESSENTIAL)
    255262RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL)
     263RD_DATA = $(RD_DATA_ESSENTIAL)
    256264else
    257265RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
     
    259267RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
    260268RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL) $(RD_DRVS_FW_NON_ESSENTIAL)
     269RD_DATA = $(RD_DATA_ESSENTIAL) $(RD_DATA_NON_ESSENTIAL)
    261270endif
    262271
  • boot/arch/amd64/Makefile.inc

    r4b583f4 r356c386  
    6666        $(USPACE_PATH)/app/wavplay/wavplay
    6767
     68RD_DATA_NON_ESSENTIAL += \
     69        $(USPACE_PATH)/app/wavplay/demo.wav
     70
    6871BOOT_OUTPUT = $(ROOT_PATH)/image.iso
    6972PREBUILD = $(INITRD).img
Note: See TracChangeset for help on using the changeset viewer.