X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Fmk%2Fpkg.mk;h=4226ebfcf80417554519bc0d68723961608e1854;hb=84fe31f632166d2fbf566968bd25aa9545e96fdc;hp=6a2b55335e2b7daae84b4851d57c72d22fb0818f;hpb=61a50e79ee64cde0b1c2c96119b90ac9bddb9ea9;p=osm%2Fdevops.git

diff --git a/descriptor-packages/mk/pkg.mk b/descriptor-packages/mk/pkg.mk
index 6a2b5533..4226ebfc 100644
--- a/descriptor-packages/mk/pkg.mk
+++ b/descriptor-packages/mk/pkg.mk
@@ -20,7 +20,7 @@ TOOLS_DIR := $(TOPDIR)/descriptor-packages/tools
 PKG_BASE_NAME := $(shell basename $(shell pwd))
 PKG_NAME      := $(addsuffix .tar.gz, $(PKG_BASE_NAME))
 
-CHARM_DIR        := $(TOPDIR)/juju-charms
+CHARM_DIR        := $(TOPDIR)/charms
 CHARM_SRC_DIR    := $(CHARM_DIR)/layers
 CHARM_DOCKER_TAG := charm-tools
 CHARM_BUILD_DIR  := $(CHARM_DIR)/builds
@@ -31,30 +31,33 @@ Q=@
 GEN_VNFD_PKG := $(TOOLS_DIR)/gen_vnfd_pkg.sh
 GEN_NSD_PKG  := $(TOOLS_DIR)/gen_nsd_pkg.sh
 GEN_PKG      := $(TOOLS_DIR)/generate_descriptor_pkg.sh
+TEST_PKG     := $(TOOLS_DIR)/validate_descriptor.py
 BUILD_VNFD   := $(shell readlink -f .|sed -e 's/\/.*descriptor-packages//' | grep vnfd)
 
 DEP_FILES = $(wildcard src/*)
 
 ifdef BUILD_VNFD
-$(BUILD_DIR)/$(PKG_BASE_NAME): src $(DEP_FILES)
+$(BUILD_DIR)/$(PKG_BASE_NAME): src
 	$(Q)mkdir -p $@
 	$(Q)cp -rf $</. $@
 	$(Q)$(GEN_VNFD_PKG) $< $@
 else
-$(BUILD_DIR)/$(PKG_BASE_NAME): src $(DEP_FILES)
+$(BUILD_DIR)/$(PKG_BASE_NAME): src
 	$(Q)mkdir -p $@
 	$(Q)cp -rf $</. $@
 	$(Q)$(GEN_NSD_PKG) $< $@
 endif
 
 ifdef VNFD_CHARM
-$(BUILD_DIR)/$(PKG_NAME): $(BUILD_DIR)/$(PKG_BASE_NAME) $(CHARM_BUILD_DIR)/$(VNFD_CHARM)
+$(BUILD_DIR)/$(PKG_NAME): $(DEP_FILES) $(CHARM_BUILD_DIR)/$(VNFD_CHARM)
 	$(Q)echo "building $(PKG_BASE_NAME) with charm $(VNFD_CHARM)"
+	$(Q)$(MAKE) --no-print-directory $(BUILD_DIR)/$(PKG_BASE_NAME)
 	$(Q)cp -rf $(CHARM_BUILD_DIR)/$(VNFD_CHARM) $(BUILD_DIR)/$(PKG_BASE_NAME)/charms
 	$(Q)$(GEN_PKG) --no-remove-files -d $(BUILD_DIR) $(BUILD_DIR)/$(PKG_BASE_NAME)
 else
-$(BUILD_DIR)/$(PKG_NAME): $(BUILD_DIR)/$(PKG_BASE_NAME)
-	$(Q)echo "building $(PKG_BASE_NAME)"
+$(BUILD_DIR)/$(PKG_NAME): $(DEP_FILES)
+	$(Q)echo "building $(PKG_BASE_NAME) $(BUILD_DIR)"
+	$(Q)$(MAKE) --no-print-directory $(BUILD_DIR)/$(PKG_BASE_NAME)
 	$(Q)$(GEN_PKG) --no-remove-files -d $(BUILD_DIR) $(BUILD_DIR)/$(PKG_BASE_NAME)
 endif
 
@@ -64,11 +67,16 @@ $(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
 	$(CHARM_DIR) $(CHARM_DOCKER_TAG) charm-build -o $(CHARM_DIR) $<
 else
 $(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
-	$(Q)charm-build -o $(CHARM_DIR) $<
+	$(Q)charm build -o $(CHARM_DIR) $<
 endif
- 
+
 clean:
 	$(Q)rm -rf $(BUILD_DIR)
 	$(Q)rm -rf $(CHARM_BUILD_DIR)
 
+test:
+	$(Q)echo -n testing $(shell readlink -f src/*.yaml)  "             "
+	$(Q)$(TEST_PKG) src/*.yaml
+	$(Q)echo OK
+
 .DEFAULT_GOAL := all