[Cmake-commits] [cmake-commits] king committed cmFileCommand.cxx 1.120 1.121 cmFileCommand.h 1.43 1.44 cmInstallDirectoryGenerator.cxx 1.7 1.8 cmInstallExportGenerator.cxx 1.9 1.10 cmInstallFilesGenerator.cxx 1.10 1.11 cmInstallGenerator.cxx 1.17 1.18 cmInstallGenerator.h 1.14 1.15 cmInstallTargetGenerator.cxx 1.68 1.69
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Apr 27 13:20:59 EDT 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv10434/Source
Modified Files:
cmFileCommand.cxx cmFileCommand.h
cmInstallDirectoryGenerator.cxx cmInstallExportGenerator.cxx
cmInstallFilesGenerator.cxx cmInstallGenerator.cxx
cmInstallGenerator.h cmInstallTargetGenerator.cxx
Log Message:
ENH: Remove unused PROPERTIES from file(INSTALL)
The undocumented file(INSTALL) command used to support a PROPERTIES
option, but no install code still uses it. This removes the option.
Index: cmInstallGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallGenerator.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** cmInstallGenerator.h 16 Mar 2009 14:39:49 -0000 1.14
--- cmInstallGenerator.h 27 Apr 2009 17:20:57 -0000 1.15
***************
*** 38,42 ****
std::vector<std::string> const& files,
bool optional = false,
- const char* properties = 0,
const char* permissions_file = 0,
const char* permissions_dir = 0,
--- 38,41 ----
Index: cmInstallGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallGenerator.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** cmInstallGenerator.cxx 16 Mar 2009 14:39:48 -0000 1.17
--- cmInstallGenerator.cxx 27 Apr 2009 17:20:57 -0000 1.18
***************
*** 44,48 ****
std::vector<std::string> const& files,
bool optional /* = false */,
- const char* properties /* = 0 */,
const char* permissions_file /* = 0 */,
const char* permissions_dir /* = 0 */,
--- 44,47 ----
***************
*** 72,79 ****
os << " OPTIONAL";
}
- if(properties && *properties)
- {
- os << " PROPERTIES" << properties;
- }
if(permissions_file && *permissions_file)
{
--- 71,74 ----
Index: cmInstallDirectoryGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallDirectoryGenerator.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** cmInstallDirectoryGenerator.cxx 24 Feb 2009 16:41:36 -0000 1.7
--- cmInstallDirectoryGenerator.cxx 27 Apr 2009 17:20:54 -0000 1.8
***************
*** 47,55 ****
{
// Write code to install the directories.
- const char* no_properties = 0;
const char* no_rename = 0;
this->AddInstallRule(os, cmTarget::INSTALL_DIRECTORY,
this->Directories,
! this->Optional, no_properties,
this->FilePermissions.c_str(),
this->DirPermissions.c_str(),
--- 47,54 ----
{
// Write code to install the directories.
const char* no_rename = 0;
this->AddInstallRule(os, cmTarget::INSTALL_DIRECTORY,
this->Directories,
! this->Optional,
this->FilePermissions.c_str(),
this->DirPermissions.c_str(),
Index: cmFileCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFileCommand.cxx,v
retrieving revision 1.120
retrieving revision 1.121
diff -C 2 -d -r1.120 -r1.121
*** cmFileCommand.cxx 27 Apr 2009 17:20:47 -0000 1.120
--- cmFileCommand.cxx 27 Apr 2009 17:20:54 -0000 1.121
***************
*** 1734,1740 ****
int itype = cmTarget::INSTALL_FILES;
- std::map<cmStdString, const char*> properties;
bool optional = false;
! bool result = this->ParseInstallArgs(args, installer, properties,
itype, rename, destination, files,
optional);
--- 1734,1739 ----
int itype = cmTarget::INSTALL_FILES;
bool optional = false;
! bool result = this->ParseInstallArgs(args, installer,
itype, rename, destination, files,
optional);
***************
*** 1750,1754 ****
bool cmFileCommand::ParseInstallArgs(std::vector<std::string> const& args,
cmFileInstaller& installer,
- std::map<cmStdString, const char*>& properties,
int& itype,
std::string& rename,
--- 1749,1752 ----
***************
*** 1758,1762 ****
{
std::string stype = "FILES";
! enum Doing { DoingNone, DoingFiles, DoingProperties,
DoingPermissionsFile, DoingPermissionsDir,
DoingPermissionsMatch, DoingSelf24 };
--- 1756,1760 ----
{
std::string stype = "FILES";
! enum Doing { DoingNone, DoingFiles,
DoingPermissionsFile, DoingPermissionsDir,
DoingPermissionsMatch, DoingSelf24 };
***************
*** 1851,1863 ****
else if ( *cstr == "PROPERTIES" )
{
! if(current_match_rule)
! {
! cmOStringStream e;
! e << "INSTALL does not allow \"" << *cstr << "\" after REGEX.";
! this->SetError(e.str().c_str());
! return false;
! }
!
! doing = DoingProperties;
}
else if ( *cstr == "PERMISSIONS" )
--- 1849,1858 ----
else if ( *cstr == "PROPERTIES" )
{
! cmOStringStream e;
! e << "INSTALL called with old-style PROPERTIES argument. "
! << "This script was generated with an older version of CMake. "
! << "Re-run this cmake version on your build tree.";
! this->SetError(e.str().c_str());
! return false;
}
else if ( *cstr == "PERMISSIONS" )
***************
*** 1950,1958 ****
doing = DoingFiles;
}
- else if(doing == DoingProperties && i < args.size()-1)
- {
- properties[args[i]] = args[i+1].c_str();
- i++;
- }
else if(doing == DoingFiles)
{
--- 1945,1948 ----
***************
*** 2028,2050 ****
}
- if(properties.find("VERSION") != properties.end())
- {
- cmOStringStream e;
- e << "INSTALL called with old-style VERSION property. "
- << "This script was generated with an older version of CMake. "
- << "Re-run this cmake version on your build tree.";
- this->SetError(e.str().c_str());
- return false;
- }
- if(properties.find("SOVERSION") != properties.end())
- {
- cmOStringStream e;
- e << "INSTALL called with old-style SOVERSION property. "
- << "This script was generated with an older version of CMake. "
- << "Re-run this cmake version on your build tree.";
- this->SetError(e.str().c_str());
- return false;
- }
-
this->GetTargetTypeFromString(stype, itype);
--- 2018,2021 ----
Index: cmInstallFilesGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallFilesGenerator.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** cmInstallFilesGenerator.cxx 28 Jan 2008 13:38:35 -0000 1.10
--- cmInstallFilesGenerator.cxx 27 Apr 2009 17:20:56 -0000 1.11
***************
*** 46,50 ****
{
// Write code to install the files.
- const char* no_properties = 0;
const char* no_dir_permissions = 0;
this->AddInstallRule(os,
--- 46,49 ----
***************
*** 53,57 ****
: cmTarget::INSTALL_FILES),
this->Files,
! this->Optional, no_properties,
this->FilePermissions.c_str(), no_dir_permissions,
this->Rename.c_str(), 0, indent);
--- 52,56 ----
: cmTarget::INSTALL_FILES),
this->Files,
! this->Optional,
this->FilePermissions.c_str(), no_dir_permissions,
this->Rename.c_str(), 0, indent);
Index: cmInstallExportGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallExportGenerator.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** cmInstallExportGenerator.cxx 7 Jan 2009 19:16:40 -0000 1.9
--- cmInstallExportGenerator.cxx 27 Apr 2009 17:20:54 -0000 1.10
***************
*** 192,196 ****
std::string config_test = this->CreateConfigTest(i->first.c_str());
os << indent << "IF(" << config_test << ")\n";
! this->AddInstallRule(os, cmTarget::INSTALL_FILES, files, false, 0,
this->FilePermissions.c_str(), 0, 0, 0,
indent.Next());
--- 192,196 ----
std::string config_test = this->CreateConfigTest(i->first.c_str());
os << indent << "IF(" << config_test << ")\n";
! this->AddInstallRule(os, cmTarget::INSTALL_FILES, files, false,
this->FilePermissions.c_str(), 0, 0, 0,
indent.Next());
***************
*** 231,235 ****
std::vector<std::string> files;
files.push_back(this->MainImportFile);
! this->AddInstallRule(os, cmTarget::INSTALL_FILES, files, false, 0,
this->FilePermissions.c_str(), 0, 0, 0, indent);
}
--- 231,235 ----
std::vector<std::string> files;
files.push_back(this->MainImportFile);
! this->AddInstallRule(os, cmTarget::INSTALL_FILES, files, false,
this->FilePermissions.c_str(), 0, 0, 0, indent);
}
Index: cmInstallTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.cxx,v
retrieving revision 1.68
retrieving revision 1.69
diff -C 2 -d -r1.68 -r1.69
*** cmInstallTargetGenerator.cxx 16 Mar 2009 14:39:49 -0000 1.68
--- cmInstallTargetGenerator.cxx 27 Apr 2009 17:20:57 -0000 1.69
***************
*** 312,319 ****
const char* no_dir_permissions = 0;
const char* no_rename = 0;
- const char* no_properties = 0;
bool optional = this->Optional || this->ImportLibrary;
this->AddInstallRule(os, type, files,
! optional, no_properties,
this->FilePermissions.c_str(), no_dir_permissions,
no_rename, literal_args.c_str(),
--- 312,318 ----
const char* no_dir_permissions = 0;
const char* no_rename = 0;
bool optional = this->Optional || this->ImportLibrary;
this->AddInstallRule(os, type, files,
! optional,
this->FilePermissions.c_str(), no_dir_permissions,
no_rename, literal_args.c_str(),
Index: cmFileCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFileCommand.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -C 2 -d -r1.43 -r1.44
*** cmFileCommand.h 15 Apr 2009 13:58:13 -0000 1.43
--- cmFileCommand.h 27 Apr 2009 17:20:54 -0000 1.44
***************
*** 184,188 ****
bool ParseInstallArgs(std::vector<std::string> const& args,
cmFileInstaller& installer,
- std::map<cmStdString, const char*>& properties,
int& itype,
std::string& destination,
--- 184,187 ----
More information about the Cmake-commits
mailing list