Changeset 4722985


Ignore:
Timestamp:
05/24/15 20:40:34 (5 days ago)
Author:
Kris Moore <kris@…>
Branches:
master
Children:
5fcc75b
Parents:
6aa2793
Message:

Add intial support for ENTERPRISE package set, which we will begin
creating for 10.X here in the near(ish) future.

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • src-qt5/about-gui/mainwindow.cpp

    rf55f138 r4722985  
    106106    QString PkgSet="PRODUCTION"; 
    107107    PkgSet = pcbsd::Utils::getValFromPCBSDConf("PACKAGE_SET"); 
     108    if (PkgSet.toUpper().trimmed() == "ENTERPRISE") 
     109    { 
     110        PkgSet="ENTERPRISE"; 
     111        PkgSet+=QString(" ") + tr("(LTS)"); 
    108112    if (PkgSet.toUpper().trimmed() == "EDGE") 
    109113    { 
  • src-qt5/pc-softweb/configDlg.cpp

    r315e300 r4722985  
    148148      QString val = contents[i].section(":",1,50).simplified(); 
    149149      if(val=="EDGE"){ ui->radio_edge->setChecked(true); cRepo = val;} 
     150      if(val=="ENTERPRISE"){ ui->radio_enterprise->setChecked(true); cRepo = val;} 
    150151      else if(val=="PRODUCTION"){ ui->radio_production->setChecked(true); cRepo = val;} 
    151152      else if(val=="CUSTOM"){ ui->radio_custom->setChecked(true); cRepo = val;} 
     
    184185  QString pkgset = "PRODUCTION"; //default value (just in case) 
    185186  if(ui->radio_edge->isChecked()){ pkgset = "EDGE"; } 
     187  else if(ui->radio_enterprise->isChecked()){ pkgset = "ENTERPRISE"; } 
    186188  else if(ui->radio_production->isChecked()){ pkgset = "PRODUCTION"; } 
    187189  else if(ui->radio_custom->isChecked()){ pkgset = "CUSTOM"; } 
     
    200202  //Check for changes to the Repository config 
    201203  if(cRepo=="PRODUCTION" && !ui->radio_production->isChecked()){ repoChanged = true; } 
     204  else if(cRepo=="ENTERPRISE" && !ui->radio_enterprise->isChecked()){ repoChanged = true; } 
    202205  else if(cRepo=="EDGE" && !ui->radio_edge->isChecked()){ repoChanged = true; } 
    203206  else if(cRepo.startsWith("CUSTOM::::") && !ui->radio_custom->isChecked()){ repoChanged = true; } 
  • src-qt5/pc-softweb/configDlg.ui

    r3667cdb r4722985  
    88    <y>0</y> 
    99    <width>473</width> 
    10     <height>287</height> 
     10    <height>334</height> 
    1111   </rect> 
    1212  </property> 
     
    1515  </property> 
    1616  <property name="windowIcon"> 
    17    <iconset resource="SoftwareManager.qrc"> 
     17   <iconset resource="SoftwareWeb.qrc"> 
    1818    <normaloff>:/icons/appcafe.png</normaloff>:/icons/appcafe.png</iconset> 
    1919  </property> 
     
    3939         <layout class="QVBoxLayout" name="verticalLayout_3"> 
    4040          <item> 
     41           <widget class="QRadioButton" name="radio_enterprise"> 
     42            <property name="text"> 
     43             <string>Enterprise (Long Term Support)</string> 
     44            </property> 
     45           </widget> 
     46          </item> 
     47          <item> 
    4148           <widget class="QRadioButton" name="radio_production"> 
    4249            <property name="text"> 
     
    7986                 </property> 
    8087                 <property name="icon"> 
    81                   <iconset resource="SoftwareManager.qrc"> 
     88                  <iconset resource="SoftwareWeb.qrc"> 
    8289                   <normaloff>:/icons/add.png</normaloff>:/icons/add.png</iconset> 
    8390                 </property> 
     
    106113                 </property> 
    107114                 <property name="icon"> 
    108                   <iconset resource="SoftwareManager.qrc"> 
     115                  <iconset resource="SoftwareWeb.qrc"> 
    109116                   <normaloff>:/icons/remove.png</normaloff>:/icons/remove.png</iconset> 
    110117                 </property> 
     
    270277       </property> 
    271278       <property name="icon"> 
    272         <iconset resource="SoftwareManager.qrc"> 
     279        <iconset resource="SoftwareWeb.qrc"> 
    273280         <normaloff>:/icons/stop.png</normaloff>:/icons/stop.png</iconset> 
    274281       </property> 
     
    281288       </property> 
    282289       <property name="icon"> 
    283         <iconset resource="SoftwareManager.qrc"> 
     290        <iconset resource="SoftwareWeb.qrc"> 
    284291         <normaloff>:/icons/refresh.png</normaloff>:/icons/refresh.png</iconset> 
    285292       </property> 
     
    291298 </widget> 
    292299 <resources> 
    293   <include location="SoftwareManager.qrc"/> 
     300  <include location="SoftwareWeb.qrc"/> 
    294301  <include location="../pc-softwaremanager/SoftwareManager.qrc"/> 
    295302 </resources> 
  • src-sh/pcbsd-utils/config.sh

    rb41c672 r4722985  
    77 
    88# When rolling ISOs, what package set to use on fresh installs? 
    9 # {PRODUCTION|EDGE} 
     9# {PRODUCTION|EDGE|ENTERPRISE} 
    1010export INSTALLPACKAGESET="EDGE" 
  • src-sh/pcbsd-utils/pc-extractoverlay/desktop-overlay/usr/local/etc/pcbsd.conf

    rea12c5c r4722985  
    44# PRODUCTION - Updated quarterly 
    55# EDGE - Updated bi-weekly - For testers / developers 
     6# ENTERPRISE - Updated only with security fixes throughout the entire 
     7#              life-cycle of a major release. (I.E 10.X) 
    68PACKAGE_SET: EDGE 
    79 
  • src-sh/pcbsd-utils/pc-extractoverlay/server-overlay/usr/local/etc/pcbsd.conf

    rea12c5c r4722985  
    44# PRODUCTION - Updated quarterly 
    55# EDGE - Updated bi-weekly - For testers / developers 
     6# ENTERPRISE - Updated only with security fixes throughout the entire 
     7#              life-cycle of a major release. (I.E 10.X) 
    68PACKAGE_SET: EDGE 
    79 
  • src-sh/pcbsd-utils/pc-updatemanager/pc-updatemanager

    r77a2aa08 r4722985  
    9292# Check the PACKAGE_SET variable 
    9393case $PACKAGE_SET in 
    94    PRODUCTION|EDGE) ;; 
     94  ENTERPRISE|PRODUCTION|EDGE) ;; 
    9595  CUSTOM) # Using a custom package set? 
    9696          # Lets check that we have a URL provided 
     
    189189       EDGE) FBSDVER="$FBSDVER/edge" 
    190190             MAJORVER="$MAJORVER/edge" 
     191             ;; 
     192 ENTERPRISE) FBSDVER="$FBSDVER/enterprise" 
     193             MAJORVER="$MAJORVER/enterprise" 
    191194             ;; 
    192195          *) ;; 
Note: See TracChangeset for help on using the changeset viewer.