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) 2010, 2015, Oracle and/or its affiliates. All rights reserved. |
21 # Copyright (c) 2010, 2016, 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 # for now, the assumption is we build any directory with a Makefile. This may |
26 # for now, the assumption is we build any directory with a Makefile. This may |
151 |
151 |
152 # Turn userland-incorporator warnings into build failures |
152 # Turn userland-incorporator warnings into build failures |
153 INCORPORATE_WERROR ?= --Werror |
153 INCORPORATE_WERROR ?= --Werror |
154 |
154 |
155 incorporation: |
155 incorporation: |
156 $(PKGREPO) refresh -s $(PKG_REPO) |
156 $(WS_TOOLS)/userland-incorporator \ |
157 $(WS_TOOLS)/userland-incorporator --repository $(PKG_REPO) \ |
157 --repository $(PKG_REPO) \ |
158 --version=0.$(OS_VERSION),$(BUILD_VERSION) -p $(PUBLISHER) \ |
158 --version 0.$(OS_VERSION),$(BUILD_VERSION) \ |
159 -c $(CONSOLIDATION) --destdir=$(WS_MACH) $(INCORPORATE_WERROR) |
159 --publisher $(PUBLISHER) \ |
|
160 --consolidation $(CONSOLIDATION) \ |
|
161 --destdir $(WS_MACH) \ |
|
162 --static-content-file $(WS_COMPONENTS)/meta-packages/incorporation-cache \ |
|
163 $(INCORPORATE_WERROR) |
160 for incorporation in $(WS_MACH)/*.p5m ; do \ |
164 for incorporation in $(WS_MACH)/*.p5m ; do \ |
161 $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \ |
165 $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \ |
162 $${incorporation} ; \ |
166 $${incorporation} ; \ |
163 done |
167 done |
164 |
168 |