Changeset 800

Timestamp:

08/10/08 13:20:07 (3 months ago)

Author:

liamstask

Message:

- add compareConfigFile() to determine when we need to re-write the config file
- add tests for it

Location:

mcbuilder/trunk

Files:

• include/Builder.h (modified) (1 diff)
• src/Builder.cpp (modified) (1 diff)
• tests/TestBuilder.cpp (modified) (6 diffs)
• tests/TestBuilder.h (modified) (1 diff)

mcbuilder/trunk/include/Builder.h

@@ -69 +69 @@
   bool createMakefile(QString projectPath);
   bool createConfigFile(QString projectPath);
+  bool compareConfigFile(QString projectPath);
   bool matchErrorOrWarning(QString msg);
   bool matchInFunction(QString msg);

mcbuilder/trunk/src/Builder.cpp

@@ -404 +404 @@
 
 /*
+  Check if we need to modify the config file for this project.
+  Compare the info currently in ProjectInfo with the info in config.h.
+  If they don't match or config.h doesn't exist, return true.
+  If we don't need to update/create config.h, return false.
+*/
+bool Builder::compareConfigFile(QString projectPath)
+{
+  bool retval = false;
+  QDir dir(projectPath);
+  QFile configFile(dir.filePath("config.h"));
+  if(configFile.open(QIODevice::ReadOnly|QFile::Text))
+  {
+    QTextStream in(&configFile);
+    int maj, min, bld;
+    parseVersionNumber( &maj, &min, &bld );
+    
+    bool network = false;
+    bool osc = false;
+    bool usb = false;
+    
+    QRegExp majorVersionExp("#define FIRMWARE_MAJOR_VERSION (\\d+)");
+    QRegExp minorVersionExp("#define FIRMWARE_MINOR_VERSION (\\d+)");
+    QRegExp buildVersionExp("#define FIRMWARE_BUILD_NUMBER (\\d+)");
+    
+    QRegExp heapExp("#define CONTROLLER_HEAPSIZE (\\d+)");
+    QRegExp nameExp("#define FIRMWARE_NAME \"(.+)\"");
+    
+    QRegExp mempoolExp("#define NETWORK_MEM_POOL (\\d+)");
+    QRegExp udpExp("#define NETWORK_UDP_CONNS (\\d+)");
+    QRegExp tcpExp("#define NETWORK_TCP_CONNS (\\d+)");
+    QRegExp tcpListenExp("#define NETWORK_TCP_LISTEN_CONNS (\\d+)");
+    
+    QString line = in.readLine();
+    while(!line.isNull())
+    {
+      if( line.contains(majorVersionExp) ) // major version number
+      {
+        int majVer = majorVersionExp.cap(1).toInt();
+        if(majVer != maj)
+          retval = true;
+      }
+      else if( line.contains(minorVersionExp) ) // minor version number
+      {
+        int minVer = minorVersionExp.cap(1).toInt();
+        if(minVer != min)
+          retval = true;
+      }
+      else if( line.contains(buildVersionExp) ) // build version number
+      {
+        int bldVer = buildVersionExp.cap(1).toInt();
+        if(bldVer != bld)
+          retval = true;
+      }
+      else if( line.contains(heapExp) ) // heap size
+      {
+        int heap = heapExp.cap(1).toInt();
+        if(heap != projInfo->heapsize())
+          retval = true;
+      }
+      else if( line.contains(nameExp) ) // project name
+      {
+        QString firmwareName = nameExp.cap(1);
+        if(firmwareName != dir.dirName())
+          retval = true;
+      }
+      else if( line.contains("#define MAKE_CTRL_USB") ) // include USB
+        usb = true;
+      else if( line.contains("#define OSC") ) // include OSC
+        osc = true;
+      else if( line.contains("#define MAKE_CTRL_NETWORK") ) // include network
+        network = true;
+      else if( line.contains(mempoolExp) ) // network memory pool size
+      {
+        int mempool = mempoolExp.cap(1).toInt();
+        if( mempool != projInfo->networkMempool() )
+          retval = true;
+      }
+      else if( line.contains(udpExp) ) // number of UDP connections
+      {
+        int udp = udpExp.cap(1).toInt();
+        if( udp != projInfo->udpSockets() )
+          retval = true;
+      }
+      else if( line.contains(tcpExp) ) // number of TCP sockets
+      {
+        int tcp = tcpExp.cap(1).toInt();
+        if( tcp != projInfo->tcpSockets() )
+          retval = true;
+      }
+      else if( line.contains(tcpListenExp) ) // number of TCP server sockets
+      {
+        int tcpListen = tcpListenExp.cap(1).toInt();
+        if( tcpListen != projInfo->tcpServers() )
+          retval = true;
+      }
+      
+      line = in.readLine();
+    }
+    
+    if(usb != projInfo->includeUsb() )
+      retval = true;
+    if(osc != projInfo->includeOsc() )
+      retval = true;
+    if(network != projInfo->includeNetwork() )
+      retval = true;
+    
+    configFile.close();
+  }
+  else
+    retval = true; // file doesn't exist or couldn't be read
+  return retval;
+}
+
+/*
   Convert a version number string to 3 ints.
   We expect the version string to be in the form X.Y.Z

mcbuilder/trunk/tests/TestBuilder.cpp

@@ -17 +17 @@
 
 #include "TestBuilder.h"
-#include "ProjectInfo.h"
 
 #define TEST_PROJECT "resources/examples/Input-Output/AinToServo"
@@ -40 +39 @@
 void TestBuilder::initTestCase()
 {
+  window->openProject(currentProjectPath());
   builder = window->builder;
-  builder->currentProjectPath = currentProjectPath();
 }
 
@@ -85 +84 @@
   
   QStringList makeFiles; // list of files in the Makefile
+  QStringList makeFileDirs; // list of include dirs in the Makefile
   QVERIFY(makefile.open(QFile::ReadOnly | QFile::Text));
   QTextStream in(&makefile);
@@ -90 +90 @@
   static const int BEGIN = 0;
   static const int FILES = 1;
+  static const int DIRS = 2;
   int state = BEGIN;
   while(!makeLine.isNull())
@@ -101 +102 @@
       case FILES:
         if(makeLine.startsWith("INCLUDEDIRS"))
+          state = DIRS;
+        else if(!makeLine.isEmpty() && !makeLine.startsWith("ARM_SRC"))
+          makeFiles << makeLine.remove("\\").trimmed();
+        break;
+      case DIRS:
+        if(makeLine.startsWith("CC"))
           state = BEGIN;
-        else
-        {
-          if(!makeLine.isEmpty() && !makeLine.startsWith("ARM_SRC"))
-            makeFiles.append(makeLine.remove("\\").trimmed());
-        }
-        break;
+        else if(!makeLine.isEmpty())
+          makeFileDirs << makeLine.remove("\\").remove("-I").trimmed();
     }
     makeLine = in.readLine();
   }
   QVERIFY(makeFiles.size()); // make sure we got something
+  QVERIFY(makeFileDirs.size());
   
   // now, let's compare our lists
@@ -128 +132 @@
   //qDebug("makefiles: %d, projectfiles: %d, matches: %d", makeFiles.size(), projectFiles.size(), matches);
   QVERIFY( matches == (makeFiles.size() - libraryFiles));
+  
+  // now check that the appropriate include directories have been added
+  QDomNodeList dirs = projectDoc.elementsByTagName("include_dirs").at(0).childNodes();
+  QStringList includeDirs;
+  for(int i = 0; i < dirs.count(); i++)
+    includeDirs.append(builder->filteredPath(dirs.at(i).toElement().text()));
+  QVERIFY(includeDirs.size()); // make sure we got something
+  
+  matches = 0;
+  int libraryDirs = 0;
+  foreach( QString dir, makeFileDirs )
+  {
+    if(includeDirs.contains(dir))
+      matches++;
+    else if(dir.contains("cores/makecontroller/libraries"))
+      libraryDirs++;
+  }
+  //qDebug("makefile dirs: %d, project file dirs: %d, matches: %d, library dirs: %d", 
+  //         makeFileDirs.size(), includeDirs.size(), matches, libraryDirs);
+  
+  // one additional difference is that the Makefile should include the project dir itself as an include dir
+  // whereas this is not specificed in the project file
+  QVERIFY(matches == (makeFileDirs.size() - libraryDirs - 1));
+}
+
+/*
+  Create a config file.
+  Make sure it includes the appropriate elements, based on the 
+  ProjectInfo.
+*/
+void TestBuilder::testConfigFile()
+{
+  QDir projDir(currentProjectPath());
+  QFile configFile(projDir.filePath("config.h"));
+  
+  if( configFile.exists() )
+    projDir.remove("config.h"); // get rid of the file, so we can test creating it
+
+  builder->createConfigFile(currentProjectPath());
+  // we haven't changed anything in the file yet, so this should return false
+  QVERIFY( builder->compareConfigFile(currentProjectPath()) == false );
+  
+  // now let's change a few things in the config file, and confirm that we need to update it
+//  QVERIFY(configFile.open(QFile::Text));
+//  QTextStream in(&configFile);
+//  
+//  configFile.close();
 }
 

mcbuilder/trunk/tests/TestBuilder.h

@@ -44 +44 @@
   void loadLibs();
   void testMakefile();
+  void testConfigFile();
 };