Changeset 6493

Show
Ignore:
Timestamp:
08/28/08 01:46:47 (5 years ago)
Author:
p_lindheimer
Message:

closes #3119 changes to build scripts and fw_fop and fw_ari split out

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.5/framework/install.php

    r5590 r6493  
    7474  $bin_source = dirname(__FILE__)."/bin/*"; 
    7575  $agibin_source = dirname(__FILE__)."/agi-bin/*"; 
    76   $htdocs_panel_source = dirname(__FILE__)."/htdocs_panel/*"; 
    7776 
    7877  // These are required by libfreepbx.install.php library for upgrade routines 
    …… 
    8483  $bin_dest    = isset($amp_conf['AMPBIN']) ? $amp_conf['AMPBIN'] : '/var/lib/asterisk/bin'; 
    8584  $agibin_dest = isset($asterisk_conf['astagidir']) ? $asterisk_conf['astagidir']:'/var/lib/asterisk/agi-bin'; 
    86  
    87   // There was a past bug where FOPWEBROOT was pointing to AMPWEBROOT so if that is the case then hardcode 
    88   // and force to panel here. 
    89   // 
    90   $htdocs_panel_dest = $amp_conf['FOPWEBROOT']; 
    91   if ($htdocs_panel_dest == $amp_conf['AMPWEBROOT']) { 
    92     $htdocs_panel_dest .= "/panel"; 
    93   } 
    9485 
    9586  exec("cp -rf $htdocs_source $htdocs_dest 2>&1",$out,$ret); 
    …… 
    10899  } 
    109100 
    110   exec("cp -rf $htdocs_panel_source $htdocs_panel_dest 2>&1",$out,$ret); 
    111   if ($ret != 0) { 
    112     framework_print_errors($htdocs_panel_source, $htdocs_panel_dest, $out); 
    113   } 
    114  
    115101  if (function_exists('upgrade_all')) { 
    116102    upgrade_all(getversion()); 

  • modules/branches/2.5/framework/module.xml

    r6475 r6493  
    22  <rawname>framework</rawname> 
    33  <name>FreePBX Framework</name> 
    4   <version>2.5.0rc2.1</version> 
     4  <version>2.5.0rc2.2</version> 
    55  <candisable>no</candisable> 
    66  <canuninstall>no</canuninstall> 
    77  <changelog> 
     8    *2.5.0rc2.2* #3107, #3093, #3090, #3113, $3117 
    89    *2.5.0rc2.1* #3104 fix some urlencoding/decoding re: #3102 changes 
    910    *2.5.0rc2.0* #3067, #3086, #3082, #3102 

  • modules/branches/2.5/frameworksvn.pl

    r5909 r6493  
    3030  system("tar -zxOf ".$filename." ".$moddir."/svnversion.txt"); 
    3131  print "Geting svn log since that version for $rver : .... \n\n"; 
    32   $svnver = system("svn log http://svn.freepbx.org/freepbx/trunk -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD"); 
     32  $svnver = system("svn log http://svn.freepbx.org/freepbx/branches/$rver -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD"); 
    3333 

  • modules/branches/2.5/fw_fop/install.php

    r5590 r6493  
    33// HELPER FUNCTIONS: 
    44 
    5 function framework_print_errors($src, $dst, $errors) { 
    6   echo "error copying framework files:<br />'cp -rf' from src: '$src' to dst: '$dst'...details follow<br />"; 
     5function fw_fop_print_errors($src, $dst, $errors) { 
     6  echo "error copying fw_fop files:<br />'cp -rf' from src: '$src' to dst: '$dst'...details follow<br />"; 
    77  foreach ($errors as $error) { 
    88    echo "$error<br />"; 
    …… 
    4343} 
    4444 
    45 include dirname(__FILE__)."/libfreepbx.install.php"; 
    46  
    4745global $amp_conf; 
    4846global $asterisk_conf; 
    …… 
    6866 
    6967/* 
    70  * Framework install script 
     68 * fw_fop install script 
    7169 */ 
    7270 
    73   $htdocs_source = dirname(__FILE__)."/htdocs/*"; 
    74   $bin_source = dirname(__FILE__)."/bin/*"; 
    75   $agibin_source = dirname(__FILE__)."/agi-bin/*"; 
    7671  $htdocs_panel_source = dirname(__FILE__)."/htdocs_panel/*"; 
    77  
    78   // These are required by libfreepbx.install.php library for upgrade routines 
    79   // 
    80   define("UPGRADE_DIR", dirname(__FILE__)."/upgrades/"); 
    81   define("MODULE_DIR",  $amp_conf['AMPWEBROOT'].'/modules/'); 
    82  
    83   $htdocs_dest = $amp_conf['AMPWEBROOT']; 
    84   $bin_dest    = isset($amp_conf['AMPBIN']) ? $amp_conf['AMPBIN'] : '/var/lib/asterisk/bin'; 
    85   $agibin_dest = isset($asterisk_conf['astagidir']) ? $asterisk_conf['astagidir']:'/var/lib/asterisk/agi-bin'; 
    8672 
    8773  // There was a past bug where FOPWEBROOT was pointing to AMPWEBROOT so if that is the case then hardcode 
    …… 
    9379  } 
    9480 
    95   exec("cp -rf $htdocs_source $htdocs_dest 2>&1",$out,$ret); 
    96   if ($ret != 0) { 
    97     framework_print_errors($htdocs_source, $htdocs_dest, $out); 
    98   } 
    99  
    100   exec("cp -rf $bin_source $bin_dest 2>&1",$out,$ret); 
    101   if ($ret != 0) { 
    102     framework_print_errors($bin_source, $bin_dest, $out); 
    103   } 
    104  
    105   exec("cp -rf $agibin_source $agibin_dest 2>&1",$out,$ret); 
    106   if ($ret != 0) { 
    107     framework_print_errors($agibin_source, $agibin_dest, $out); 
    108   } 
    109  
    11081  exec("cp -rf $htdocs_panel_source $htdocs_panel_dest 2>&1",$out,$ret); 
    11182  if ($ret != 0) { 
    112     framework_print_errors($htdocs_panel_source, $htdocs_panel_dest, $out); 
    113   } 
    114  
    115   if (function_exists('upgrade_all')) { 
    116     upgrade_all(getversion()); 
    117   } else { 
    118     echo ("[ERROR] Function: 'upgrade_all' not present, libfreepbx.inc.php must not be isntall<br>"); 
     83    fw_fop_print_errors($htdocs_panel_source, $htdocs_panel_dest, $out); 
    11984  } 
    12085 

  • modules/branches/2.5/fw_fop/module.xml

    r6475 r6493  
    11<module> 
    2   <rawname>framework</rawname> 
    3   <name>FreePBX Framework</name> 
    4   <version>2.5.0rc2.1</version> 
     2  <rawname>fw_fop</rawname> 
     3  <name>FreePBX FOP Framework</name> 
     4  <version>2.5.0</version> 
    55  <candisable>no</candisable> 
    66  <canuninstall>no</canuninstall> 
    77  <changelog> 
    8     *2.5.0rc2.1* #3104 fix some urlencoding/decoding re: #3102 changes 
    9     *2.5.0rc2.0* #3067, #3086, #3082, #3102 
    10     *2.5.0rc1.1* published wrong, including rc1.0 additions 
    11     *2.5.0rc1.0* #2913, #3052 delay_answer schema and CSS fix 
    12     *2.5.0beta1.2* #3014, #3030, #2992, #3026, #3027 
    13     *2.5.0beta1.1* #2635, #2792 CDR Reporting pie chart errors, and fix bug introduced by #2963 
    14     *2.5.0beta1.0* #2854, #2978, #2980, #2981, #2982, #2963, #2985 
    15     *2.5.0alpha1.2* #2957 fix fatal failure in retrieve_conf from change to splice 
    16     *2.5.0alpha1.1* #2941, #2924, #1539, #2950, #2944, #2945, #2699, #2686, #2946, #2606, #2772, #2565, #1679 
    17     *2.5.0alpha1.0* #1628, #1715, #1843, #2497, #2604, #2606, #2609, #2686, #2701, #2703, #2739, #2766, #2777, #2782, #2784, #2793, #2798, #2799, #2809, #2818, #2829, #2843, #2845, #2855, #2862, #2881, #2890, #2891, #2897, #2903, #2910, #2911, #2921, #2924 
    18     *2.4.0.1* #2843, #2701, #2818, #2784, #2604, #2766, #2798, #2809, #2799, #2685, #2676 
    19     *2.4.0.0* first 2.4 final release 
    20     *2.4.0rc1.1* created upgrade directory to bump main version 
    21     *2.4.0rc1.0* rc1 release 
    22     *2.4.0beta2.2* fixed install script breaking download module admin 
    23     *2.4.0beta2.1* #2578 Asterisk 1.6 change for LANGUAGE, add addSwitch to extenions class 
    24     *2.4.0beta2.0* #2539, increase module_xml data field size, #2568 move features.conf to core, add details what online update transmits 
    25     *2.4.0beta1.2* correct publishing error which pulls in all previous 2.4beta framework changes below 
    26     *2.4.0beta1.1* #2544 (Asterisk 11543) create #include files or Asterisk will fail, #2554 extenssion class addtions 
    27     *2.4.0beta1.0* #2477, #2517, #2319, #2523, #2475, #1858, #2419, #2484, #2334, #2134, #2431, #2453, Extension/Destination Registry support/APIs adhoc devices user login/out improvments and dynamic hints, conversion of zap channel routes, amportal.conf: DYNAMICHINTS, CUSTOMASERROR, BADDESTABORT, XTNCONFILICTABORT - many other changes, see CHANGES log and svn log 
    28     *2.4.0alpha1.0* #2373, #2430, #2451; add ExecIf to extensions class 
    29     *2.3.1.0* #2335, #2412, module upgrade completely rewrites old modules, see CHANGES file in framework module directory 
    30     *2.3.0.3* #2336, #2350 FOP DBI issues with some versions, fixed some paging issues with sipaddheader() not escaping spaces 
    31     *2.3.0.2* fix upgrade to properly remove depecrated unused files 
    32     *2.3.0.1* #2249 fix syntax error from first fix to ARI 
    33     *2.3.0.0* Final Release 
    34     *2.3.0RC1.1* bump to RC1 because of bug not using proper version compare 
    35     *2.3.0rc1.0* styling and UI tweaks, improvments, javascript library package and reload improvements 
    36     *2.3.0beta2.10* #1826, #2132, #2161, #2162, #2216, added AUTHTYPE=webserver, added DEVEL flag, fixed warnings, unitialized variables 
    37     *2.3.0beta2.9* #2127 call-limit for Asterisk 1.4, replaced legacy retrieve_conf scripts, uninitialized variables and warnings, consolidate javascripts and CSS files, welcome page improvments. 
    38     *2.3.0beta2.8* #1520, added keyboard shortcuts during reload, support to block modules requiring asterisk running (when it is not), misc other fixes 
    39     *2.3.0beta2.7* #2180, #2174 reverted to old op_style.sh 
    40     *2.3.0beta2.6* #2174 fix #2154 really this time, and fix crontab to check for updates 
    41     *2.3.0beta2.5* #2143 fixed module hooks 
    42     *2.3.0beta2.4* #2147 tab link to FOP broken, #2157 fix database mode, #2150 output to crontab stopped,  retrieve_conf copy fix, needed for #2046 VmX bug #2111 added retrieve_conf failure notifications, #2154 move bonce_op.sh and fix, #1442 removed .htacces exceptions in modules 
    43     *2.3.0beta2.3* additional notification logging, fix missing version_compare_freepbx function upgrading from older beta versions 
    44     *2.3.0beta2.2* #2137 fix ARI VmX bug, fix odd bug in error reporting in retrieve_conf, additional notification logging 
    45     *2.3.0beta2.1* fix include of libfreepbx.install.php in install.php script 
    46     *2.3.0beta2.0* Beta2 Release - see CHANGES file with packaged tarball and read important WARNINGS 
    47     *2.3.0beta1.6* added ext_sipaddheader, ext_sipgetheader, ext_alertinfo to extensions.class.php 
    48     *2.3.0beta1.5* improved parsers and made retreive_conf use the main parser, fixed on module version depends regex 
    49     *2.3.0beta1.4* #2020 added chmod 0754 to copied files to make sure they are executable 
    50     *2.3.0beta1.3* #2020 retrieve_conf copies module agi-bin now, was symlink. #1963, #2031, #2033 minor fixes (see tickets)  
    51     *2.3.0beta1.2* #1785 corner case ARI playback fix, misc other 
    52     *2.3.0beta1.1* Framework changes, test framework module 
    53     *2.3.0beta1.0* First release of framework 
     8    *2.5.0* First release of fw_fop 
    549  </changelog> 
    5510  <description> 
    56     This module provides a facility to install bug fixes to the framework code that is not otherwise housed in a module 
     11    This module provides a facility to install bug fixes to the FOP code that is not otherwise housed in a module, it used to be part of framework but has been removed to isolate FOP from Framework updates. 
    5712  </description> 
    5813  <type>setup</type> 
    5914  <category>Basic</category> 
    60   <location>release/2.5/framework-2.5.0rc2.1.tgz</location> 
    61   <md5sum>a85e23d4761fc2eafd9fbe0c3ad07bba</md5sum> 
     15  <location>release/2.5/fw_fop-2.5.0.tgz</location> 
     16  <md5sum>eed5fae9611aaf976464452bca027723</md5sum> 
    6217</module> 

  • modules/branches/2.5/publish.pl

    r6399 r6493  
    1010$fwbranch = "branches/2.5"; 
    1111$framework = "framework"; 
     12$fw_fop = "fw_fop"; 
     13$fw_ari = "fw_ari"; 
    1214 
    1315my $reldir = "release/"; 
    …… 
    3537      die "FATAL: failed to export htdocs directory\n"; 
    3638    } 
    37     if (system("svn export http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs_panel $framework/htdocs_panel")) { 
    38       die "FATAL: failed to export htdocs_panel directory\n"; 
    39     } 
    4039    if (system("svn export http://svn.freepbx.org/freepbx/$fwbranch/upgrades $framework/upgrades")) { 
    4140      die "FATAL: failed to export upgrades directory\n"; 
    …… 
    6564    } 
    6665 
    67     # Now we must remove a few files which users may have legitimately edited. For now this is the main.conf.php file which is the current 
     66    # Now we must remove a few files which users may have legitimately edited. For now, all of ARI moved to new module 
    6867    # ARI file used for editing paramters and options. 
    6968    # 
    70     if (system("rm -rf $framework/htdocs/recordings/includes/main.conf.php")) { 
     69    if (system("rm -rf $framework/htdocs/recordings")) { 
    7170      die "FATAL: failed to trim main.conf.php ARI file\n"; 
    7271    } 
    …… 
    8685      die "FATAL: failed to trim modules/_cache\n"; 
    8786    } 
     87  } 
     88  if ($moddir =~ /$fw_fop/) { 
     89 
     90    if (system("svn export http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs_panel $fw_fop/htdocs_panel")) { 
     91      die "FATAL: failed to export htdocs_panel directory\n"; 
     92    } 
     93 
     94    # Create the svnversion information for this framework snapshot 
     95    # 
     96    if (system("echo SVN VERSION: `svn log -q -r HEAD http://svn.freepbx.org/ | cut -s -f 1 -d ' ' | cut -b '2-'` > $fw_fop/svnversion.txt")) { 
     97      die "FATAL: svnversion failed to create svnversion.txt\n"; 
     98    } 
     99 
     100  } 
     101  if ($moddir =~ /$fw_ari/) { 
     102 
     103    if (system("rm -rf $fw_ari/htdocs_ari")) { 
     104      die "FATAL: failed to remove previoulsly exported directories\n"; 
     105    } 
     106 
     107    # Create the svnversion information for this framework snapshot 
     108    # 
     109    if (system("echo SVN VERSION: `svn log -q -r HEAD http://svn.freepbx.org/ | cut -s -f 1 -d ' ' | cut -b '2-'` > $fw_fop/svnversion.txt")) { 
     110      die "FATAL: svnversion failed to create svnversion.txt\n"; 
     111    } 
     112 
     113    if (system("svn export http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/recordings $fw_ari/htdocs_ari")) { 
     114      die "FATAL: failed to export htdocs directory\n"; 
     115    } 
     116 
     117    # Now we must remove a few files which users may have legitimately edited. For now this is the main.conf.php file which is the current 
     118    # ARI file used for editing paramters and options. 
     119    # 
     120    if (system("rm -rf $fw_ari/htdocs_ari/includes/main.conf.php")) { 
     121      die "FATAL: failed to trim main.conf.php ARI file\n"; 
     122    } 
     123 
    88124  } 
    89125 
    …… 
    117153      $files .= "$x "; 
    118154    } 
     155  } elsif ($moddir =~ /$fw_fop/) { 
     156      next if ($x =~ /module.xml/); 
     157      next if ($x =~ /htdocs_panel/); 
     158      next if ($x =~ /svnversion.txt/); 
     159      $files .= "$x "; 
     160  } elsif ($moddir =~ /$fw_ari/) { 
     161      next if ($x =~ /module.xml/); 
     162      next if ($x =~ /htdocs_ari/); 
     163      next if ($x =~ /svnversion.txt/); 
     164      $files .= "$x "; 
    119165  } else { 
    120166    while ($x = shift @arr) { 
    …… 
    164210  } 
    165211} 
    166