Development

Changeset 1785

You must first sign up to be able to contribute.

Changeset 1785

Show
Ignore:
Timestamp:
08/23/06 21:29:28 (2 years ago)
Author:
fabien
Message:

moved all files from bin in data/bin

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/data/bin/create_quickstart.sh

    r1778 r1785  
    2626 
    2727echo ">>> add symfony command line" 
    28 mkdir tmp 
    29 svn export http://svn.symfony-project.com/${SVN_PATH}/bin/ tmp/bin/ 
    30 mv tmp/bin/symfony.sh symfony.sh 
    31 mv tmp/bin/symfony.bat symfony.bat 
    32 mv tmp/bin/symfony.php bin/symfony.php 
    33 rm -rf tmp 
     28cp data/symfony/bin/symfony.sh symfony.sh 
     29cp data/symfony/bin/symfony.bat symfony.bat 
     30cp data/symfony/bin/symfony.php bin/symfony.php 
    3431sed -i '' -e "s#@PEAR-DIR@#bin#g" symfony.sh 
    3532sed -i '' -e "s#@PEAR-DIR@#bin#g" symfony.bat 
  • trunk/data/bin/symfony.bat

    r500 r1785  
    3535:run 
    3636IF EXIST "@PEAR-DIR@" ( 
    37   %PHP_COMMAND% -d html_errors=off -qC "@PEAR-DIR@\symfony.php" %1 %2 %3 %4 %5 %6 %7 %8 %9 
     37  %PHP_COMMAND% -d html_errors=off -qC "@DATA-DIR@\bin\symfony.php" %1 %2 %3 %4 %5 %6 %7 %8 %9 
    3838) ELSE ( 
    39   %PHP_COMMAND% -d html_errors=off -qC "%SYMFONY_HOME%\bin\symfony.php" %1 %2 %3 %4 %5 %6 %7 %8 %9 
     39  %PHP_COMMAND% -d html_errors=off -qC "%SYMFONY_HOME%\data\bin\symfony.php" %1 %2 %3 %4 %5 %6 %7 %8 %9 
    4040) 
    4141goto cleanup 
  • trunk/data/bin/symfony.sh

    r500 r1785  
    1313 
    1414if [ -z "$SYMFONY_HOME" ] ; then 
    15   SYMFONY_HOME="@PEAR-DIR@" 
     15  SYMFONY_HOME="@DATA-DIR@" 
    1616fi 
    1717 
     
    2626fi 
    2727 
    28 $PHP_COMMAND -d html_errors=off -qC $SYMFONY_HOME/symfony.php $* 
     28$PHP_COMMAND -d html_errors=off -qC $SYMFONY_HOME/bin/symfony.php $* 
  • trunk/data/tasks/sfPakeSymfony.php

    r1415 r1785  
    11<?php 
    22 
    3 pake_desc('freeze symfony libraries to a PEAR release'); 
    4 pake_task('freeze'); 
     3pake_desc('freeze symfony libraries'); 
     4pake_task('freeze', 'project_exists'); 
    55 
    66pake_desc('unfreeze symfony libraries'); 
    7 pake_task('unfreeze'); 
     7pake_task('unfreeze', 'project_exists'); 
    88 
    99function run_freeze($task, $args) 
    1010{ 
    11   if (!count($args)) 
     11  // check that the symfony librairies are not already freeze for this project 
     12  if (is_readable('lib/symfony') && !is_link('lib/symfony')) 
    1213  { 
    13     throw new Exception('You must provide the release version you want to freeze (stable or beta or rXXX).'); 
     14    throw new Exception('You can only freeze when lib/symfony is empty (symfony as PEAR) or if lib/symfony is a symlink to a symfony installation.'); 
    1415  } 
    1516 
    16   $version = strtolower($args[0]); 
     17  if (is_readable('data/symfony') && !is_link('data/symfony')) 
     18  { 
     19    throw new Exception('You can only freeze when data/symfony is empty (symfony as PEAR) or if data/symfony is a symlink to a symfony installation.'); 
     20  } 
    1721 
    18   // remove current version if present 
    19  
    20   $url = 'http://www.symfony-project.com/get/symfony-stable.tgz'; 
    21   $svn = 'http://svn.symfony-project.com/'; 
    22  
    23   // PEAR release or subversion revision? 
    24   if ($version == 'stable') 
     22  if (is_link('lib/symfony')) 
    2523  { 
    26      
    27   } 
    28   else if ($version == 'beta') 
    29   { 
    30      
    31   } 
    32   else if ($version) 
    33   { 
    34      
     24    $symfony_lib_dir = realpath(getcwd().'/lib/symfony'); 
     25    pake_remove('lib/symfony', ''); 
    3526  } 
    3627  else 
    3728  { 
    38     throw new Exception('You must provide a release version that I understand! (stable or beta or rXXX).')
     29    $symfony_lib_dir = PAKEFILE_LIB_DIR
    3930  } 
     31 
     32  if (is_link('data/symfony')) 
     33  { 
     34    $symfony_data_dir = realpath(getcwd().'/data/symfony'); 
     35    pake_remove('data/symfony', ''); 
     36  } 
     37  else 
     38  { 
     39    $symfony_data_dir = PAKEFILE_DATA_DIR; 
     40  } 
     41 
     42  $verbose = pakeApp::get_instance()->get_verbose(); 
     43  if ($verbose) echo '>> freeze    '.pakeApp::excerpt('freezing lib found in "'.$symfony_lib_dir.'"')."\n"; 
     44  if ($verbose) echo '>> freeze    '.pakeApp::excerpt('freezing data found in "'.$symfony_data_dir.'"')."\n"; 
     45 
     46  $finder = pakeFinder::type('any')->ignore_version_control(); 
     47  pake_mirror($finder, $symfony_lib_dir, 'lib/symfony'); 
     48  pake_mirror($finder, $symfony_data_dir, 'data/symfony'); 
    4049} 
    4150 
     
    4352{ 
    4453  // remove lib/symfony and data/symfony directories 
     54  if (is_link('lib/symfony')) 
     55  { 
     56    throw new Exception('You can unfreeze only if you froze the symfony libraries before.'); 
     57  } 
     58 
     59  if (!is_dir('lib/symfony') || !is_readable('lib/symfony')) 
     60  { 
     61    throw new Exception('Your lib/symfony directory does not seem to be accessible.'); 
     62  } 
     63 
     64//  $finder = pakeFinder::type('file')->prune('.svn')->discard('.svn', '.sf'); 
     65//  pake_remove($finder, ); 
    4566} 
  • trunk/package.xml.tmpl

    r1771 r1785  
    2525 <contents> 
    2626  <dir name="/"> 
    27    <file role="script" baseinstalldir="/" name="bin/symfony.sh"> 
     27   <file role="script" baseinstalldir="/" name="data/bin/symfony.sh"> 
    2828    <tasks:replace type="pear-config" from="@PHP-BIN@" to="php_bin"/> 
    2929    <tasks:replace type="pear-config" from="@BIN-DIR@" to="bin_dir"/> 
    3030    <tasks:replace type="pear-config" from="@PEAR-DIR@" to="php_dir"/> 
    3131   </file> 
    32    <file role="script" baseinstalldir="/" name="bin/symfony.bat"> 
     32   <file role="script" baseinstalldir="/" name="data/bin/symfony.bat"> 
    3333    <tasks:replace type="pear-config" from="@PHP-BIN@" to="php_bin"/> 
    3434    <tasks:replace type="pear-config" from="@BIN-DIR@" to="bin_dir"/> 
     
    3636   </file> 
    3737 
    38    <file role="php" baseinstalldir="/" install-as="symfony.php" name="bin/symfony.php"> 
     38   <file role="php" baseinstalldir="/" install-as="symfony.php" name="data/bin/symfony.php"> 
    3939    <tasks:replace type="pear-config" from="@DATA-DIR@" to="data_dir" /> 
    4040    <tasks:replace type="pear-config" from="@PEAR-DIR@" to="php_dir" />