kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Remove warning and fix the logic

Browse Source
This commit is contained in:
Andy Cedilnik 2005-03-06 08:51:08 -05:00
parent 70b01d4506
commit 8248953df1
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DartConfig.cmake
View File

@ -8,7 +8,7 @@ IF(DROP_METHOD MATCHES http)
SET (DROP_LOCATION "/cgi-bin/HTTPUploadDartFile.cgi") SET (DROP_LOCATION "/cgi-bin/HTTPUploadDartFile.cgi")
ELSE(DROP_METHOD MATCHES http) ELSE(DROP_METHOD MATCHES http)
IF(DROP_METHOD MATCHES xmlrpc) IF(DROP_METHOD MATCHES xmlrpc)
SET (DROP_SITE "http://na-mic.org:8081/Insight/") SET (DROP_SITE "http://www.na-mic.org:8080/")
SET (DROP_LOCATION "Insight") SET (DROP_LOCATION "Insight")
SET (COMPRESS_SUBMISSION ON) SET (COMPRESS_SUBMISSION ON)
ELSE(DROP_METHOD MATCHES xmlrpc) ELSE(DROP_METHOD MATCHES xmlrpc)

13
Source/CTest/cmCTestSubmit.cxx
View File

@ -558,7 +558,6 @@ bool cmCTestSubmit::SubmitUsingXMLRPC(const cmStdString& localprefix,
const cmStdString& url) const cmStdString& url)
{ {
xmlrpc_env env; xmlrpc_env env;
xmlrpc_value *result;
std::string ctestVersion = cmVersion::GetCMakeVersion(); std::string ctestVersion = cmVersion::GetCMakeVersion();
const char *state_name; const char *state_name;
@ -576,6 +575,8 @@ bool cmCTestSubmit::SubmitUsingXMLRPC(const cmStdString& localprefix,
int cnt = 32; int cnt = 32;
for ( it = files.begin(); it != files.end(); ++it ) for ( it = files.begin(); it != files.end(); ++it )
{ {
xmlrpc_value *result;
std::string local_file = localprefix + "/" + *it; std::string local_file = localprefix + "/" + *it;
std::cout << "Submit file: " << local_file.c_str() << std::endl; std::cout << "Submit file: " << local_file.c_str() << std::endl;
struct stat st; struct stat st;
@ -592,15 +593,15 @@ bool cmCTestSubmit::SubmitUsingXMLRPC(const cmStdString& localprefix,
{ {
return false; return false;
} }
unsigned char *fileBuffer = new unsigned char[fileSize]; unsigned char *fileBuffer = new unsigned char[fileSize];
unsigned char *encodedFileBuffer = new unsigned char[encodedSize]; unsigned char *encodedFileBuffer = new unsigned char[encodedSize];
if ( fread(fileBuffer, 1, fileSize, fp) != fileSize ) if ( fread(fileBuffer, 1, fileSize, fp) != fileSize )
{ {
delete [] fileBuffer; delete [] fileBuffer;
delete [] encodedFileBuffer; delete [] encodedFileBuffer;
return false;
fclose(fp); fclose(fp);
return false;
} }
fclose(fp); fclose(fp);
@ -649,10 +650,10 @@ bool cmCTestSubmit::SubmitUsingXMLRPC(const cmStdString& localprefix,
} }
printf("%s\n", state_name); printf("%s\n", state_name);
}
/* Dispose of our result value. */ /* Dispose of our result value. */
xmlrpc_DECREF(result); xmlrpc_DECREF(result);
}
/* Clean up our error-handling environment. */ /* Clean up our error-handling environment. */
xmlrpc_env_clean(&env); xmlrpc_env_clean(&env);

7
Source/cmCTest.cxx
View File

@ -694,7 +694,7 @@ int cmCTest::SubmitResults()
ofs << " Submission succesfull" << std::endl; ofs << " Submission succesfull" << std::endl;
return 1; return 1;
} }
else else if ( m_DartConfiguration["DropMethod"] == "scp" )
{ {
std::string url; std::string url;
if ( m_DartConfiguration["DropSiteUser"].size() > 0 ) if ( m_DartConfiguration["DropSiteUser"].size() > 0 )
@ -713,6 +713,11 @@ int cmCTest::SubmitResults()
std::cout << " Submission successfull" << std::endl; std::cout << " Submission successfull" << std::endl;
ofs << " Submission succesfull" << std::endl; ofs << " Submission succesfull" << std::endl;
} }
else
{
std::cout << " Unknown submission method: \"" << m_DartConfiguration["DropMethod"] << "\"" << std::endl;
return 0;
}
return 0; return 0;
} }