Review Request : 7143162 : Allow disable building of jdk demos and samples (original) (raw)
Mike Duigou mike.duigou at oracle.com
Tue Mar 6 04:33:23 UTC 2012
- Previous message (by thread): Review Request : 7143162 : Allow disable building of jdk demos and samples
- Next message (by thread): Review Request : 7143162 : Allow disable building of jdk demos and samples
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Yes, it looks like part of it should be skipped. I did not try the NO_DEMOS patch with closed source in the path.
If I were writing Release.gmk today I would make the DB rule run after the initial-image-jre step so that it could install things directly to their final destination.
Here's a patch which should disable demos for the db step. If it works I will create an issue.
Thanks,
Mike
diff --git a/make/common/Release.gmk b/make/common/Release.gmk --- a/make/common/Release.gmk +++ b/make/common/Release.gmk @@ -947,8 +947,12 @@ done (CP)(CP) (CP)(ABS_DB_PATH)/README-JDK.html $(JDK_IMAGE_DIR)/db (RM)−rf(RM) -rf (RM)−rf(DEMODIR)/db +ifdef NO_DEMOS (MV)(MV) (MV)(JDK_IMAGE_DIR)/db/demo $(DEMODIR)/db (CP)(CP) (CP)(ABS_DB_PATH)/README-JDK-DEMOS.html $(DEMODIR)/db/ +else
<span class="katex"><span class="katex-mathml"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mo stretchy="false">(</mo><mi>R</mi><mi>M</mi><mo stretchy="false">)</mo></mrow><annotation encoding="application/x-tex">(RM) </annotation></semantics></math></span><span class="katex-html" aria-hidden="true"><span class="base"><span class="strut" style="height:1em;vertical-align:-0.25em;"></span><span class="mopen">(</span><span class="mord mathnormal" style="margin-right:0.10903em;">RM</span><span class="mclose">)</span></span></span></span>(JDK_IMAGE_DIR)/db/demo
+endif (RM)(RM) (RM)(JDK_IMAGE_DIR)/db/index.html $(JDK_IMAGE_DIR)/db/register.html endif
On Mar 5 2012, at 19:41 , David Holmes wrote:
Shouldn't we skip this section if NODEMOS is specified?
David On 6/03/2012 1:34 PM, Weijun Wang wrote: If NODEMOS are specified, there is no demo dir and "make images" fails. Yes, maybe it should fail, but I must work with images build now (on deploy workspace) and I really like the NODEMOS option...
How about this? diff --git a/make/common/Release.gmk b/make/common/Release.gmk --- a/make/common/Release.gmk +++ b/make/common/Release.gmk @@ -947,6 +947,7 @@ done $(CP) (ABSDBPATH)/README−JDK.html(ABSDBPATH)/README-JDK.html (ABSDBPATH)/README−JDK.html(JDKIMAGEDIR)/db $(RM) -rf $(DEMODIR)/db + (MKDIR)(MKDIR) (MKDIR)(DEMODIR) $(MV) (JDKIMAGEDIR)/db/demo(JDKIMAGEDIR)/db/demo (JDKIMAGEDIR)/db/demo(DEMODIR)/db $(CP) (ABSDBPATH)/README−JDK−DEMOS.html(ABSDBPATH)/README-JDK-DEMOS.html (ABSDBPATH)/README−JDK−DEMOS.html(DEMODIR)/db/ $(RM) (JDKIMAGEDIR)/db/index.html(JDKIMAGEDIR)/db/index.html (JDKIMAGEDIR)/db/index.html(JDKIMAGEDIR)/db/register.html Thanks Max On 02/28/2012 09:53 AM, Kelly O'Hair wrote: Looks fine to me.
-kto On Feb 27, 2012, at 4:14 PM, Mike Duigou wrote:
Hello all;
WEBREV @ http://cr.openjdk.java.net/~mduigou/7143162/1/webrev/ An updated version of my previous webrev. I'm reposting it because this version includes a previously missing bit from the top level sanity makefile that produce warning notices when demos and samples are turned off similar to the NODOCS javadoc warning. Also includes a correction in Release.gmk. Overall this is fairly simple patch for review. It allows developers to shut off building of the jdk demos and samples. Disabling these builds has a very positive impact upon build turnaround for incremental builds. Export NODEMOS and/or NOSAMPLES in your shell before running make and demos and/or samples will be skipped. The default behaviour remains unchanged. Thanks, Mike
- Previous message (by thread): Review Request : 7143162 : Allow disable building of jdk demos and samples
- Next message (by thread): Review Request : 7143162 : Allow disable building of jdk demos and samples
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]