Changeset 807

Timestamp:

08/11/08 12:35:29 (3 months ago)

Author:

liamstask

Message:

- update Makefile generation to include a dependency on config.h so projects can be rebuilt more intelligently. Also, be sure to modify config.h if it's different from the current ProjectInfo?

Location:

mcbuilder/trunk

Files:

• include/Builder.h (modified) (2 diffs)
• src/Builder.cpp (modified) (5 diffs)
• src/MainWindow.cpp (modified) (1 diff)

mcbuilder/trunk/include/Builder.h

@@ -63 +63 @@
   int maxsize;
   QString currentProcess;
-  bool cleanFirst;
-  bool buildPending;
   QList<Library> libraries;
   void resetBuildProcess();
@@ -78 +76 @@
   void getLibrarySources(QString libdir, QStringList *thmb, QStringList *arm);
   QString filteredPath(QString path);
-    
-public slots:
-  void onProjectUpdated();
 
 private slots:

mcbuilder/trunk/src/Builder.cpp

@@ -40 +40 @@
   connect(this, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(nextStep(int, QProcess::ExitStatus)));
   connect(this, SIGNAL(error(QProcess::ProcessError)), this, SLOT(onBuildError(QProcess::ProcessError)));
-  
-  cleanFirst = false;
-  buildPending = false;
 }
 
@@ -50 +47 @@
 void Builder::build(QString projectName)
 {
-  if(cleanFirst)
-  {
-    cleanFirst = false;
-    buildPending = true;
-    return clean(projectName);
-  }
   currentProjectPath = projectName;
   QDir dir(currentProjectPath);
   setWorkingDirectory(dir.filePath("build"));
   loadDependencies(LIBRARIES_DIR, currentProjectPath);      // this loads up the list of libraries this project depends on
+  if(compareConfigFile(currentProjectPath))
+  {
+    createConfigFile(currentProjectPath);      // create a config file based on the Properties for this project
+    qDebug("creating/updating config file");
+  }
   createMakefile(currentProjectPath);        // create a Makefile for this project, given the dependencies
-  createConfigFile(currentProjectPath);      // create a config file based on the Properties for this project
   buildStep = BUILD;
   currentProcess = "make";
@@ -98 +93 @@
 }
 
-void Builder::onProjectUpdated()
-{
-  cleanFirst = true;
-}
-
 void Builder::stop()
 {
@@ -161 +151 @@
     case CLEAN:
       mainWindow->onCleanComplete();
-      if(buildPending)
-      {
-        buildPending = false;
-        build(currentProjectPath);
-      }
       break;
   }
@@ -321 +306 @@
           tofile << "\t" << "$(CC) $(CFLAGS) $(ARM_OBJ) $(THUMB_OBJ) -nostartfiles $(CRT0) $(LINKER_FLAGS)" << endl << endl;
 
-          tofile << "$(THUMB_OBJ) : %.o : %.c" << endl;
+          tofile << "$(THUMB_OBJ) : %.o : %.c ../config.h" << endl;
           tofile << "\t" << "$(CC) -c $(THUMB_FLAGS) $(CFLAGS) $< -o $@" << endl << endl;
 
-          tofile << "$(ARM_OBJ) : %.o : %.c" << endl;
+          tofile << "$(ARM_OBJ) : %.o : %.c ../config.h" << endl;
           tofile << "\t" << "$(CC) -c $(CFLAGS) $< -o $@" << endl << endl;
                   

mcbuilder/trunk/src/MainWindow.cpp

@@ -529 +529 @@
     setWindowTitle( projectName + "[*] - mcbuilder");
     updateRecentProjects(projectPath);
-    builder->onProjectUpdated();
     projInfo->load();
     buildLog->clear();