mirror of
https://github.com/OpenNebula/one.git
synced 2024-12-22 13:33:52 +03:00
More help info and fixed bug in build logging
git-svn-id: http://svn.opennebula.org/one/trunk@108 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
parent
dd9b249ced
commit
6cdfc57d7d
@ -71,6 +71,7 @@ else:
|
||||
|
||||
try:
|
||||
main_env.ParseConfig('share/scons/get_xmlrpc_config server')
|
||||
main_env.ParseConfig('share/scons/get_xmlrpc_config client')
|
||||
except Exception, e:
|
||||
print ""
|
||||
print "Error searching for xmlrpc-c libraries. Please check this things:"
|
||||
@ -81,6 +82,9 @@ except Exception, e:
|
||||
print " * Check that the version of xmlrpc-c is at least 1.06. You can do this also"
|
||||
print " calling:"
|
||||
print " $ xmlrpc-c-config --version"
|
||||
print " * If all this requirements are already met please send log files located in"
|
||||
print " .xmlrpc_test to the mailing list."
|
||||
print ""
|
||||
exit(-1)
|
||||
|
||||
# SCONS scripts to build
|
||||
|
@ -98,8 +98,6 @@ def exec_command(command)
|
||||
text=`#{command} 2>/dev/null`
|
||||
text.gsub!("\n", " ")
|
||||
|
||||
STDERR.puts text.inspect
|
||||
|
||||
if $?!=0
|
||||
STDERR.puts " Error calling #{command}"
|
||||
nil
|
||||
@ -143,7 +141,6 @@ Configs=[
|
||||
:server => exec_command("xmlrpc-c-config c++2 abyss-server --libs --cflags"),
|
||||
},
|
||||
# Configuration for Mac OS X and Debian
|
||||
=begin
|
||||
{
|
||||
:description => "hardcoded libraries for Mac OS X (installed using port)",
|
||||
:server => flags_and_libs_array("-I/opt/local/include -L/opt/local/lib", [
|
||||
@ -165,7 +162,6 @@ Configs=[
|
||||
'wwwcore', 'wwwutils', 'm', 'md5'
|
||||
])
|
||||
},
|
||||
=end
|
||||
# Example adding more custom libraries
|
||||
# {
|
||||
# :client => exec_command("xmlrpc-c-config client c++ --cflags --libs"),
|
||||
@ -179,8 +175,8 @@ def compile(file, args)
|
||||
logfile="#{file}.log"
|
||||
command="g++ #{file} -o #{file}.out #{args} 1>>#{logfile} 2>&1"
|
||||
|
||||
open(logfile, "w+") {|f|
|
||||
f.write(command)
|
||||
open(logfile, "a") {|f|
|
||||
f.write(command+"\n")
|
||||
}
|
||||
|
||||
STDERR.puts command
|
||||
|
Loading…
Reference in New Issue
Block a user