Changeset 2057


Ignore:
Timestamp:
Aug 24, 2006, 7:28:14 PM (14 years ago)
Author:
orlov
Message:
  • Unused code is removed.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • to-imperative/trunk/rfp/rfpj.rf

    r2056 r2057  
    1818
    1919$func Compute-Deps (e.make) e.module-name = ;
    20 
    21 $func Rfile2Javafile e.filename = e.filename;
    22 $func Change-Ext s.ext1 s.ext2 e.filename = e.filename;
    23 
    24 $func? Newer ((e.file1) (e.file2)) = ;
    2520
    2621$func Run-rfpc  e.files = ;
     
    257252  <Entries &Deps> :: e.deps,
    258253  {
    259     e.keep : /*empty*/ =
    260       {
    261         e.force : v = <Map &Get-Src (e.deps)>;
    262         <Map &Get-Needed-Src ".class" (e.deps)>;
    263       } :: e.src-list,
     254    e.keep : v, e.force : /*empty*/ =
     255      <Run-rfpc <Concat <Map! &L 0 (<Map &Get-Needed-Src ".java" (e.deps)>)>>>,
     256      <Run-javac <Map &Get-Needed-Java (e.deps)>>;
     257    {
     258      e.force : v = <Map &Get-Src (e.deps)>;
     259      <Map &Get-Needed-Src ".class" (e.deps)>;
     260    } :: e.src-list,
    264261      <Concat <Map! &L 0 (e.src-list)>> :: e.rf-list,
    265262      <Concat <Map! &L 1 (e.src-list)>> :: e.java-list,
     
    270267          <Map! &PrintLN! &StdErr "      " (e.java-list)> : e;
    271268      };
    272     <Run-rfpc <Concat <Map! &L 0 (<Map &Get-Needed-Src ".java" (e.deps)>)>>>,
    273       <Run-javac <Map &Get-Needed-Java (e.deps)>>;
    274   };
    275 //  <Map! &Rfile2Javafile (e.rf-list)> :: e.java-list,
    276 //  <Map! &Change-Ext ".java" ".class" (e.java-list)> :: e.class-list,
    277 //  {
    278 //    e.force : v = <Zip (e.rf-list) (e.class-list)>;
    279 //    e.keep : v = <Filter &Newer (<Zip (e.rf-list) (e.java-list)>)>;
    280 //    <Filter &Newer (<Zip (e.rf-list) (e.class-list)>)>;
    281 //  } :: e.rf-need-rebuild,
    282 //  <Run-rfpc <Concat <Map! &L 0 (e.rf-need-rebuild)>>>,
    283 //  {
    284 //    e.keep : v =
    285 //      <Concat <Map! &L 0 (<Filter &Newer (<Zip (e.java-list) (e.class-list)>)>)>>;
    286 //    <Map! &Change-Ext ".class" ".java" (<Concat <Map! &L 1 (e.rf-need-rebuild)>>)>;
    287 //  } :: e.java-need-rebuild,
    288 //  <Run-javac e.java-need-rebuild>,
    289 //  {
    290 //    e.keep : /*empty*/ = {
    291 //      <Map! &Delete (e.java-need-rebuild)> : e;
    292 //      <PrintLN! &StdErr "rfpj: Error while deleting files:">,  // Paranoia
    293 //        <Map! &PrintLN! &StdErr "      " (e.java-list)> : e;
    294 //    };;
    295 //  };
     269  };
    296270
    297271Compute-Deps (e.make) e.module-name =
     
    341315  e = /*empty*/;
    342316};
    343 
    344 Rfile2Javafile e.filename =
    345   <? &Dir-Separator> : s.dir-sep,
    346   e.filename : {
    347     $r e.path s.dir-sep e.name ".rf" = e.path s.dir-sep <Rfp2Java <To-Word e.name>> ".java";
    348     e.name ".rf" = <Rfp2Java <To-Word e.name>> ".java";
    349   };
    350 
    351 Change-Ext s.ext1 s.ext2 e.name s.ext1 = e.name s.ext2;
    352 
    353 Newer ((e.file1) (e.file2)) =
    354   <">" (<Last-Modified e.file1>) (<Last-Modified e.file2>)>;
    355317
    356318Run-rfpc {
Note: See TracChangeset for help on using the changeset viewer.