You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/04/28 02:09:38 UTC
[11/32] incubator-mynewt-newt git commit: newt - Allow multiple apps
to be built.
newt - Allow multiple apps to be built.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/edccbe6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/edccbe6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/edccbe6e
Branch: refs/heads/master
Commit: edccbe6e8b2ac21e48952215124197aca7ddd4ad
Parents: fb773db
Author: Christopher Collins <cc...@apache.org>
Authored: Thu Mar 31 15:03:34 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Thu Mar 31 15:03:34 2016 -0700
----------------------------------------------------------------------
newt/cli/build_cmds.go | 112 +++++++++++++++++++++++---------------------
newt/cli/util.go | 13 +++++
newt/newt.go | 10 ++--
newt/target/target.go | 4 ++
4 files changed, 80 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/edccbe6e/newt/cli/build_cmds.go
----------------------------------------------------------------------
diff --git a/newt/cli/build_cmds.go b/newt/cli/build_cmds.go
index 5126096..2d44ac7 100644
--- a/newt/cli/build_cmds.go
+++ b/newt/cli/build_cmds.go
@@ -45,22 +45,42 @@ func buildRunCmd(cmd *cobra.Command, args []string) {
NewtUsage(cmd, nil)
}
- t := ResolveTarget(args[0])
- if t == nil {
- NewtUsage(cmd, util.NewNewtError("invalid target name: "+args[0]))
- }
-
- b, err := builder.NewBuilder(t)
- if err != nil {
- NewtUsage(nil, err)
- }
- err = b.Build()
+ // Verify that all target names are valid.
+ _, err := ResolveTargets(args...)
if err != nil {
- NewtUsage(nil, err)
+ NewtUsage(cmd, err)
}
- util.StatusMessage(util.VERBOSITY_DEFAULT, "App successfully built: %s\n",
- b.AppElfPath())
+ for _, targetName := range args {
+ // Reset the global state for the next build.
+ if err := ResetGlobalState(); err != nil {
+ NewtUsage(nil, err)
+ }
+
+ // Lookup the target by name. This has to be done a second time here
+ // now that the project has been reset.
+ t := ResolveTarget(targetName)
+ if t == nil {
+ NewtUsage(nil, util.NewNewtError("Failed to resolve target: "+
+ targetName))
+ }
+
+ util.StatusMessage(util.VERBOSITY_DEFAULT, "Building target %s\n",
+ t.FullName())
+
+ b, err := builder.NewBuilder(t)
+ if err != nil {
+ NewtUsage(nil, err)
+ }
+
+ err = b.Build()
+ if err != nil {
+ NewtUsage(nil, err)
+ }
+
+ util.StatusMessage(util.VERBOSITY_DEFAULT, "App successfully built: "+
+ "%s\n", b.AppElfPath())
+ }
}
func cleanRunCmd(cmd *cobra.Command, args []string) {
@@ -157,8 +177,10 @@ func testRunCmd(cmd *cobra.Command, args []string) {
passedPkgs := []*pkg.LocalPackage{}
failedPkgs := []*pkg.LocalPackage{}
for _, pack := range packs {
- // Reset the global project for the next test.
- project.ResetProject()
+ // Reset the global state for the next test.
+ if err := ResetGlobalState(); err != nil {
+ NewtUsage(nil, err)
+ }
// Use the standard unit test target for all tests.
t := ResolveTarget(TARGET_TEST_NAME)
@@ -279,76 +301,58 @@ func sizeRunCmd(cmd *cobra.Command, args []string) {
}
func AddBuildCommands(cmd *cobra.Command) {
- buildHelpText := ""
- buildHelpEx := ""
buildCmd := &cobra.Command{
- Use: "build",
- Short: "Builds one or more apps.",
- Long: buildHelpText,
- Example: buildHelpEx,
- Run: buildRunCmd,
+ Use: "build <target-name> [target-names...]",
+ Short: "Builds one or more targets.",
+ Run: buildRunCmd,
}
cmd.AddCommand(buildCmd)
- cleanHelpText := ""
- cleanHelpEx := ""
cleanCmd := &cobra.Command{
- Use: "clean",
- Short: "Deletes app build artifacts.",
- Long: cleanHelpText,
- Example: cleanHelpEx,
- Run: cleanRunCmd,
+ Use: "clean <target-name> [target-names...] | all",
+ Short: "Deletes build artifacts for one or more targets.",
+ Run: cleanRunCmd,
}
cmd.AddCommand(cleanCmd)
- testHelpText := ""
- testHelpEx := ""
testCmd := &cobra.Command{
- Use: "test",
- Short: "Executes unit tests for one or more packages",
- Long: testHelpText,
- Example: testHelpEx,
- Run: testRunCmd,
+ Use: "test <package-name> [package-names...] | all",
+ Short: "Executes unit tests for one or more packages",
+ Run: testRunCmd,
}
cmd.AddCommand(testCmd)
loadHelpText := "Load app image to target for <target-name>."
- loadHelpEx := " newt load <target-name>\n"
loadCmd := &cobra.Command{
- Use: "load",
- Short: "Load built target to board",
- Long: loadHelpText,
- Example: loadHelpEx,
- Run: loadRunCmd,
+ Use: "load <target-name>",
+ Short: "Load built target to board",
+ Long: loadHelpText,
+ Run: loadRunCmd,
}
cmd.AddCommand(loadCmd)
debugHelpText := "Open debugger session for <target-name>."
- debugHelpEx := " newt debug <target-name>\n"
debugCmd := &cobra.Command{
- Use: "debug",
- Short: "Open debugger session to target",
- Long: debugHelpText,
- Example: debugHelpEx,
- Run: debugRunCmd,
+ Use: "debug <target-name>",
+ Short: "Open debugger session to target",
+ Long: debugHelpText,
+ Run: debugRunCmd,
}
cmd.AddCommand(debugCmd)
sizeHelpText := "Calculate the size of target components specified by " +
"<target-name>."
- sizeHelpEx := " newt size <target-name>\n"
sizeCmd := &cobra.Command{
- Use: "size",
- Short: "Size of target components",
- Long: sizeHelpText,
- Example: sizeHelpEx,
- Run: sizeRunCmd,
+ Use: "size <target-name>",
+ Short: "Size of target components",
+ Long: sizeHelpText,
+ Run: sizeRunCmd,
}
cmd.AddCommand(sizeCmd)
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/edccbe6e/newt/cli/util.go
----------------------------------------------------------------------
diff --git a/newt/cli/util.go b/newt/cli/util.go
index 4270ea1..5db85e7 100644
--- a/newt/cli/util.go
+++ b/newt/cli/util.go
@@ -181,3 +181,16 @@ func PackageNameList(pkgs []*pkg.LocalPackage) string {
return buffer.String()
}
+
+func ResetGlobalState() error {
+ // Make sure the current working directory is at the project base.
+ if err := os.Chdir(project.GetProject().Path()); err != nil {
+ return util.NewNewtError("Failed to reset global state: " +
+ err.Error())
+ }
+
+ target.ResetTargets()
+ project.ResetProject()
+
+ return nil
+}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/edccbe6e/newt/newt.go
----------------------------------------------------------------------
diff --git a/newt/newt.go b/newt/newt.go
index b1d718e..109f821 100644
--- a/newt/newt.go
+++ b/newt/newt.go
@@ -85,15 +85,15 @@ func newtCmd() *cobra.Command {
}
newtCmd.PersistentFlags().BoolVarP(&newtVerbose, "verbose", "v", false,
- "Enable verbose output when executing commands.")
+ "Enable verbose output when executing commands")
newtCmd.PersistentFlags().BoolVarP(&newtQuiet, "quiet", "q", false,
- "Be quiet; only display error output.")
+ "Be quiet; only display error output")
newtCmd.PersistentFlags().BoolVarP(&newtSilent, "silent", "s", false,
- "Be silent; don't output anything.")
+ "Be silent; don't output anything")
newtCmd.PersistentFlags().StringVarP(&logLevelStr, "loglevel", "l",
- "WARN", "Log level, defaults to WARN.")
+ "WARN", "Log level")
newtCmd.PersistentFlags().StringVarP(&newtLogFile, "outfile", "o",
- "", "Filename to tee log output to")
+ "", "Filename to tee output to")
versHelpText := cli.FormatHelp(`Display the Newt version number.`)
versHelpEx := " newt version"
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/edccbe6e/newt/target/target.go
----------------------------------------------------------------------
diff --git a/newt/target/target.go b/newt/target/target.go
index b69d938..7d8b6f8 100644
--- a/newt/target/target.go
+++ b/newt/target/target.go
@@ -252,6 +252,10 @@ func buildTargetMap() error {
return nil
}
+func ResetTargets() {
+ globalTargetMap = nil
+}
+
func GetTargets() map[string]*Target {
if globalTargetMap == nil {
err := buildTargetMap()