Review Request : 7143162 : Allow disable building of jdk demos and samples (original) (raw)

David Holmes david.holmes at oracle.com
Tue Mar 6 05:20:21 UTC 2012

Can't this:

928 # DB files to add 929 ifdef OPENJDK 930 931 initial-image-jdk-db: 932 933 else 934 935 # Create the list of db .zip files to bundle with jdk 936 ABS_DB_PATH :=$(call FullPath,$(CLOSED_SHARE_SRC)/db) 937 DB_ZIP_LIST = (shell(shell (shell(LS) $(ABS_DB_PATH)/.zip 2>/dev/null) 938 939 # Java DB image. Move the Java DB demo directory into the JDK's demo

simply become:

928 # DB files to add 929 ifdef OPENJDK 930 931 initial-image-jdk-db: 932 933 else ifdef NO_DEMOS initial-image-jdk-db: else 934 935 # Create the list of db .zip files to bundle with jdk 936 ABS_DB_PATH :=$(call FullPath,$(CLOSED_SHARE_SRC)/db) 937 DB_ZIP_LIST = (shell(shell (shell(LS) $(ABS_DB_PATH)/.zip 2>/dev/null) 938 939 # Java DB image. Move the Java DB demo directory into the JDK's demo ... endif

David

On 6/03/2012 2:33 PM, Mike Duigou wrote:

Yes, it looks like part of it should be skipped. I did not try the NODEMOS 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) (ABSDBPATH)/README−JDK.html(ABSDBPATH)/README-JDK.html (ABSDBPATH)/README−JDK.html(JDKIMAGEDIR)/db $(RM) -rf $(DEMODIR)/db +ifdef NODEMOS $(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/ +else + (RM)(RM) (RM)(JDKIMAGEDIR)/db/demo +endif $(RM) (JDKIMAGEDIR)/db/index.html(JDKIMAGEDIR)/db/index.html (JDKIMAGEDIR)/db/index.html(JDKIMAGEDIR)/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

More information about the build-dev mailing list