Changeset 1e9c5147e15179de3d7a71bbea41fe4e7ee15ab2

Show
Ignore:
Timestamp:
06/12/05 17:49:16 (3 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1133887756 +0000
git-parent:

[8e326efee247a541a84f5f81e3d72597fde19e18]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1133887756 +0000
Message:

Attempt to fix make distcheck

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • toolbox

    r96537a3 r1e9c514  
    77## 
    88##  Authors: Samuel Hocevar <sam@zoy.org> 
    9 ##           R� Denis-Courmont <rem # videolan.org> 
     9##           Rémi Denis-Courmont <rem # videolan.org> 
    1010 
    1111### 
    …… 
    180180    printf "." 
    181181    #  Top of the project file 
    182     perl -pe 'if(/�SOURCES�/){last;}' < ${target}.in > ${target} 
     182    perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target} 
    183183    #  The source files 
    184184    for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"` 
    …… 
    277277    done 
    278278    #  The headers 
    279     perl -e 'while(<>){if(/�SOURCES�/){last;}}while(<>){if(/�HEADERS�/){last;}print $_}' < ${target}.in >> ${target} 
     279    perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target} 
    280280    for file in ${LIBVLC_HEADERS} 
    281281    do 
    …… 
    300300# End Group${M} 
    301301EOF 
    302     perl -e 'while(<>){if(/�HEADERS�/){last;}}while(<>){print $_}' < ${target}.in >> ${target} 
     302    perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} 
    303303  done 
    304304 
    …… 
    321321        target="${msdir}/plugin_${mod}.${suf}" 
    322322        printf "." 
    323         perl -pe 'if(/�SOURCES�/){last;} s/�PLUGIN�/'${mod}'/g' < ${source} > ${target} 
     323        perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target} 
    324324        for cfile in ${cfiles} 
    325325        do 
    …… 
    338338        done 
    339339        # sed is really nicer for this... unfortunately it's broken under cygwin 
    340         # sed -ne '1,/�SOURCES�/d; /�HEADERS�/,$d; p' < ${source} >> ${target} 
    341         perl -e 'while(<>){if(/�SOURCES�/){last;}}while(<>){if(/�HEADERS�/){last;}print $_}' < ${source} >> ${target} 
     340        # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target} 
     341        perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target} 
    342342        for hfile in ${hfiles} 
    343343        do 
    …… 
    348348EOF 
    349349        done 
    350         # sed -ne '1,/�HEADERS�/d; p' < ${source} >> ${target} 
    351         perl -e 'while(<>){if(/�HEADERS�/){last;}}while(<>){print $_}' < ${source} >> ${target} 
     350        # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target} 
     351        perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target} 
    352352      done 
    353353    done 
    …… 
    359359    printf "." 
    360360    #  Top of the project file 
    361     perl -pe 'if(/�SOURCES�/){last;}' < ${target}.in > ${target} 
     361    perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target} 
    362362    #  The source files 
    363363      cat >> ${target} << EOF 
    …… 
    367367EOF 
    368368    #  Bottom of the project file - handles resource files too 
    369     perl -e 'while(<>){if(/�SOURCES�/){last;}}while(<>){print $_}' < ${target}.in >> ${target} 
     369    perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} 
    370370  done 
    371371 
    …… 
    417417  #  Top of the project file 
    418418  guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'` 
    419   perl -pe 'if(/�SOURCES�/){last;} s/�GUID�/'${guid}'/g' < ${target}.in > ${target} 
     419  perl -pe 'if(/§SOURCES§/){last;} s/§GUID§/'${guid}'/g' < ${target}.in > ${target} 
    420420  #  The source files 
    421421  cat >> ${target} << EOF 
    …… 
    423423EOF 
    424424  #  Bottom of the project file - handles resource files too 
    425   perl -e 'while(<>){if(/�SOURCES�/){last;}}while(<>){print $_}' < ${target}.in >> ${target} 
     425  perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} 
    426426   
    427427  # libvlc files 
    …… 
    430430  #  Top of the project file 
    431431  guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'` 
    432   perl -pe 'if(/�SOURCES�/){last;} s/�GUID�/'${guid}'/g' < ${target}.in > ${target} 
     432  perl -pe 'if(/§SOURCES§/){last;} s/§GUID§/'${guid}'/g' < ${target}.in > ${target} 
    433433  #  The source files 
    434434  for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"` 
    …… 
    465465  done 
    466466  #  The headers 
    467   perl -e 'while(<>){if(/�SOURCES�/){last;}}while(<>){if(/�HEADERS�/){last;}print $_}' < ${target}.in >> ${target} 
     467  perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target} 
    468468  for file in ${LIBVLC_HEADERS} 
    469469  do 
    …… 
    484484</Filter>${M} 
    485485EOF 
    486   perl -e 'while(<>){if(/�HEADERS�/){last;}}while(<>){print $_}' < ${target}.in >> ${target} 
     486  perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} 
    487487 
    488488  # plugins files 
    …… 
    504504        printf "." 
    505505    guid=`perl -e 'sub r {return sprintf("%X", int rand(65536))} print r.r."-".r."-".r."-".r."-".r.r.r'` 
    506         perl -pe 'if(/�SOURCES�/){last;} s/�PLUGIN�/'${mod}'/g' < ${source} | sed 's,�GUID�,'${guid}',' > ${target} 
     506        perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} | sed 's,§GUID§,'${guid}',' > ${target} 
    507507        for cfile in ${cfiles} 
    508508        do 
    …… 
    512512        done 
    513513        # sed is really nicer for this... unfortunately it's broken under cygwin 
    514         # sed -ne '1,/�SOURCES�/d; /�HEADERS�/,$d; p' < ${source} >> ${target} 
    515         perl -e 'while(<>){if(/�SOURCES�/){last;}}while(<>){if(/�HEADERS�/){last;}print $_}' < ${source} >> ${target} 
     514        # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target} 
     515        perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target} 
    516516        for hfile in ${hfiles} 
    517517        do 
    …… 
    520520EOF 
    521521        done 
    522         # sed -ne '1,/�HEADERS�/d; p' < ${source} >> ${target} 
    523         perl -e 'while(<>){if(/�HEADERS�/){last;}}while(<>){print $_}' < ${source} >> ${target} 
     522        # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target} 
     523        perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target} 
    524524      done 
    525525    done 
    …… 
    558558  file="${builddir}/src/misc/modules_builtin.h" 
    559559 
    560   rm -f ${file}.tmp && cp ${srcdir}/src/misc/modules_builtin.h.in ${file}.tmp 
     560  rm -f "${file}.tmp" 
     561  cat "${srcdir}/src/misc/modules_builtin.h.in" > "${file}.tmp" || exit 1 
    561562  if test -n "${BUILTINS}" 
    562563  then 
    563564    for i in `echo ${BUILTINS}` 
    564565    do 
    565       echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >>${file}.tmp 
     566      echo "int vlc_entry__`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`( module_t* );" >> "${file}.tmp" 
    566567    done 
    567     echo "" >> ${file}.tmp 
     568    echo "" >> "${file}.tmp" 
    568569  fi 
    569570  echo "#define ALLOCATE_ALL_BUILTINS() \\" >> ${file}.tmp 
    570   echo "    do \\" >> ${file}.tmp 
    571   echo "    { \\" >> ${file}.tmp 
     571  echo "    do \\" >> "${file}.tmp" 
     572  echo "    { \\" >> "${file}.tmp" 
    572573  if test -n "${BUILTINS}" 
    573574  then 
    574575    for i in `echo ${BUILTINS}` 
    575576    do 
    576       echo "        ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> ${file}.tmp 
     577      echo "        ALLOCATE_BUILTIN(`echo $i | sed -e 'y@/@_@' -e 's@\..*@@'`); \\" >> "${file}.tmp" 
    577578    done 
    578579  fi 
    579   echo "    } while( 0 );" >> ${file}.tmp 
    580   echo "" >> ${file}.tmp 
    581   if diff >/dev/null 2>&1 ${file} ${file}.tmp 
     580  echo "    } while( 0 );" >> "${file}.tmp" 
     581  echo "" >> "${file}.tmp" || exit 1 
     582  if diff >/dev/null 2>&1 "${file}" "${file}.tmp" 
    582583  then 
    583     rm -f ${file}.tmp 
     584    rm -f "${file}.tmp" 
    584585  else 
    585586    echo "creating new ${file}" 
    586     mv -f ${file}.tmp ${file} 
     587    mv -f "${file}.tmp" "${file}" 
    587588  fi 
    588589