ENH: Remove things from bootstrap

3 files changed, 34 insertions, 4 deletions

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 951625e..2c94ab6 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -70,12 +70,15 @@ cmMakefile::cmMakefile()
   
   this->DefineFlags = " ";
   this->LocalGenerator = 0;
+
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   this->AddSourceGroup("", "^.*$");
   this->AddSourceGroup("Source Files", 
                        "\\.(C|M|c|c\\+\\+|cc|cpp|cxx|m|mm|rc|def|r|odl|idl|hpj|bat)$");
   this->AddSourceGroup("Header Files", "\\.(h|h\\+\\+|hm|hpp|hxx|in|txx|inl)$");
   this->AddSourceGroup("CMake Rules", "\\.rule$");
   this->AddSourceGroup("Resources", "\\.plist$");
+#endif
   this->AddDefaultDefinitions();
   this->cmDefineRegex.compile("#cmakedefine[ \t]+([A-Za-z_0-9]*)");
   this->cmDefine01Regex.compile("#cmakedefine01[ \t]+([A-Za-z_0-9]*)");
@@ -212,11 +215,13 @@ void cmMakefile::Print()
   std::cout << " this->ProjectName; " <<  this->ProjectName.c_str() << std::endl;
   this->PrintStringVector("this->IncludeDirectories;", this->IncludeDirectories);
   this->PrintStringVector("this->LinkDirectories", this->LinkDirectories);
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   for( std::vector<cmSourceGroup>::const_iterator i = this->SourceGroups.begin();
        i != this->SourceGroups.end(); ++i)
     {
     std::cout << "Source Group: " << i->GetName() << std::endl;
     }
+#endif
 }
 
 bool cmMakefile::CommandExists(const char* name) const
@@ -1151,7 +1156,7 @@ cmSourceFile *cmMakefile::GetSourceFileWithOutput(const char *cname)
   return 0;
 }
 
-
+#if defined(CMAKE_BUILD_WITH_CMAKE)
 cmSourceGroup* cmMakefile::GetSourceGroup(const char* name)
 {
   // First see if the group exists.  If so, replace its regular expression.
@@ -1247,6 +1252,7 @@ void cmMakefile::AddSourceGroup(const char* name, const char* regex, const char
   // The group doesn't exist.  Add it.
   this->SourceGroups.push_back(cmSourceGroup(name, regex));
 }
+#endif
 
 void cmMakefile::AddExtraDirectory(const char* dir)
 {
@@ -1676,6 +1682,7 @@ void cmMakefile::AddDefaultDefinitions()
   this->AddDefinition("CMAKE_MAJOR_VERSION", temp);
 }
 
+#if defined(CMAKE_BUILD_WITH_CMAKE)
 /**
  * Find a source group whose regular expression matches the filename
  * part of the given source name.  Search backward through the list of
@@ -1713,6 +1720,7 @@ cmMakefile::FindSourceGroup(const char* source,
   // Shouldn't get here, but just in case, return the default group.
   return groups.front();
 }
+#endif
 
 bool cmMakefile::IsFunctionBlocked(const cmListFileFunction& lff)
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 6836c77..f480c5a 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -19,11 +19,14 @@
 
 #include "cmData.h"
 #include "cmSystemTools.h"
-#include "cmSourceGroup.h"
 #include "cmTarget.h"
 #include "cmListFileCache.h"
 #include "cmCacheManager.h"
 
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+#include "cmSourceGroup.h"
+#endif
+
 #include <cmsys/RegularExpression.hxx>
 
 class cmFunctionBlocker;
@@ -275,11 +278,13 @@ public:
   void AddLibrary(const char *libname, int shared,
                   const std::vector<std::string> &srcs);
 
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   /**
    * Add a source group for consideration when adding a new source.
    */
   void AddSourceGroup(const char* name, const char* regex=0, 
                       const char* parent=0);
+#endif
   
   /**
    * Add an auxiliary directory to the build.
@@ -434,6 +439,7 @@ public:
    *  not found, then a null pointer is returned.
    */
   cmSourceFile* GetSource(const char* sourceName) const;
+
   ///! Add a new cmSourceFile to the list of sources for this makefile.
   cmSourceFile* AddSource(cmSourceFile const&);
 
@@ -495,6 +501,7 @@ public:
   const std::vector<cmCommand*>& GetUsedCommands() const
     {return this->UsedCommands;}
   
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   /**
    * Get the vector source groups.
    */
@@ -505,6 +512,7 @@ public:
    * Get the source group
    */
   cmSourceGroup* GetSourceGroup(const char* name); 
+#endif
 
   /**
    * Get the vector of list files on which this makefile depends
@@ -555,11 +563,14 @@ public:
   int ConfigureFile(const char* infile, const char* outfile, 
                     bool copyonly, bool atOnly, bool escapeQuotes);
 
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   /**
    * find what source group this source is in
    */
   cmSourceGroup& FindSourceGroup(const char* source,
                                  std::vector<cmSourceGroup> &groups);
+#endif
+
   void RegisterData(cmData*);
   void RegisterData(const char*, cmData*);
   cmData* LookupData(const char*) const;
@@ -704,7 +715,11 @@ protected:
   std::vector<std::string> SourceFileExtensions;
   std::vector<std::string> HeaderFileExtensions;
   std::string DefineFlags;
+
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   std::vector<cmSourceGroup> SourceGroups;
+#endif
+
   DefinitionMap Definitions;
   std::vector<cmCommand*> UsedCommands;
   cmLocalGenerator* LocalGenerator;
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 84a7fbf..d4bbd8d 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -14,12 +14,12 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "cmakewizard.h"
 #include "cmake.h"
 #include "cmCacheManager.h"
 #include "cmListFileCache.h"
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
+#include "cmakewizard.h"
 #include "cmDynamicLoader.h"
 #include "cmDocumentation.h"
 
@@ -182,7 +182,9 @@ int do_cmake(int ac, char** av)
     }
 #endif
   
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   bool wiz = false;
+#endif
   bool command = false;
   bool list_cached = false;
   bool list_all_cached = false;
@@ -192,13 +194,16 @@ int do_cmake(int ac, char** av)
   std::vector<std::string> args;
   for(int i =0; i < ac; ++i)
     {
+#if defined(CMAKE_BUILD_WITH_CMAKE)
     if(strcmp(av[i], "-i") == 0)
       {
       wiz = true;
       }
+    else
+#endif
     // if command has already been set, then
     // do not eat the -E 
-    else if (!command && strcmp(av[i], "-E") == 0)
+    if (!command && strcmp(av[i], "-E") == 0)
       {
       command = true;
       }
@@ -246,11 +251,13 @@ int do_cmake(int ac, char** av)
     int ret = cmake::ExecuteCMakeCommand(args);
     return ret;
     }
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   if (wiz)
     {
     cmakewizard wizard;
     return wizard.RunWizard(args); 
     }
+#endif
   cmake cm;  
   cm.SetProgressCallback(updateProgress, 0);
   cm.SetScriptMode(script_mode);