equal
deleted
inserted
replaced
16 # fields enclosed by brackets "[]" replaced with your own identifying |
16 # fields enclosed by brackets "[]" replaced with your own identifying |
17 # information: Portions Copyright [yyyy] [name of copyright owner] |
17 # information: Portions Copyright [yyyy] [name of copyright owner] |
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. |
21 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
22 # |
22 # |
23 |
23 |
24 include ../../../make-rules/shared-macros.mk |
24 include ../../../make-rules/shared-macros.mk |
25 |
25 |
26 # $(WS_TOP)/make-rules/ips.mk really isn't set up to allow you to bypass all |
26 # $(WS_TOP)/make-rules/ips.mk really isn't set up to allow you to bypass all |
52 |
52 |
53 $(MANIFEST_BASE)-%.mogrified: %.p5m $(BUILD_DIR) |
53 $(MANIFEST_BASE)-%.mogrified: %.p5m $(BUILD_DIR) |
54 $(PKGMOGRIFY) -D CONSOLIDATION=$(CONSOLIDATION) $< > $@ |
54 $(PKGMOGRIFY) -D CONSOLIDATION=$(CONSOLIDATION) $< > $@ |
55 |
55 |
56 $(MANIFEST_BASE)-%.published: $(MANIFEST_BASE)-%.mogrified $(BUILD_DIR) |
56 $(MANIFEST_BASE)-%.published: $(MANIFEST_BASE)-%.mogrified $(BUILD_DIR) |
57 $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest $< |
57 $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest --no-catalog $< |
58 $(CP) $< $@ |
58 $(CP) $< $@ |
59 |
59 |
60 $(BUILD_DIR)/.linted-$(MACH): $(MOGRIFIED) $(BUILD_DIR) |
60 $(BUILD_DIR)/.linted-$(MACH): $(MOGRIFIED) $(BUILD_DIR) |
61 $(ENV) PYTHONPATH=$(WS_TOOLS)/python \ |
61 $(ENV) PYTHONPATH=$(WS_TOOLS)/python \ |
62 $(PKGLINT) $(CANONICAL_REPO:%=-c $(WS_LINT_CACHE)) \ |
62 $(PKGLINT) $(CANONICAL_REPO:%=-c $(WS_LINT_CACHE)) \ |
63 -f $(WS_TOOLS)/pkglintrc $(MOGRIFIED) |
63 -f $(WS_TOOLS)/pkglintrc $(MOGRIFIED) |
64 $(TOUCH) $@ |
64 $(TOUCH) $@ |
65 |
65 |
66 $(BUILD_DIR)/.published-$(MACH): $(BUILD_DIR)/.linted-$(MACH) $(PUBLISHED) |
66 $(BUILD_DIR)/.published-$(MACH): $(BUILD_DIR)/.linted-$(MACH) $(PUBLISHED) |
|
67 ifndef DISABLE_IPS_CATALOG_AND_INDEX_UPDATES |
|
68 $(PKGREPO) refresh -s $(PKG_REPO) |
|
69 endif |
67 $(TOUCH) $@ |
70 $(TOUCH) $@ |
68 |
71 |
69 publish: $(BUILD_DIR)/.published-$(MACH) |
72 publish: $(BUILD_DIR)/.published-$(MACH) |
70 |
73 |
71 %.p5m: %.p5m.$(MACH) |
74 %.p5m: %.p5m.$(MACH) |