[Cmake-commits] CMake branch, next, updated. v3.0.1-4822-gfa20d53
Brad King
brad.king at kitware.com
Mon Aug 11 09:32:14 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via fa20d537ee6957e8bc5ff9be4fbb45db50cf8dde (commit)
via 6c32d43ce2d8db87e348b281d9afe981d6ebc15d (commit)
via 137a0251aaa643f39d3e804bd9a9c3e8f1519ce0 (commit)
via 51c82c3a66f02192df4db5d51d95f7311bc2181f (commit)
via fe587db415b1cf728f42c5db55c3acbad7a9a529 (commit)
via 3b0d634f70db6af5469e83bb7c14f687bfafda74 (commit)
via 58aca7be5651646e1cb02d5a8a29062e38d9c2f5 (commit)
via 35a8355b6101dbb82582f9737ba1c3a67930de59 (commit)
from 715af63ea643821fb20f45020e00e1d77059534a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa20d537ee6957e8bc5ff9be4fbb45db50cf8dde
commit fa20d537ee6957e8bc5ff9be4fbb45db50cf8dde
Merge: 715af63 6c32d43
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 11 09:32:12 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 11 09:32:12 2014 -0400
Merge topic 'update-kwsys' into next
6c32d43c Merge branch 'upstream-kwsys' into update-kwsys
137a0251 KWSys 2014-08-11 (32023afd)
51c82c3a Merge branch 'upstream-kwsys' into update-kwsys
fe587db4 KWSys 2014-08-07 (4d526097)
3b0d634f CMake Nightly Date Stamp
58aca7be CMake Nightly Date Stamp
35a8355b CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c32d43ce2d8db87e348b281d9afe981d6ebc15d
commit 6c32d43ce2d8db87e348b281d9afe981d6ebc15d
Merge: 51c82c3 137a025
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 11 09:31:29 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 11 09:31:29 2014 -0400
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=137a0251aaa643f39d3e804bd9a9c3e8f1519ce0
commit 137a0251aaa643f39d3e804bd9a9c3e8f1519ce0
Author: KWSys Robot <kwrobot at kitware.com>
AuthorDate: Mon Aug 11 09:29:38 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 11 09:31:24 2014 -0400
KWSys 2014-08-11 (32023afd)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 32023afd | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 4d526097..32023afd
Christian Svensson (1):
32023afd CPU: Add support for OpenRISC 1000
Change-Id: Ie926eea76838b4ce7bcd7b23235f80c0f66c9d4c
diff --git a/CPU.h.in b/CPU.h.in
index 2e1a584..626914b 100644
--- a/CPU.h.in
+++ b/CPU.h.in
@@ -80,6 +80,10 @@
#elif defined(__mips) || defined(__mips__) || defined(__MIPS__)
# define @KWSYS_NAMESPACE at _CPU_ENDIAN_ID @KWSYS_NAMESPACE at _CPU_ENDIAN_ID_BIG
+/* OpenRISC 1000 */
+#elif defined(__or1k__)
+# define @KWSYS_NAMESPACE at _CPU_ENDIAN_ID @KWSYS_NAMESPACE at _CPU_ENDIAN_ID_BIG
+
/* RS/6000 */
#elif defined(__THW_RS600) || defined(_IBMR2) || defined(_POWER)
# define @KWSYS_NAMESPACE at _CPU_ENDIAN_ID @KWSYS_NAMESPACE at _CPU_ENDIAN_ID_BIG
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51c82c3a66f02192df4db5d51d95f7311bc2181f
commit 51c82c3a66f02192df4db5d51d95f7311bc2181f
Merge: 3b0d634 fe587db
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 11 09:30:22 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 11 09:30:22 2014 -0400
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe587db415b1cf728f42c5db55c3acbad7a9a529
commit fe587db415b1cf728f42c5db55c3acbad7a9a529
Author: KWSys Robot <kwrobot at kitware.com>
AuthorDate: Thu Aug 7 09:55:30 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 11 09:30:16 2014 -0400
KWSys 2014-08-07 (4d526097)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 4d526097 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' e787837a..4d526097
Brad King (2):
4791701a SystemTools: Remove ConvertWindowsCommandLineToUnixArguments method
4d526097 Add assert() to quiet Clang scan-build warnings
Change-Id: I15e4ad710a8ad01f96761a89f2c1517f3c2aa835
diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index 241e295..ca9d424 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -68,6 +68,7 @@ do.
#include <signal.h> /* sigaction */
#include <dirent.h> /* DIR, dirent */
#include <ctype.h> /* isspace */
+#include <assert.h> /* assert */
#if defined(__VMS)
# define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK
@@ -450,6 +451,7 @@ int kwsysProcess_AddCommand(kwsysProcess* cp, char const* const* command)
}
for(i=0; i < n; ++i)
{
+ assert(command[i]); /* Quiet Clang scan-build. */
newCommands[cp->NumberOfCommands][i] = strdup(command[i]);
if(!newCommands[cp->NumberOfCommands][i])
{
diff --git a/SystemTools.cxx b/SystemTools.cxx
index dcfd49c..e34bb43 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -4600,111 +4600,6 @@ void SystemTools::Delay(unsigned int msec)
#endif
}
-void SystemTools::ConvertWindowsCommandLineToUnixArguments(
- const char *cmd_line, int *argc, char ***argv)
-{
- if (!cmd_line || !argc || !argv)
- {
- return;
- }
-
- // A space delimites an argument except when it is inside a quote
-
- (*argc) = 1;
-
- size_t cmd_line_len = strlen(cmd_line);
-
- size_t i;
- for (i = 0; i < cmd_line_len; i++)
- {
- while (isspace(cmd_line[i]) && i < cmd_line_len)
- {
- i++;
- }
- if (i < cmd_line_len)
- {
- if (cmd_line[i] == '\"')
- {
- i++;
- while (cmd_line[i] != '\"' && i < cmd_line_len)
- {
- i++;
- }
- (*argc)++;
- }
- else
- {
- while (!isspace(cmd_line[i]) && i < cmd_line_len)
- {
- i++;
- }
- (*argc)++;
- }
- }
- }
-
- (*argv) = new char* [(*argc) + 1];
- (*argv)[(*argc)] = NULL;
-
- // Set the first arg to be the exec name
-
- (*argv)[0] = new char [1024];
-#ifdef _WIN32
- wchar_t tmp[1024];
- ::GetModuleFileNameW(0, tmp, 1024);
- strcpy((*argv)[0], Encoding::ToNarrow(tmp).c_str());
-#else
- (*argv)[0][0] = '\0';
-#endif
-
- // Allocate the others
-
- int j;
- for (j = 1; j < (*argc); j++)
- {
- (*argv)[j] = new char [cmd_line_len + 10];
- }
-
- // Grab the args
-
- size_t pos;
- int argc_idx = 1;
-
- for (i = 0; i < cmd_line_len; i++)
- {
- while (isspace(cmd_line[i]) && i < cmd_line_len)
- {
- i++;
- }
- if (i < cmd_line_len)
- {
- if (cmd_line[i] == '\"')
- {
- i++;
- pos = i;
- while (cmd_line[i] != '\"' && i < cmd_line_len)
- {
- i++;
- }
- memcpy((*argv)[argc_idx], &cmd_line[pos], i - pos);
- (*argv)[argc_idx][i - pos] = '\0';
- argc_idx++;
- }
- else
- {
- pos = i;
- while (!isspace(cmd_line[i]) && i < cmd_line_len)
- {
- i++;
- }
- memcpy((*argv)[argc_idx], &cmd_line[pos], i - pos);
- (*argv)[argc_idx][i - pos] = '\0';
- argc_idx++;
- }
- }
- }
- }
-
kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
{
kwsys_stl::string res;
diff --git a/SystemTools.hxx.in b/SystemTools.hxx.in
index 2514699..e88bc8f 100644
--- a/SystemTools.hxx.in
+++ b/SystemTools.hxx.in
@@ -856,15 +856,6 @@ public:
*/
static kwsys_stl::string GetOperatingSystemNameAndVersion();
- /**
- * Convert windows-style arguments given as a command-line string
- * into more traditional argc/argv arguments.
- * Note that argv[0] will be assigned the executable name using
- * the GetModuleFileName() function.
- */
- static void ConvertWindowsCommandLineToUnixArguments(
- const char *cmd_line, int *argc, char ***argv);
-
/** -----------------------------------------------------------------
* URL Manipulation Routines
* -----------------------------------------------------------------
diff --git a/testCommandLineArguments1.cxx b/testCommandLineArguments1.cxx
index 3b84c38..b65c37f 100644
--- a/testCommandLineArguments1.cxx
+++ b/testCommandLineArguments1.cxx
@@ -21,6 +21,7 @@
# include "kwsys_ios_iostream.h.in"
#endif
+#include <assert.h> /* assert */
#include <string.h> /* strcmp */
int testCommandLineArguments1(int argc, char* argv[])
@@ -83,6 +84,7 @@ int testCommandLineArguments1(int argc, char* argv[])
}
for ( cc = 0; cc < newArgc; ++ cc )
{
+ assert(newArgv[cc]); /* Quiet Clang scan-build. */
kwsys_ios::cout << "Unused argument[" << cc << "] = [" << newArgv[cc] << "]"
<< kwsys_ios::endl;
if ( cc >= 9 )
diff --git a/testProcess.c b/testProcess.c
index 3d62822..47c3fb0 100644
--- a/testProcess.c
+++ b/testProcess.c
@@ -20,6 +20,7 @@
# include "Encoding.h.in"
#endif
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -104,6 +105,7 @@ static int test4(int argc, const char* argv[])
fprintf(stderr, "Output before crash on stderr from crash test.\n");
fflush(stdout);
fflush(stderr);
+ assert(invalidAddress); /* Quiet Clang scan-build. */
/* Provoke deliberate crash by writing to the invalid address. */
*invalidAddress = 0;
fprintf(stdout, "Output after crash on stdout from crash test.\n");
diff --git a/testSystemTools.cxx b/testSystemTools.cxx
index 15123eb..04ab4fc 100644
--- a/testSystemTools.cxx
+++ b/testSystemTools.cxx
@@ -507,28 +507,6 @@ static bool CheckStringOperations()
res = false;
}
- int targc;
- char **targv;
- kwsys::SystemTools::ConvertWindowsCommandLineToUnixArguments
- ("\"Local Mojo\\Voodoo.asp\" -CastHex \"D:\\My Secret Mojo\\Voodoo.mp3\"",
- &targc, &targv);
- if (targc != 4 || strcmp(targv[1],"Local Mojo\\Voodoo.asp") ||
- strcmp(targv[2],"-CastHex") ||
- strcmp(targv[3],"D:\\My Secret Mojo\\Voodoo.mp3"))
- {
- kwsys_ios::cerr
- << "Problem with ConvertWindowsCommandLineToUnixArguments"
- << "\'\"Local Mojo\\Voodoo.asp\" "
- << "-CastHex \"D:\\My Secret Mojo\\Voodoo.mp3\"\'"
- << kwsys_ios::endl;
- res = false;
- }
- for (;targc >=0; --targc)
- {
- delete [] targv[targc];
- }
- delete [] targv;
-
return res;
}
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/kwsys/CPU.h.in | 4 ++
Source/kwsys/ProcessUNIX.c | 2 +
Source/kwsys/SystemTools.cxx | 105 ----------------------------
Source/kwsys/SystemTools.hxx.in | 9 ---
Source/kwsys/testCommandLineArguments1.cxx | 2 +
Source/kwsys/testProcess.c | 2 +
Source/kwsys/testSystemTools.cxx | 22 ------
8 files changed, 11 insertions(+), 137 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list