Revision: 6539 Author: [email protected] Date: Thu Oct 29 08:04:17 2009 Log: Merginging trunk c6450.
svn merge --ignore-ancestry -c6450 https://google-web-toolkit.googlecode.com/svn/trunk . Cleans up SOYC options: -compileReport is now preferred way to generate SOYC reports, -soyc is now undocumented, and getting detailed SOYC report now automatically implies the regular SOYC report also. Review by: spoon http://code.google.com/p/google-web-toolkit/source/detail?r=6539 Added: /releases/2.0/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerCompileReport.java Modified: /releases/2.0/dev/core/src/com/google/gwt/dev/Precompile.java /releases/2.0/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSoyc.java /releases/2.0/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSoycDetailed.java /releases/2.0/dev/core/src/com/google/gwt/dev/util/arg/OptionSoycDetailed.java ======================================= --- /dev/null +++ /releases/2.0/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerCompileReport.java Thu Oct 29 08:04:17 2009 @@ -0,0 +1,46 @@ +/* + * Copyright 2009 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.gwt.dev.util.arg; + +import com.google.gwt.util.tools.ArgHandlerFlag; + +/** + * An ArgHandler that enables Story Of Your Compile data-collection. + */ +public class ArgHandlerCompileReport extends ArgHandlerFlag { + + private final OptionSoycEnabled options; + + public ArgHandlerCompileReport(OptionSoycEnabled options) { + this.options = options; + } + + @Override + public String getPurpose() { + return "Enable Compile Report (Story of Your Compile)"; + } + + @Override + public String getTag() { + return "-compileReport"; + } + + @Override + public boolean setFlag() { + options.setSoycEnabled(true); + return true; + } +} ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/Precompile.java Mon Oct 19 09:31:20 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/Precompile.java Thu Oct 29 08:04:17 2009 @@ -43,6 +43,7 @@ import com.google.gwt.dev.util.Memory; import com.google.gwt.dev.util.PerfLogger; import com.google.gwt.dev.util.Util; +import com.google.gwt.dev.util.arg.ArgHandlerCompileReport; import com.google.gwt.dev.util.arg.ArgHandlerDisableAggressiveOptimization; import com.google.gwt.dev.util.arg.ArgHandlerDisableCastChecking; import com.google.gwt.dev.util.arg.ArgHandlerDisableClassMetadata; @@ -105,6 +106,7 @@ registerHandler(new ArgHandlerDisableUpdateCheck(options)); registerHandler(new ArgHandlerDumpSignatures(options)); registerHandler(new ArgHandlerMaxPermsPerPrecompile(options)); + registerHandler(new ArgHandlerCompileReport(options)); registerHandler(new ArgHandlerSoyc(options)); registerHandler(new ArgHandlerSoycDetailed(options)); } ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSoyc.java Mon Oct 19 09:31:20 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSoyc.java Thu Oct 29 08:04:17 2009 @@ -37,6 +37,11 @@ public String getTag() { return "-soyc"; } + + @Override + public boolean isUndocumented() { + return true; + } @Override public boolean setFlag() { ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSoycDetailed.java Mon Oct 19 09:31:20 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSoycDetailed.java Thu Oct 29 08:04:17 2009 @@ -45,6 +45,7 @@ @Override public boolean setFlag() { options.setSoycExtra(true); + options.setSoycEnabled(true); return true; } } ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/util/arg/OptionSoycDetailed.java Mon Oct 19 09:31:20 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/util/arg/OptionSoycDetailed.java Thu Oct 29 08:04:17 2009 @@ -25,6 +25,12 @@ */ boolean isSoycExtra(); + /** + * Sets whether or not the compiler should record and emit SOYC information + * and build the dashboard. + */ + void setSoycEnabled(boolean enabled); + /** * Sets whether or not the compiler should record and emit extra SOYC * information. --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
