equal
deleted
inserted
replaced
73 PKG_MACROS += COMPONENT_VERSION=$(COMPONENT_VERSION) |
73 PKG_MACROS += COMPONENT_VERSION=$(COMPONENT_VERSION) |
74 PKG_MACROS += COMPONENT_ARCHIVE_URL=$(COMPONENT_ARCHIVE_URL) |
74 PKG_MACROS += COMPONENT_ARCHIVE_URL=$(COMPONENT_ARCHIVE_URL) |
75 |
75 |
76 PKG_OPTIONS += $(PKG_MACROS:%=-D %) |
76 PKG_OPTIONS += $(PKG_MACROS:%=-D %) |
77 |
77 |
|
78 PKG_PROTO_DIRS += $(PROTO_DIR) $(@D) $(COMPONENT_DIR) |
|
79 |
78 MANIFEST_BASE = $(BUILD_DIR)/manifest-$(MACH) |
80 MANIFEST_BASE = $(BUILD_DIR)/manifest-$(MACH) |
79 |
81 |
80 CANONICAL_MANIFESTS = $(wildcard *.p5m) |
82 CANONICAL_MANIFESTS = $(wildcard *.p5m) |
81 GENERATED = $(MANIFEST_BASE)-generated |
83 GENERATED = $(MANIFEST_BASE)-generated |
82 COMBINED = $(MANIFEST_BASE)-combined |
84 COMBINED = $(MANIFEST_BASE)-combined |
115 $(PKGMOGRIFY) $(PKG_OPTIONS) $< \ |
117 $(PKGMOGRIFY) $(PKG_OPTIONS) $< \ |
116 $(PUBLISH_TRANSFORMS) | \ |
118 $(PUBLISH_TRANSFORMS) | \ |
117 sed -e '/^$$/d' -e '/^#.*$$/d' | uniq >$@ |
119 sed -e '/^$$/d' -e '/^#.*$$/d' | uniq >$@ |
118 |
120 |
119 # generate dependencies |
121 # generate dependencies |
|
122 PKGDEPEND_GENERATE_OPTIONS = -m $(PKG_PROTO_DIRS:%=-d %) |
120 $(MANIFEST_BASE)-%.depend: $(MANIFEST_BASE)-%.mogrified |
123 $(MANIFEST_BASE)-%.depend: $(MANIFEST_BASE)-%.mogrified |
121 $(PKGDEPEND) generate -m $< $(PROTO_DIR) >$@ |
124 $(PKGDEPEND) generate $(PKGDEPEND_GENERATE_OPTIONS) $< >$@ |
122 |
125 |
123 # resolve dependencies, prepend the mogrified manifest, less the unresolved |
126 # resolve dependencies, prepend the mogrified manifest, less the unresolved |
124 # dependencies to the result. |
127 # dependencies to the result. |
125 $(MANIFEST_BASE)-%.resolved: $(MANIFEST_BASE)-%.depend |
128 $(MANIFEST_BASE)-%.resolved: $(MANIFEST_BASE)-%.depend |
126 ($(PKGMOGRIFY) $(@:%.resolved=%.mogrified) \ |
129 ($(PKGMOGRIFY) $(@:%.resolved=%.mogrified) \ |
135 $(PKGLINT) $(CANONICAL_REPO:%=-c $(WS_LINT_CACHE)) \ |
138 $(PKGLINT) $(CANONICAL_REPO:%=-c $(WS_LINT_CACHE)) \ |
136 -f $(WS_TOOLS)/pkglintrc $< |
139 -f $(WS_TOOLS)/pkglintrc $< |
137 $(PKGFMT) <$< >$@ |
140 $(PKGFMT) <$< >$@ |
138 |
141 |
139 # published |
142 # published |
|
143 PKGSEND_PUBLISH_OPTIONS = -s $(PKG_REPO) publish --fmri-in-manifest |
|
144 PKGSEND_PUBLISH_OPTIONS += $(PKG_PROTO_DIRS:%=-d %) |
140 $(MANIFEST_BASE)-%.published: $(MANIFEST_BASE)-%.linted |
145 $(MANIFEST_BASE)-%.published: $(MANIFEST_BASE)-%.linted |
141 $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \ |
146 $(PKGSEND) $(PKGSEND_PUBLISH_OPTIONS) $< |
142 -d $(PROTO_DIR) -d $(@D) -d . $< |
|
143 $(PKGFMT) <$< >$@ |
147 $(PKGFMT) <$< >$@ |
144 |
148 |
145 $(BUILD_DIR)/.published: $(PUBLISHED) |
149 $(BUILD_DIR)/.published: $(PUBLISHED) |
146 $(TOUCH) $@ |
150 $(TOUCH) $@ |
147 |
151 |