From 7bab07aedc7764dcfeae3df8cdf8c3ed8211df57 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Thu, 12 Jun 2008 21:48:58 +0000
Subject: [PATCH] comment out the "simple" cases - it is never as simple as
that.
---
indra/develop.py | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/indra/develop.py b/indra/develop.py
index 1f9b08c59c8..fb2319ccf6d 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -109,8 +109,8 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
unattended=self.unattended,
type=self.build_type.upper(),
)
- if simple:
- return 'cmake %(opts)s %(dir)r' % args
+ #if simple:
+ # return 'cmake %(opts)s %(dir)r' % args
return ('cmake -DCMAKE_BUILD_TYPE:STRING=%(type)s '
'-DSTANDALONE:BOOL=%(standalone)s '
'-DUNATTENDED:BOOL=%(unattended)s '
@@ -262,8 +262,11 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
gcc41 = distcc + self.find_in_path('g++-4.1', 'g++', True)
args.update({'cxx': ' '.join(gcc41), 'server':'FALSE',
'viewer':'TRUE'})
- if simple:
- return 'cmake %(opts)s %(dir)r' % args
+ #if simple:
+ # return (('cmake %(opts)s '
+ # '-DSERVER:BOOL=%(server)s '
+ # '-DVIEWER:BOOL=%(viewer)s '
+ # '%(dir)r') % args)
cmd = (('cmake -DCMAKE_BUILD_TYPE:STRING=%(type)s '
'-G %(generator)r -DSERVER:BOOL=%(server)s '
'-DVIEWER:BOOL=%(viewer)s -DSTANDALONE:BOOL=%(standalone)s '
@@ -371,8 +374,8 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
unattended=self.unattended,
type=self.build_type.upper()
)
- if simple:
- return 'cmake %(opts)s %(dir)r' % args
+ #if simple:
+ # return 'cmake %(opts)s %(dir)r' % args
return ('cmake -G %(generator)r '
'-DCMAKE_BUILD_TYPE:STRING=%(type)s '
'-DSTANDALONE:BOOL=%(standalone)s '
@@ -452,8 +455,8 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
standalone=self.standalone,
unattended=self.unattended,
)
- if simple:
- return 'cmake %(opts)s "%(dir)s"' % args
+ #if simple:
+ # return 'cmake %(opts)s "%(dir)s"' % args
return ('cmake -G "%(generator)s" '
'-DSTANDALONE:BOOL=%(standalone)s '
'-DUNATTENDED:BOOL=%(unattended)s '
@@ -550,8 +553,8 @@ def cmake_commandline(self, src_dir, build_dir, opts, simple):
standalone=self.standalone,
unattended=self.unattended,
)
- if simple:
- return 'cmake %(opts)s "%(dir)s"' % args
+ #if simple:
+ # return 'cmake %(opts)s "%(dir)s"' % args
return ('cmake -G "%(generator)s" '
'-DUNATTENDED:BOOl=%(unattended)s '
'-DSTANDALONE:BOOL=%(standalone)s '
--
GitLab