Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UMA: Add ability to override flags from command line #78

Merged
merged 1 commit into from
Sep 21, 2017
Merged

UMA: Add ability to override flags from command line #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions sourcetools/com.ibm.uma/com/ibm/j9/uma/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@
package com.ibm.j9.uma;

import com.ibm.j9.uma.configuration.ConfigurationImpl;
import com.ibm.j9tools.om.Flag;
import com.ibm.uma.UMA;
import com.ibm.uma.UMAException;
import com.ibm.uma.util.Logger;
import java.io.File;
import java.util.HashMap;

public class Main {
static String applicationVersion = "2.5.1";
Expand Down Expand Up @@ -54,6 +56,8 @@ public class Main {
static String option_jitVersionFile_short = "-jvf";
static String option_excludeArtifacts = "-excludeArtifacts";
static String option_excludeArtifacts_short = "-ea";
static String option_define = "-D";
static String option_undefine = "-U";

static boolean splashed = false;
static boolean quiet = false;
Expand All @@ -66,8 +70,9 @@ public class Main {
static String buildTag = "dev_12150101_0000_B0";
static String jitVersionFile = "";
static String excludeArtifacts = "";
static HashMap<String, Boolean> overrideFlags = new HashMap<String,Boolean>();
static Logger logger;

static void dumpSplash() {
if (splashed||quiet) {
return;
Expand All @@ -79,11 +84,12 @@ static void dumpSplash() {

static void dumpHelp() {
dumpSplash();
System.err.println(applicationNameShort + " [options] " + option_rootDir + " <directory> " + option_configDir + " <directory> " + option_buildSpecId + " <specId>");
System.err.println(applicationNameShort + " [options] " + option_rootDir + " <directory> " + option_configDir + " <directory> " + option_buildSpecId + " <specId>" );
System.err.println("options:");
System.err.println("\t-quiet");
System.err.println("\t-verbose");
System.err.println("\t-help");
System.err.println("\t" +"{" + option_define + "|" + option_undefine + "} <flagName>");
System.err.println("\t" + option_rootDir + " <directory>");
System.err.println("\t" + option_configDir + " <directory>");
System.err.println("\t" + option_buildSpecId + " <specId>");
Expand Down Expand Up @@ -173,6 +179,20 @@ static boolean parseOptions(String[] args) {
excludeArtifacts = args[++i];
excludeArtifacts = excludeArtifacts.trim();
continue;
} else if (arg.equalsIgnoreCase(option_define) ) {
if ( i+1 >= args.length ) {
System.err.println("Must provide an argument for option " + arg + "\n");
return false;
}
overrideFlags.put(args[++i], true);
continue;
} else if (arg.equalsIgnoreCase(option_undefine) ) {
if ( i+1 >= args.length ) {
System.err.println("Must provide an argument for option " + arg + "\n");
return false;
}
overrideFlags.put(args[++i], false);
continue;
} else {
System.err.println("Unknown command line option " + arg + "\n");
return false;
Expand Down Expand Up @@ -219,6 +239,16 @@ public static void main(String[] args) {

try {
ConfigurationImpl configuration = new ConfigurationImpl(configDirectory, buildSpecId, buildId, buildDate, buildTag, jitVersionFile, excludeArtifacts);
for(String flagString: overrideFlags.keySet()){
if(!configuration.isFlagValid(flagString)){
throw new UMAException("Invalid flag override: " + flagString);
}
Flag flag = configuration.getBuildSpec().getFlag(flagString);
flag.setState(overrideFlags.get(flagString));
}
// Since we may have changed some flags, we need to re-verify them
configuration.verify();

new UMA(configuration, configuration, rootDir).generate();
} catch (NullPointerException e) {
logger.println(Logger.ErrorLog, "Internal error: null pointer exception");
Expand Down
9 changes: 9 additions & 0 deletions sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/ConfigurationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import com.ibm.j9tools.om.ConfigDirectory;
import com.ibm.j9tools.om.Flag;
import com.ibm.j9tools.om.FlagDefinitions;
import com.ibm.j9tools.om.InvalidBuildSpecException;
import com.ibm.j9tools.om.InvalidConfigurationException;
import com.ibm.j9tools.om.OMObjectException;
import com.ibm.j9tools.om.ObjectFactory;
Expand Down Expand Up @@ -471,4 +472,12 @@ public String getAdditionalIncludesForArtifact(Artifact artifact)
return "";
}

public void verify() throws UMAException {
try {
buildSpec.verify(flagDefs, buildInfo);
} catch (InvalidBuildSpecException e) {
throw new UMAException(e);
}
}

}