Changeset 120

Show
Ignore:
Timestamp:
03/22/06 22:35:29 (3 years ago)
Author:
laurentj
Message:

Fix Bug #6566 : mauvais chemin généré lors de createapp

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lib/jelix-scripts/includes/utils.lib.php

    r37 r120  
    101101    } 
    102102    if(strtolower($os) == 'win') 
    103         return "\\"
     103        return array("\\","![/\\]!")
    104104    else 
    105        return '/'
     105       return array('/','!/!')
    106106} 
    107107 
    108108 
    109109function jxs_getRelativePath($path, $targetPath){ 
    110     $sep = jxs_getPathSeparator(); 
     110    list($sep, $cut) = jxs_getPathSeparator(); 
    111111 
    112     $path = explode($sep,$path); 
    113     $targetPath = explode($sep,$targetPath); 
     112    $path = preg_split($cut,$path); 
     113    $targetPath = preg_split($cut,$targetPath); 
    114114 
    115115    $dir=''; 
  • trunk/lib/jelix-scripts/scripts.conf.php

    r37 r120  
    1919define ('JELIXS_APPTPL_LOG_PATH'    , JELIXS_APPS_BASEPATH."/$APPNAME/var/log/"); 
    2020define ('JELIXS_APPTPL_CONFIG_PATH' , JELIXS_APPS_BASEPATH."/$APPNAME/var/config/"); 
    21 define ('JELIXS_INIT_PATH'          , '../jelix/init.php'); 
     21define ('JELIXS_INIT_PATH'          , JELIXS_APPS_BASEPATH.'/lib/jelix/init.php'); 
    2222 
    2323/* example for a linux package : 
Download in other formats: Unified Diff Zip Archive