all.sln to o3d_all.sln

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29300 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 4 deletions

diff --git a/o3d/gypbuild.py b/o3d/gypbuild.py
index 2e042bf..e4fc5ca 100755
--- a/o3d/gypbuild.py
+++ b/o3d/gypbuild.py
@@ -39,6 +39,7 @@ class GypBuilder(object):
     self.verbose = False

 

     modes = ["build", "presubmit", "selenium", "unit_tests"]

+    versions = ["Debug", "Release"]

 

     parser = OptionParser()

     parser.add_option(

@@ -57,8 +58,11 @@ class GypBuilder(object):
         "--clean", action="store_true",

         help="clean the targets")

     parser.add_option(

-        "--mode", choices=modes,

-        default="build",

+        "--version", choices=versions, default="Debug",

+        help="version to build. Versions are '%s'. Default='Debug' " %

+             "', '".join(versions))

+    parser.add_option(

+        "--mode", choices=modes, default="build",

         help="mode to use. Valid modes are '%s'. Default='build' " %

              "', '".join(modes))

 

@@ -100,10 +104,11 @@ class GypBuilder(object):
     """Builds the specifed targets."""

     if os.name == 'nt':

       self.Execute(['msbuild',

-                    os.path.abspath('all.sln')])

+                    os.path.abspath('o3d_all.sln'),

+                    '/p:Configuration=%s' % options.version])

     elif platform.system() == 'Darwin':

       self.Execute(['xcodebuild',

-                    '-project', 'all.xcodeproj'])

+                    '-project', 'o3d_all.xcodeproj'])

     elif platform.system() == 'Linux':

       self.Execute(['hammer',

                     '-f', 'all_main.scons'])