summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/CPack/OSXScriptLauncher.cxx2
-rw-r--r--Source/cmGlobalVisualStudio71Generator.cxx68
-rw-r--r--Source/cmGlobalVisualStudio71Generator.h29
-rw-r--r--Source/cmGlobalVisualStudio7Generator.cxx13
-rw-r--r--Source/cmGlobalVisualStudioGenerator.h1
-rw-r--r--Source/cmLocalVisualStudio7Generator.cxx29
-rw-r--r--Source/cmSystemTools.cxx2
-rw-r--r--Source/cmVisualStudioGeneratorOptions.cxx3
-rw-r--r--Source/cmake.cxx5
9 files changed, 11 insertions, 141 deletions
diff --git a/Source/CPack/OSXScriptLauncher.cxx b/Source/CPack/OSXScriptLauncher.cxx
index 701481d..b48bf12 100644
--- a/Source/CPack/OSXScriptLauncher.cxx
+++ b/Source/CPack/OSXScriptLauncher.cxx
@@ -85,8 +85,6 @@ int main(int argc, char* argv[])
int length;
while (cmsysProcess_WaitForData(cp, &data, &length, 0)) {
// Translate NULL characters in the output into valid text.
- // Visual Studio 7 puts these characters in the output of its
- // build process.
for (int i = 0; i < length; ++i) {
if (data[i] == '\0') {
data[i] = ' ';
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 3f8d381..aeceb8d 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -13,58 +13,6 @@ cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator(
: cmGlobalVisualStudio7Generator(cm, platformName)
{
this->ProjectConfigurationSectionName = "ProjectConfiguration";
- this->Version = VS71;
-}
-
-std::string cmGlobalVisualStudio71Generator::GetUserMacrosDirectory()
-{
- // Macros not supported on Visual Studio 7.1 and earlier because
- // they do not appear to work *during* a build when called by an
- // outside agent...
- //
- return "";
-
-#if 0
- //
- // The COM result from calling a Visual Studio macro with 7.1 indicates
- // that the call succeeds, but the macro does not appear to execute...
- //
- // So, I am leaving this code here to show how to do it, but have not
- // yet figured out what the issue is in terms of why the macro does not
- // appear to execute...
- //
- std::string base;
- std::string path;
-
- // base begins with the VisualStudioProjectsLocation reg value...
- if (cmSystemTools::ReadRegistryValue(
- "HKEY_CURRENT_USER\\Software\\Microsoft\\VisualStudio\\7.1;"
- "VisualStudioProjectsLocation",
- base))
- {
- cmSystemTools::ConvertToUnixSlashes(base);
-
- // 7.1 macros folder:
- path = base + "/VSMacros71";
- }
-
- // path is (correctly) still empty if we did not read the base value from
- // the Registry value
- return path;
-#endif
-}
-
-std::string cmGlobalVisualStudio71Generator::GetUserMacrosRegKeyBase()
-{
- // Macros not supported on Visual Studio 7.1 and earlier because
- // they do not appear to work *during* a build when called by an
- // outside agent...
- //
- return "";
-
-#if 0
- return "Software\\Microsoft\\VisualStudio\\7.1\\vsmacros";
-#endif
}
void cmGlobalVisualStudio71Generator::WriteSLNFile(
@@ -91,11 +39,6 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(
std::ostringstream targetsSlnString;
this->WriteTargetsToSolution(targetsSlnString, root, orderedProjectTargets);
- // VS 7 does not support folders specified first.
- if (this->GetVersion() <= VS71) {
- fout << targetsSlnString.str();
- }
-
// Generate folder specification.
bool useFolderProperty = this->UseFolderProperty();
if (useFolderProperty) {
@@ -103,9 +46,7 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(
}
// Now write the actual target specification content.
- if (this->GetVersion() > VS71) {
- fout << targetsSlnString.str();
- }
+ fout << targetsSlnString.str();
// Write out the configurations information for the solution
fout << "Global\n";
@@ -280,10 +221,3 @@ void cmGlobalVisualStudio71Generator::WriteSLNHeader(std::ostream& fout)
{
fout << "Microsoft Visual Studio Solution File, Format Version 8.00\n";
}
-
-void cmGlobalVisualStudio71Generator::GetDocumentation(
- cmDocumentationEntry& entry)
-{
- entry.Name = cmGlobalVisualStudio71Generator::GetActualName();
- entry.Brief = "Deprecated. Generates Visual Studio .NET 2003 project files.";
-}
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index c65a84a..0ce02aa 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -15,37 +15,8 @@ class cmGlobalVisualStudio71Generator : public cmGlobalVisualStudio7Generator
public:
cmGlobalVisualStudio71Generator(cmake* cm,
const std::string& platformName = "");
- static cmGlobalGeneratorFactory* NewFactory()
- {
- return new cmGlobalGeneratorSimpleFactory<
- cmGlobalVisualStudio71Generator>();
- }
-
- ///! Get the name for the generator.
- virtual std::string GetName() const
- {
- return cmGlobalVisualStudio71Generator::GetActualName();
- }
- static std::string GetActualName() { return "Visual Studio 7 .NET 2003"; }
-
- /** Get the documentation entry for this generator. */
- static void GetDocumentation(cmDocumentationEntry& entry);
-
- /**
- * Where does this version of Visual Studio look for macros for the
- * current user? Returns the empty string if this version of Visual
- * Studio does not implement support for VB macros.
- */
- virtual std::string GetUserMacrosDirectory();
-
- /**
- * What is the reg key path to "vsmacros" for this version of Visual
- * Studio?
- */
- virtual std::string GetUserMacrosRegKeyBase();
protected:
- virtual const char* GetIDEVersion() { return "7.1"; }
virtual void WriteSLNFile(std::ostream& fout, cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators);
virtual void WriteSolutionConfigurations(
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 5756eaf..14ec72f 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -293,19 +293,6 @@ void cmGlobalVisualStudio7Generator::Generate()
if (!cmSystemTools::GetErrorOccuredFlag()) {
this->CallVisualStudioMacro(MacroReload);
}
-
- if (this->Version == VS71 && !this->CMakeInstance->GetIsInTryCompile()) {
- const char* cmakeWarnVS71 =
- this->CMakeInstance->GetState()->GetCacheEntryValue("CMAKE_WARN_VS71");
- if (!cmakeWarnVS71 || !cmSystemTools::IsOff(cmakeWarnVS71)) {
- this->CMakeInstance->IssueMessage(
- cmake::WARNING,
- "The \"Visual Studio 7 .NET 2003\" generator is deprecated "
- "and will be removed in a future version of CMake."
- "\n"
- "Add CMAKE_WARN_VS71=OFF to the cache to disable this warning.");
- }
- }
}
void cmGlobalVisualStudio7Generator::OutputSLNFile(
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index a5a7f9a..c12a933 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -32,7 +32,6 @@ public:
/** Known versions of Visual Studio. */
enum VSVersion
{
- VS71 = 71,
VS8 = 80,
VS9 = 90,
VS10 = 100,
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index a36e1f6..7535ef4 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -898,8 +898,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(
// end of <Tool Name=VCMIDLTool
// Add manifest tool settings.
- if (targetBuilds &&
- this->GetVersion() >= cmGlobalVisualStudioGenerator::VS8) {
+ if (targetBuilds) {
const char* manifestTool = "VCManifestTool";
if (this->FortranProject) {
manifestTool = "VFManifestTool";
@@ -1040,8 +1039,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(
fout << "\t\t\t<Tool\n"
<< "\t\t\t\tName=\"" << tool << "\"\n";
- if (this->GetVersion() < cmGlobalVisualStudioGenerator::VS8 ||
- this->FortranProject) {
+ if (this->FortranProject) {
std::ostringstream libdeps;
this->Internal->OutputObjects(libdeps, target, configName);
if (!libdeps.str().empty()) {
@@ -1094,8 +1092,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(
// libraries which may be set by the user to something bad.
fout << "\t\t\t\tAdditionalDependencies=\"$(NOINHERIT) "
<< this->Makefile->GetSafeDefinition(standardLibsVar.c_str());
- if (this->GetVersion() < cmGlobalVisualStudioGenerator::VS8 ||
- this->FortranProject) {
+ if (this->FortranProject) {
this->Internal->OutputObjects(fout, target, configName, " ");
}
fout << " ";
@@ -1179,8 +1176,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(
// libraries which may be set by the user to something bad.
fout << "\t\t\t\tAdditionalDependencies=\"$(NOINHERIT) "
<< this->Makefile->GetSafeDefinition(standardLibsVar.c_str());
- if (this->GetVersion() < cmGlobalVisualStudioGenerator::VS8 ||
- this->FortranProject) {
+ if (this->FortranProject) {
this->Internal->OutputObjects(fout, target, configName, " ");
}
fout << " ";
@@ -1376,10 +1372,9 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
cmSourceFile const* sf = sources[si].Source;
sourcesIndex[sf] = si;
if (!sf->GetObjectLibrary().empty()) {
- if (this->GetVersion() < cmGlobalVisualStudioGenerator::VS8 ||
- this->FortranProject) {
- // VS < 8 does not support per-config source locations so we
- // list object library content on the link line instead.
+ if (this->FortranProject) {
+ // Intel Fortran does not support per-config source locations
+ // so we list object library content on the link line instead.
// See OutputObjects.
continue;
}
@@ -1962,11 +1957,7 @@ void cmLocalVisualStudio7Generator::WriteProjectStart(
<< "<VisualStudioProject\n"
<< "\tProjectType=\"Visual C++\"\n";
/* clang-format on */
- if (gg->GetVersion() == cmGlobalVisualStudioGenerator::VS71) {
- fout << "\tVersion=\"7.10\"\n";
- } else {
- fout << "\tVersion=\"" << (gg->GetVersion() / 10) << ".00\"\n";
- }
+ fout << "\tVersion=\"" << (gg->GetVersion() / 10) << ".00\"\n";
const char* projLabel = target->GetProperty("PROJECT_LABEL");
if (!projLabel) {
projLabel = libName.c_str();
@@ -1976,9 +1967,7 @@ void cmLocalVisualStudio7Generator::WriteProjectStart(
keyword = "Win32Proj";
}
fout << "\tName=\"" << projLabel << "\"\n";
- if (gg->GetVersion() >= cmGlobalVisualStudioGenerator::VS8) {
- fout << "\tProjectGUID=\"{" << gg->GetGUID(libName.c_str()) << "}\"\n";
- }
+ fout << "\tProjectGUID=\"{" << gg->GetGUID(libName.c_str()) << "}\"\n";
this->WriteProjectSCC(fout, target);
if (const char* targetFrameworkVersion =
target->GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION")) {
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 8dc6571..7ace0a3 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -617,8 +617,6 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command,
while ((pipe = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR)) >
0) {
// Translate NULL characters in the output into valid text.
- // Visual Studio 7 puts these characters in the output of its
- // build process.
for (int i = 0; i < length; ++i) {
if (data[i] == '\0') {
data[i] = ' ';
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx
index 370e4da..1f808c8 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -101,9 +101,6 @@ void cmVisualStudioGeneratorOptions::FixExceptionHandlingDefault()
// the flag to disable exception handling. When the user does
// remove the flag we need to override the IDE default of on.
switch (this->Version) {
- case cmGlobalVisualStudioGenerator::VS71:
- this->FlagMap["ExceptionHandling"] = "FALSE";
- break;
case cmGlobalVisualStudioGenerator::VS10:
case cmGlobalVisualStudioGenerator::VS11:
case cmGlobalVisualStudioGenerator::VS12:
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index f0ae316..737587d 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -63,7 +63,6 @@
#include "cmGlobalVisualStudio12Generator.h"
#include "cmGlobalVisualStudio14Generator.h"
#include "cmGlobalVisualStudio15Generator.h"
-#include "cmGlobalVisualStudio71Generator.h"
#include "cmGlobalVisualStudio8Generator.h"
#include "cmGlobalVisualStudio9Generator.h"
#include "cmVSSetupHelper.h"
@@ -1461,8 +1460,7 @@ void cmake::CreateDefaultGlobalGenerator()
{ "11.0", "Visual Studio 11 2012" }, //
{ "10.0", "Visual Studio 10 2010" }, //
{ "9.0", "Visual Studio 9 2008" }, //
- { "8.0", "Visual Studio 8 2005" }, //
- { "7.1", "Visual Studio 7 .NET 2003" }
+ { "8.0", "Visual Studio 8 2005" }
};
static const char* const vsEntries[] = {
"\\Setup\\VC;ProductDir", //
@@ -1672,7 +1670,6 @@ void cmake::AddDefaultGenerators()
this->Generators.push_back(cmGlobalVisualStudio10Generator::NewFactory());
this->Generators.push_back(cmGlobalVisualStudio9Generator::NewFactory());
this->Generators.push_back(cmGlobalVisualStudio8Generator::NewFactory());
- this->Generators.push_back(cmGlobalVisualStudio71Generator::NewFactory());
this->Generators.push_back(cmGlobalBorlandMakefileGenerator::NewFactory());
this->Generators.push_back(cmGlobalNMakeMakefileGenerator::NewFactory());
this->Generators.push_back(cmGlobalJOMMakefileGenerator::NewFactory());
generated by cgit v0.12 at 2024-11-08 19:11:49 (GMT)