Changeset 9280

Show
Ignore:
Timestamp:
03/18/10 16:40:08 (2 years ago)
Author:
p_lindheimer
Message:

re r9277 make packing dyanmic without 'infinite loops' this time

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/buildtools/README.directory

    r7528 r9280  
    1111 
    1212/-------------------------------------------------------------------------------------------- 
    13 pack_javascripts.sh, jsmin.rb: 
     13pack_javascripts.php, jsmin.rb: 
    1414 
    1515These two scripts are used to package the libfreebx.javascripts.js by taking 

  • freepbx/trunk/buildtools/generate-release.sh

    r9043 r9280  
    3030# Now make sure javascript library reflects all the changes 
    3131cd buildtools 
    32 ./pack_javascripts.sh 
     32./pack_javascripts.php 
    3333cd .. 
    3434svn ci --message "Auto checkin packed libfreepbx.javascripts.js as part of build process" amp_conf/htdocs/admin/common/libfreepbx.javascripts.js 

  • freepbx/trunk/buildtools/pack_javascripts.php

    r9273 r9280  
    1 #!/bin/sh 
     1#!/usr/bin/php -q 
     2<?php 
    23 
    3 DIR="../amp_conf/htdocs/admin/common" 
     4$libfreepbx = 'libfreepbx.javascripts.js'; 
     5$dir="../amp_conf/htdocs/admin/common"; 
     6$output=array(); 
    47 
    5 cat `ls $DIR/*.js` | ./jsmin.rb > $DIR/libfreepbx.javascripts.js 
     8exec("ls $dir/*.js",$output,$ret); 
     9$final = array(); 
     10foreach ($output as $file) { 
     11  if (preg_match("|$dir/jquery-\d+\.\d+\.\d+\.js|",$file,$matches)) { 
     12    array_unshift($final,$dir.'/script.legacy.js'); 
     13    array_unshift($final,$file); 
     14  } else if ($file != $dir.'/'.$libfreepbx && $file != $dir.'/script.legacy.js') { 
     15    $final[] = $file; 
     16  } 
     17} 
     18echo "creating $libfreepbx with:\n\n"; 
     19echo 'cat '.implode(' ',$final)." | ./jsmin.rb >  $dir/$libfreepbx\n\n"; 
     20 
     21system('cat '.implode(' ',$final)." | ./jsmin.rb >  $dir/$libfreepbx");