Changeset a44fbab


Ignore:
Timestamp:
12/16/13 14:53:10 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
9e890bf
Parents:
621f1df
Message:

Update the EasyPBI version to 2.2, with updated history file.
Also add ability to give a pbi.conf on the command line when starting up the application and have it load right away.

Location:
src-qt4/EasyPBI-devel
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/EasyPBI-devel/EasyPBI.pro

    rc8de217 ra44fbab  
    1515SOURCES += main.cpp\ 
    1616        mainGUI.cpp \ 
    17         modBuild.cpp \ 
    1817        backend.cpp \ 
    1918        newModuleDialog.cpp \ 
     
    2625 
    2726HEADERS  += mainGUI.h \ 
    28             modBuild.h \ 
    2927            backend.h \ 
    3028            newModuleDialog.h \ 
  • src-qt4/EasyPBI-devel/HISTORY.txt

    r3038c71 ra44fbab  
    3434EasyPBI version 2.1 is tagged! 
    3535Changes include: Combine the FreeBSD ports dialog into the EasyPBI Settings dialog, use portsnap for all FreeBSD ports fetching and updating, added the ability to flag xdg entries as requiring root, make all the "save" buttons dynamically enabled as appropriate.  
     36 
     37DEC 16, 2013: 
     38EasyPBI version 2.2 is tagged! 
     39NOTE: This version requires the 10.x version of the PBI manager to build PBI's (included in PC-BSD 10.x). 
     40Changes include: Update to work with the 10.x version of the PBI manager backend. This includes moving from using the FreeBSD ports tree to using pkgNG packages for information and building (so the FreeBSD ports tree is no longer necessary). This slims down the EasyPBI options/interface quite a bit, so a fair number of options have been removed. Packaging a local PBI is now standardized by simply creating a custom FreeBSD package on your system first, then use EasyPBI to re-package it as a PBI. 
  • src-qt4/EasyPBI-devel/PBIModule.cpp

    re5cbe5c ra44fbab  
    118118  for(int i=0; i<contents.length(); i++){ 
    119119    //see if the current line conains a desired variable and save it 
    120     QString line = contents[i]; 
     120    QString line = contents[i].simplified(); 
    121121    if(!line.startsWith("#") && !line.startsWith("export") && !line.isEmpty()){ //Ignore commented out lines 
    122122      //Pull apart the variable and the value 
     
    129129        } 
    130130        if(val.endsWith("\"")){ val.chop(1); } //remove the ending quote 
    131       //qDebug() << "var="+var+"\t\tval="+val; 
     131      qDebug() << "var="+var+"\t\tval="+val; 
    132132      //Now check for text/bool/int values 
    133133      if(CTextValues.contains(var)){ HASH.insert(var,val); } 
  • src-qt4/EasyPBI-devel/config.cpp

    r3038c71 ra44fbab  
    1414        //defaultSettings=[ current version#, programDir, pbiOutputDir, moduleOutputDir, pkgCacheDir, iconFile, settingsFile, iconDir] 
    1515        QString tmp = QDir::homePath()+"/EasyPBI/"; 
    16     defaultSettings << "2.1" << tmp << tmp+"PBI/" << tmp+"Modules/" << tmp+".cache/" << tmp+"defaulticon.png" << tmp+".preferences" << QDir::homePath(); 
     16    defaultSettings << "2.2" << tmp << tmp+"PBI/" << tmp+"Modules/" << tmp+".cache/" << tmp+"defaulticon.png" << tmp+".preferences" << QDir::homePath(); 
    1717        //TFstruct=[ is64-bitArch, portsAvailable, useDigitalSig, useTMPFS, usePkgCache, pbi_makeport_available, pbi_create_available, su_available ] 
    1818    TFstruct << FALSE << FALSE << FALSE << TRUE << TRUE << FALSE << FALSE << FALSE; 
  • src-qt4/EasyPBI-devel/main.cpp

    r3038c71 ra44fbab  
    2727    w.show(); 
    2828 
     29    //Look for additional input files and load the first pbi.conf 
     30    if(argc > 1){ 
     31      QString input = argv[1]; 
     32      if(input.endsWith("pbi.conf")){ 
     33        //append the local path if necessary 
     34        QDir dir(input); 
     35        //Now load the module 
     36        w.loadModule(dir.absolutePath()); 
     37      } 
     38    } 
    2939    int retCode = a.exec(); 
    3040    return retCode; 
  • src-qt4/EasyPBI-devel/mainGUI.cpp

    r621f1df ra44fbab  
    1717       ui->setupUi(this);  //load the mainGUI.ui file 
    1818        XDGUPDATING=false; 
     19        lastModuleDir.clear(); 
    1920        // Create the config class 
    2021        settings = new Config(); 
     
    130131} 
    131132 
     133void MainGUI::loadModule(QString confFile){ 
     134  //Load a module that was specified on the CLI 
     135  if(confFile.isEmpty() || !QFile::exists(confFile) ){return;} //invalid file 
     136  bool ok = MODULE.loadModule(confFile); 
     137  if(ok){  
     138    qDebug() << "Loaded module:"<<confFile; 
     139    line_module->setText(MODULE.basepath().replace(QDir::homePath(),"~"));  
     140    lastModuleDir = MODULE.basepath(); 
     141  } 
     142  //Move to the pbi.conf tab 
     143  ui->tabWidget->setCurrentWidget(ui->tab_pbi_conf); 
     144  //Refresh the UI 
     145  refreshGUI("pbiconf"); 
     146} 
     147 
    132148void MainGUI::slotSingleInstance(){ 
    133149  this->showNormal(); 
     
    422438void MainGUI::on_actionPBI_Modules_triggered(){ 
    423439  //Open the PC-BSD wiki to the module builders guide 
    424    QString target_url = "http://wiki.pcbsd.org/index.php/PBI_Module_Builder_Guide"; 
     440   QString target_url = "http://wiki.pcbsd.org/index.php/PBI_Module_Builder_Guide/9.2"; 
    425441   qDebug() << "Opening URL:" << target_url;  
    426442   target_url.prepend("xdg-open "); 
     
    466482 
    467483void MainGUI::on_actionLoad_Module_triggered(){ 
    468   QString modSel = QFileDialog::getOpenFileName(this, tr("Select PBI Module Configuration"), settings->value("moduledir"), tr("PBI Configuration (pbi.conf)") ); 
     484  QString openDir = settings->value("moduledir"); 
     485  if(!lastModuleDir.isEmpty()){ openDir = lastModuleDir; } 
     486  QString modSel = QFileDialog::getOpenFileName(this, tr("Select PBI Module Configuration"), openDir, tr("PBI Configuration (pbi.conf)") ); 
    469487  if(modSel.isEmpty()){return;} //action cancelled or closed 
    470488  bool ok = MODULE.loadModule(modSel); 
     
    472490    qDebug() << "Loaded module:"<<modSel; 
    473491    line_module->setText(MODULE.basepath().replace(QDir::homePath(),"~"));  
     492    lastModuleDir = MODULE.basepath(); 
    474493  } 
    475494  //Move to the pbi.conf tab 
  • src-qt4/EasyPBI-devel/mainGUI.h

    rc8de217 ra44fbab  
    1717#include <QTreeWidgetItem> 
    1818 
    19 #include "modBuild.h" 
    2019#include "backend.h" 
    2120#include "config.h" 
     
    3635    ~MainGUI(); 
    3736 
     37    void loadModule(QString confFile); 
    3838 
    3939private slots: 
     
    102102private: 
    103103    Ui::MainGUI *ui; 
    104     //ModBuild *currentModule; 
    105104    PBIModule MODULE; 
    106105    Config *settings; 
    107106    QLineEdit *line_module; 
    108     //QRadioButton *radio_module_port, *radio_module_local; 
    109107    QMenu menu_elOpts, menu_validMenuCats, menu_validRepoCats, menu_validRepoTypes; 
    110108    bool XDGUPDATING; 
     109    QString lastModuleDir; 
    111110 
    112111    QString PBI_BUILDING_NOW; 
     
    115114 
    116115    void SetupDefaults(); 
    117     //bool isValidPort(QString, bool allowOverride = FALSE); 
    118116    void checkMime(); 
    119117 
  • src-qt4/EasyPBI-devel/preferencesDialog.cpp

    r18af43e ra44fbab  
    9696  ui->line_sigfile->setText(seldir);  
    9797} 
    98 /* 
    99 void PreferencesDialog::on_push_addpkg_clicked(){ 
    100   //Get the desired directory 
    101   QString seldir = QFileDialog::getOpenFileName(this, tr("Select the Package to Ignore"), settings->value("cachedir"), tr("Package Files (*.txz)") ); 
    102   if(seldir.isEmpty()){ return; } //action cancelled 
    103   //get just the package name (ignore the version and extension) 
    104   QString pkg = seldir.remove(seldir.section("-",-1)); 
    105   pkg.append("*"); 
    106   //Save the selection to the GUI 
    107   ui->list_badpkg->addItem(pkg);  
    108 } 
    10998 
    110 void PreferencesDialog::on_push_rmpkg_clicked(){ 
    111   //get the currently selected item 
    112   int row = ui->list_badpkg->currentRow(); 
    113   if(row == -1){ return; } //nothing selected 
    114   //Remove it from the list 
    115   delete ui->list_badpkg->takeItem(row); 
    116 } 
    117  
    118 void PreferencesDialog::on_push_clearcache_clicked(){ 
    119   //Verify that this is what the user really wants to do 
    120   QMessageBox verify(this); 
    121   verify.setText(tr("Are you sure you wish to clear the PBI package cache?")); 
    122   verify.setInformativeText(tr("This will delete all the files and directories in the cache directory. The next time you start a PBI build, it will begin to rebuild all the packages from source.")); 
    123   verify.setStandardButtons(QMessageBox::Yes | QMessageBox::No); 
    124   verify.setDefaultButton(QMessageBox::Yes); 
    125   int ret = verify.exec(); 
    126   if(ret != QMessageBox::Yes){return;} 
    127   //Remove all files/directories in the EasyPBI cache dir 
    128   QString cmd = "cd "+settings->value("cachedir")+"; rm -rf *"; 
    129   system(cmd.toUtf8()); 
    130 } 
    131 */ 
    13299void PreferencesDialog::on_check_signpbi_stateChanged(int state){ 
    133100  if(state == Qt::Checked){ ui->groupBox_sig->setVisible(TRUE); } 
    134101  else{ ui->groupBox_sig->setVisible(FALSE); } 
    135102} 
    136 /* 
    137 void PreferencesDialog::on_check_usepkgcache_stateChanged(int state){ 
    138   if(state == Qt::Checked){ ui->groupBox_pkgcache->setVisible(TRUE); } 
    139   else{ ui->groupBox_pkgcache->setVisible(FALSE); } 
    140 } 
    141 */ 
     103 
    142104// ===== Paths Tab =====   
    143105void PreferencesDialog::on_push_moduledir_clicked(){ 
  • src-qt4/EasyPBI-devel/preferencesDialog.h

    r18af43e ra44fbab  
    3535    void on_push_sigfile_clicked(); 
    3636    void on_check_signpbi_stateChanged(int); 
    37     //void on_check_usepkgcache_stateChanged(int); 
    3837    // Paths Tab 
    3938    void on_push_moduledir_clicked(); 
Note: See TracChangeset for help on using the changeset viewer.