[PC-BSD Commits] r20132 - users/ken/EasyPBI2

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-11-07 18:52:38 +0000 (Wed, 07 Nov 2012)
New Revision: 20132

Modified:
   users/ken/EasyPBI2/mainGUI.cpp
Log:
Fix a couple minor things with EasyPBI2



Modified: users/ken/EasyPBI2/mainGUI.cpp
===================================================================
--- users/ken/EasyPBI2/mainGUI.cpp	2012-11-07 18:12:10 UTC (rev 20131)
+++ users/ken/EasyPBI2/mainGUI.cpp	2012-11-07 18:52:38 UTC (rev 20132)
@@ -125,7 +125,8 @@
   PBISETTINGS_FILE= PROG_DIR + "/.savedPBISettings.conf";
   DEFAULTICON_FILE= PROG_DIR + "/defaulticon.png";
   PORTS_DIR = "";
-  isSixtyFourBitOS=TRUE; //need to detect this later
+  qDebug() << "ENV:" << QProcessEnvironment::systemEnvironment().toStringList();
+  isSixtyFourBitOS= ( QProcessEnvironment::systemEnvironment().value("MACHTYPE") == "x86_64" );
   
   //Check for EasyPBI directory structure and create it if it is not there
   if( !QDir(PROG_DIR).exists() ){
@@ -1296,13 +1297,21 @@
     }
     //Setup the pbi_makeport command from GUI settings
     cmd = PBIBUILD_CMD;
-    if(ui->check_build_32->isChecked()){ cmd += " --32"; }
+    if(ui->check_build_32->isChecked()){ cmd += " -32"; }
     cmd += " -c " + modDir;
     if(PORTS_DIR != "/usr/ports"){ cmd += " -d " + PORTS_DIR; }
     cmd += " -o " + outdir;
     cmd += " --delbuild";
     //if( ui->checkTMPFS->isChecked() ){ cmd += " --tmpfs"; }
-    //if( ui->checkUseCache->isChecked() ){ cmd += " --pkgdir " + CACHE_DIR; }
+    /*if( ui->checkUseCache->isChecked() ){ 
+      cmd += " --pkgdir " + CACHE_DIR;
+      //Remove known "bad" packages (ones that routinely cause failures)
+      QDir cDir(CACHE_DIR);
+      QStringList filters << "libtool*";
+      QStringList badFiles = cDir.entryList(filters, QDir::Files | QDir:: NoDotAndDotDot)
+      for(int i=0; i<badFiles.length(); i++){ cDir.remove(badFiles[i]); }
+    }*/
+    
     //if(!sigfile.isEmpty()){ cmd += " --sign " + sigfile; }
     qDebug() << "Build PBI command created:"<<cmd;
     
@@ -1341,7 +1350,6 @@
   connect(p,SIGNAL(readyReadStandardOutput()),this,SLOT(slotUpdatePBIBuild()) );
   connect(p,SIGNAL(finished(int,QProcess::ExitStatus)),this,SLOT(slotPBIbuildFinished(int,QProcess::ExitStatus)) );
   connect(p,SIGNAL(error(QProcess::ProcessError)),this,SLOT(slotBuildError(QProcess::ProcessError)) );
-  
   //Setup the flag for the finishing checks
   PBI_BUILDING_NOW=outdir+":::"+currentModule->readValue("progname");
   //Start the Process