Ignore:
Timestamp:
2010-08-16T11:45:21+02:00 (6 years ago)
Author:
lars
Message:

Add build variants support to InstallDev

Before building a build variant would have removed the staging files installed
by the previous build variant from the same makefile.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/package.mk

    r21951 r22668  
    2121STAMP_BUILT:=$(PKG_BUILD_DIR)/.built 
    2222STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed 
     23 
     24STAGING_FILES_LIST:=$(PKG_NAME)$(if $(BUILD_VARIANT),.$(BUILD_VARIANT),).list 
    2325 
    2426include $(INCLUDE_DIR)/download.mk 
     
    123125        ) 
    124126        if [ -d $(TMP_DIR)/stage-$(PKG_NAME) ]; then \ 
    125                 (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(STAGING_DIR)/packages/$(PKG_NAME).list); \ 
     127                (cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(STAGING_DIR)/packages/$(STAGING_FILES_LIST)); \ 
    126128                $(CP) $(TMP_DIR)/stage-$(PKG_NAME)/* $(STAGING_DIR)/; \ 
    127129        fi 
     
    211213        @-(\ 
    212214                cd "$(STAGING_DIR)"; \ 
    213                 if [ -f packages/$(PKG_NAME).list ]; then \ 
    214                         cat packages/$(PKG_NAME).list | xargs -r rm -f 2>/dev/null; \ 
     215                if [ -f packages/$(STAGING_FILES_LIST) ]; then \ 
     216                        cat packages/$(STAGING_FILES_LIST) | xargs -r rm -f 2>/dev/null; \ 
    215217                fi; \ 
    216218        ) 
     
    219221        $(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST)) 
    220222        $(Build/Clean) 
    221         rm -f $(STAGING_DIR)/packages/$(PKG_NAME).list $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list 
     223        rm -f $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) $(STAGING_DIR_HOST)/packages/$(STAGING_FILES_LIST) 
    222224        rm -rf $(PKG_BUILD_DIR) 
    223225 
Note: See TracChangeset for help on using the changeset viewer.