All submissions to this site are governed by the Second Life Viewer Contribution Agreement. By submitting patches and other information using this site, you acknowledge that you have read, understood, and agreed to those terms.

Review Board 1.6.11

Welcome to the Second Life Viewer Code Review tool.
See the documentation on our wiki for how to use this site.

Do not create the build directory when --dry-run is specified

Review Request #575 - Created April 15, 2012 and submitted

Oz Linden Reviewers
OPEN-60 nat_linden, mz
None autobuild
When --dry-run is specified, the command should not modify anything, including even not creating an empty build directory.

This change also fixes the fact that --dry-run didn't work at all in the 'install' subcommand.

 
autobuild/autobuild_tool_build.py
Revision de8ca3eb8d31 New Change
... 75 lines hidden [Expand]
def register(self, parser):
76
        parser.add_argument('--configuration', '-c', nargs='?', action="append", dest='configurations', 
76
        parser.add_argument('--configuration', '-c', nargs='?', action="append", dest='configurations', 
77
                            help="build a specific build configuration\n(may be specified as comma separated values in $AUTOBUILD_CONFIGURATION)",
77
                            help="build a specific build configuration\n(may be specified as comma separated values in $AUTOBUILD_CONFIGURATION)",
78
                            metavar='CONFIGURATION',
78
                            metavar='CONFIGURATION',
79
                            default=self.configurations_from_environment())
79
                            default=self.configurations_from_environment())
80
        parser.add_argument('--use-cwd', dest='use_cwd', default=False, action="store_true",
80
        parser.add_argument('--use-cwd', dest='use_cwd', default=False, action="store_true",
81
            help="build in current working directory")
81
            help="build in current working directory")
82

   
82

   
83
    def run(self, args):
83
    def run(self, args):
84
        config = configfile.ConfigurationDescription(args.config_file)
84
        config = configfile.ConfigurationDescription(args.config_file)
85
        current_directory = os.getcwd()
85
        current_directory = os.getcwd()
86
        build_directory = config.make_build_directory()
86
        build_directory = config.make_build_directory(args.dry_run)
87
        logger.debug("building in %s" % build_directory)
87
        logger.debug("building in %s" % build_directory)
88
        if not args.use_cwd:
88
        if not args.use_cwd:
89
            os.chdir(build_directory)
89
            os.chdir(build_directory)
90
        try:
90
        try:
91
            configure_first = not args.do_not_configure
91
            configure_first = not args.do_not_configure
92
            if args.all:
92
            if args.all:
93
                build_configurations = config.get_all_build_configurations()
93
                build_configurations = config.get_all_build_configurations()
94
            elif args.configurations:
94
            elif args.configurations:
95
                build_configurations = \
95
                build_configurations = \
96
                    [config.get_build_configuration(name) for name in args.configurations]
96
                    [config.get_build_configuration(name) for name in args.configurations]
... 58 lines hidden [Expand]
autobuild/autobuild_tool_configure.py
Revision de8ca3eb8d31 New Change
 
autobuild/autobuild_tool_install.py
Revision de8ca3eb8d31 New Change
 
autobuild/autobuild_tool_uninstall.py
Revision de8ca3eb8d31 New Change
 
autobuild/configfile.py
Revision de8ca3eb8d31 New Change
 
  1. autobuild/autobuild_tool_build.py: Loading...
  2. autobuild/autobuild_tool_configure.py: Loading...
  3. autobuild/autobuild_tool_install.py: Loading...
  4. autobuild/autobuild_tool_uninstall.py: Loading...
  5. autobuild/configfile.py: Loading...