Changeset 799 for mcbuilder/trunk/src/Builder.cpp

Timestamp:

08/09/08 21:44:20 (5 months ago)

Author:

liamstask

Message:

- a few tests for the Builder class: creating a Makefile properly and loading in the requisite libraries
- update the AinToServo? example's project file format

Files:

• mcbuilder/trunk/src/Builder.cpp (modified) (9 diffs)

mcbuilder/trunk/src/Builder.cpp

@@ -23 +23 @@
 #include "ConsoleItem.h"
 
+#define LIBRARIES_DIR "cores/makecontroller/libraries"
+
 /*
   Builder takes a project and turns it into a binary executable.
@@ -28 +30 @@
   and Properties for this project.
 */
-Builder::Builder(MainWindow *mainWindow, ProjectInfo *projInfo, BuildLog *buildLog) : QProcess( 0 )
+Builder::Builder( MainWindow *mainWindow, ProjectInfo *projInfo, BuildLog *buildLog ) : QProcess( 0 )
 {
   this->mainWindow = mainWindow;
   this->projInfo = projInfo;
   this->buildLog = buildLog;
+  
   connect(this, SIGNAL(readyReadStandardOutput()), this, SLOT(filterOutput()));
   connect(this, SIGNAL(readyReadStandardError()), this, SLOT(filterErrorOutput()));
@@ -54 +57 @@
   }
   currentProjectPath = projectName;
-  ensureBuildDirExists(currentProjectPath);  // make sure we have a build dir
   setWorkingDirectory(QDir(currentProjectPath).filePath("build"));
-  loadDependencies(currentProjectPath);      // this loads up the list of libraries this project depends on
+  loadDependencies(LIBRARIES_DIR, currentProjectPath);      // this loads up the list of libraries this project depends on
   createMakefile(currentProjectPath);        // create a Makefile for this project, given the dependencies
   createConfigFile(currentProjectPath);      // create a config file based on the Properties for this project
@@ -107 +109 @@
 /*
   If there's no build directory within a project, create one.
-*/
-void Builder::ensureBuildDirExists(QString projPath)
+  Return the build dir's path.
+*/
+QString Builder::ensureBuildDirExists(QString projPath)
 {
   QDir dir(projPath);
   if(!dir.exists("build"))
     dir.mkdir("build");
+  return dir.filePath("build");
 }
 
@@ -184 +188 @@
 {
   bool retval = true;
-  QDir buildDir(projectPath + "/build");
+  QDir buildDir( ensureBuildDirExists(projectPath) );
   QFile makefile(buildDir.filePath("Makefile"));
   if(makefile.open(QIODevice::WriteOnly | QFile::Text))
@@ -250 +254 @@
           
           // add in the directories for the required libraries
-          QDir libdir(QDir::current().filePath("cores/makecontroller/libraries"));
+          QDir libdir(QDir::current().filePath(LIBRARIES_DIR));
           foreach(Library lib, libraries)
             tofile << "  -I" << filteredPath(libdir.filePath(lib.name)) << " \\" << endl;
@@ -484 +488 @@
       while(!outline.isNull())
       {
-        qDebug("msg: %s", qPrintable(outline));
+        //qDebug("msg: %s", qPrintable(outline));
         QStringList sl = outline.split(" ");
         if(sl.first().endsWith("arm-elf-gcc") && sl.at(1) == "-c")
@@ -522 +526 @@
       while(!outline.isNull())
       {
-        qDebug("err: %s", qPrintable(outline));
+        //qDebug("err: %s", qPrintable(outline));
         QString line = outline;
         outline = outstream.readLine();
@@ -648 +652 @@
   Create a Library structure for each library and store it in our class member "libraries"
 */
-void Builder::loadDependencies(QString project)
+void Builder::loadDependencies(QString libsDir, QString project)
 {
   QDir projDir(project);
   QStringList srcFiles = projDir.entryList(QStringList() << "*.c" << "*.h");
-  QDir libDir(QDir::current().filePath("cores/makecontroller/libraries"));
+  QDir libDir(QDir::current().filePath(libsDir));
   QStringList libDirs = libDir.entryList(QStringList(), QDir::Dirs | QDir::NoDotAndDotDot);