Changeset 117b060


Ignore:
Timestamp:
12/16/13 12:39:43 (20 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
e4f2841
Parents:
e5cbe5c
Message:

Clean up the PBI build command generation for EasyPBI on 10.x

Location:
src-qt4/EasyPBI-devel
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/EasyPBI-devel/ModuleUtils.cpp

    r85e9308 r117b060  
    203203  return MOD; 
    204204} 
     205 
     206QString ModuleUtils::generatePbiBuildCmd(QString confDir, QString outDir, QString sigFile){ 
     207  QString cmd = "pbi_makeport";  
     208  if(confDir.isEmpty()){ qDebug() << "Warning: a module must be supplied to build a PBII"; return ""; } 
     209  if(!confDir.isEmpty()){ cmd.append(" -c "+confDir); } 
     210  if(!outDir.isEmpty()){ cmd.append(" -o "+outDir); } 
     211  if(!sigFile.isEmpty()){ cmd.append(" --sign "+sigFile); } 
     212  cmd.append(" --pkgbuild"); 
     213  return cmd; 
     214} 
  • src-qt4/EasyPBI-devel/ModuleUtils.h

    r85e9308 r117b060  
    3030        static void compressModule(QString modulePath); 
    3131        static PBIModule newModule(QString moduleDir, QString port, QString iconFile); 
     32        static QString generatePbiBuildCmd(QString confDir, QString outDir, QString sigFile); 
    3233 
    3334}; 
  • src-qt4/EasyPBI-devel/mainGUI.cpp

    rcea69ea r117b060  
    12251225  QString outdir = settings->value("pbidir"); 
    12261226  if (outdir.isEmpty() ){gostatus=FALSE;} 
    1227   //QString sigfile = "";ui->linePBIDigSigFile->text(); //this one can be empty 
    12281227  QString modDir = MODULE.basepath(); 
    12291228  if(modDir.isEmpty()){gostatus=FALSE;} 
     
    12341233   
    12351234  //Generate the PBI build command 
    1236   QString cmd; 
    1237   // -- PBI from ports 
     1235  QString sigFile; 
     1236  if( settings->check("usesignature") && QFile::exists(settings->value("sigfile")) ){ sigFile = settings->value("sigfile"); } 
     1237  QString cmd = ModuleUtils::generatePbiBuildCmd(MODULE.basePath(), outdir, sigFile); 
     1238  /*// -- PBI from ports 
    12381239    //Check that the ports tree is available 
    12391240    if( !settings->check("isportsavailable") ){  
     
    12601261    } 
    12611262    if( settings->check("usesignature") && QFile::exists(settings->value("sigfile")) ){ cmd += " --sign " + settings->value("sigfile"); } 
    1262  
     1263  */ 
    12631264  //Display the command created in hte terminal 
    12641265  qDebug() << "Build PBI command created:"<<cmd; 
     
    12681269  QMessageBox verify(this); 
    12691270  verify.setText(tr("Are you sure you wish to start the PBI build?")); 
    1270   verify.setInformativeText(tr("This requires an active internet connection and administrator privileges. The time required to build a PBI varies depending upon system specifications and ports to be compiled.")); 
     1271  verify.setInformativeText(tr("This requires an active internet connection and administrator privileges.")); 
    12711272  verify.setStandardButtons(QMessageBox::Yes | QMessageBox::No); 
    12721273  verify.setDefaultButton(QMessageBox::Yes); 
Note: See TracChangeset for help on using the changeset viewer.