Browse Source

Added in support for parameters that are sent to builder.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269167 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
7b3d796305
1 changed files with 18 additions and 2 deletions
  1. +18
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java

+ 18
- 2
proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java View File

@@ -61,6 +61,7 @@ public class CLIMain
private static final int FILE_OPT = 'f'; private static final int FILE_OPT = 'f';
private static final int LOG_LEVEL_OPT = 'l'; private static final int LOG_LEVEL_OPT = 'l';
private static final int DEFINE_OPT = 'D'; private static final int DEFINE_OPT = 'D';
private static final int BUILDER_PARAM_OPT = 'B';
private static final int VERSION_OPT = 1; private static final int VERSION_OPT = 1;
private static final int LISTENER_OPT = 2; private static final int LISTENER_OPT = 2;
private static final int TASKLIB_DIR_OPT = 5; private static final int TASKLIB_DIR_OPT = 5;
@@ -92,6 +93,9 @@ public class CLIMain
///List of user supplied defines ///List of user supplied defines
private Parameters m_defines = new Parameters(); private Parameters m_defines = new Parameters();


///List of user supplied parameters for builder
private Parameters m_builderParameters = new Parameters();

/** /**
* Main entry point called to run standard Myrmidon. * Main entry point called to run standard Myrmidon.
* *
@@ -128,7 +132,7 @@ public class CLIMain
private CLOptionDescriptor[] createCLOptions() private CLOptionDescriptor[] createCLOptions()
{ {
//TODO: localise //TODO: localise
final CLOptionDescriptor[] options = new CLOptionDescriptor[ 11 ];
final CLOptionDescriptor[] options = new CLOptionDescriptor[ 12 ];


options[0] = options[0] =
new CLOptionDescriptor( "help", new CLOptionDescriptor( "help",
@@ -199,6 +203,14 @@ public class CLIMain
DEFINE_OPT, DEFINE_OPT,
"Define a variable (ie -Dfoo=var)", "Define a variable (ie -Dfoo=var)",
new int[ 0 ] ); new int[ 0 ] );

options[11] =
new CLOptionDescriptor( "builder-parameter",
CLOptionDescriptor.ARGUMENTS_REQUIRED_2,
BUILDER_PARAM_OPT,
"Define a builder parameter (ie -Bfoo=var)" );


return options; return options;
} }


@@ -243,6 +255,10 @@ public class CLIMain
m_defines.setParameter( option.getArgument( 0 ), option.getArgument( 1 ) ); m_defines.setParameter( option.getArgument( 0 ), option.getArgument( 1 ) );
break; break;


case BUILDER_PARAM_OPT:
m_builderParameters.setParameter( option.getArgument( 0 ), option.getArgument( 1 ) );
break;

case 0: m_targets.add( option.getArgument() ); break; case 0: m_targets.add( option.getArgument() ); break;
} }
} }
@@ -310,7 +326,7 @@ public class CLIMain


//create the project //create the project
final Project project = final Project project =
embeddor.createProject( buildFile.toString(), null, null );
embeddor.createProject( buildFile.toString(), null, m_builderParameters );


BufferedReader reader = null; BufferedReader reader = null;




Loading…
Cancel
Save