Changeset 361:e8a37544cb99 in livinglogic.python.www

Show
Ignore:
Timestamp:
08/29/05 15:07:07 (14 years ago)
Author:
Walter Doerwald <walter@…>
Branch:
default
Message:

ll-make 1.0.

Location:
site
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • site/m.py

    r357 r361  
    2626        build = make.PhonyTarget(self, "build") 
    2727        install = make.PhonyTarget(self, "install") 
    28         clean = make.PhonyTarget(self, "clean", doc="clean the build directory", action=make.CommandAction("rm -rf %s" % (here/builddir).local())) 
    29         installclean = make.PhonyTarget(self, "installclean", doc="clean the build and install directory", action=make.CommandAction("rm -rf %s/*" % (here/installdir).local())) 
     28        clean = make.PhonyTarget(self, "clean", doc="clean the build directory", convertaction=make.CommandAction("rm -rf %s" % (here/builddir).local())) 
     29        installclean = make.PhonyTarget(self, "installclean", doc="clean the build and install directory", convertaction=make.CommandAction("rm -rf %s/*" % (here/installdir).local())) 
    3030        installclean.dependOn(clean) 
    3131 
     
    6464        readaction = make.ReadAction() 
    6565        writeaction = make.WriteAction() 
     66        selectaction = make.SelectMainAction() 
     67        importaction = make.ImportAction() 
     68        usemoduleaction = make.UseModuleAction() 
    6669        modeaction = make.ModeAction(0644) 
    6770        xistconvertaction = make.XISTConvertAction() 
     
    8184                continue 
    8285            class_ = extensions[ext] 
    83             f = class_(self, here/srcdir/id) 
    84             f2 = class_(self, here/builddir/id, action=readaction+writeaction) 
    85             f3 = class_(self, here/installdir/id, action=readaction+writeaction+modeaction) 
     86            f1 = class_(self, here/srcdir/id, readaction=readaction) 
     87            f2 = class_(self, here/builddir/id, convertaction=selectaction, writeaction=writeaction, readaction=readaction) 
     88            f3 = class_(self, here/installdir/id, convertaction=selectaction, writeaction=writeaction+modeaction, readaction=readaction) 
    8689            if aux: 
    8790                auxFiles.append(f2) 
    88             f2.dependOn(make.MainDep, f) 
     91            f2.dependOn(make.MainDep, f1) 
    8992            f3.dependOn(make.MainDep, f2) 
    9093            build.dependOn(f2) 
     
    9295 
    9396        for id in pixelfiles: 
    94             f = make.ImageTarget(self, here/xistdir/id) 
    95             f2 = make.ImageTarget(self, here/builddir/id, action=readaction+writeaction) 
    96             f3 = make.ImageTarget(self, here/installdir/id, action=readaction+writeaction+modeaction) 
     97            f1 = make.ImageTarget(self, here/xistdir/id, readaction=readaction) 
     98            f2 = make.ImageTarget(self, here/builddir/id, convertaction=selectaction, writeaction=writeaction, readaction=readaction) 
     99            f3 = make.ImageTarget(self, here/installdir/id, convertaction=selectaction, writeaction=writeaction+modeaction, readaction=readaction) 
    97100            auxFiles.append(f2) 
    98             f2.dependOn(make.MainDep, f) 
     101            f2.dependOn(make.MainDep, f1) 
    99102            f3.dependOn(make.MainDep, f2) 
    100103            build.dependOn(f2) 
     
    102105 
    103106        def makens(prefix, id): 
    104             f = make.XISTNSTarget(self, here/srcdir/id) 
    105             f2 = make.XISTNSTarget(self, here/builddir/id, prefix=prefix, action=readaction+writeaction) 
    106             f2.dependOn(make.MainDep, f) 
     107            f1 = make.XISTNSTarget(self, here/srcdir/id, readaction=readaction) 
     108            f2 = make.XISTNSTarget(self, here/builddir/id, cache=True, prefix=prefix, convertaction=selectaction+writeaction+importaction+usemoduleaction, readaction=importaction+usemoduleaction, useaction=usemoduleaction) 
     109            f2.dependOn(make.MainDep, f1) 
    107110            return f2 
    108111 
     
    113116        fopublisher = publishers.Publisher(prefixes=xsc.Prefixes(fo=fo, doc=doc, specials=specials), prefixmode=2, encoding="utf-8", xhtml=2) 
    114117 
    115         mod_core = make.PythonTarget(self, here/pythonrootdir/"__init__.py") 
    116         mod_xist = make.PythonTarget(self, here/pythonrootdir/"xist/__init__.py") 
    117         mod_xist_xsc = make.PythonTarget(self, here/pythonrootdir/"xist/xsc.py") 
    118         mod_xist_ns = make.PythonTarget(self, here/pythonrootdir/"xist/ns/__init__.py") 
    119         mod_xist_ns_html = make.PythonTarget(self, here/pythonrootdir/"xist/ns/html.py") 
    120         mod_xist_ns_xml = make.PythonTarget(self, here/pythonrootdir/"xist/ns/xml.py") 
    121         mod_xist_ns_wml = make.PythonTarget(self, here/pythonrootdir/"xist/ns/wml.py") 
    122         mod_xist_ns_ihtml = make.PythonTarget(self, here/pythonrootdir/"xist/ns/ihtml.py") 
    123         mod_xist_ns_docbook = make.PythonTarget(self, here/pythonrootdir/"xist/ns/docbook.py") 
    124         mod_xist_ns_abbr = make.PythonTarget(self, here/pythonrootdir/"xist/ns/abbr.py") 
    125         mod_xist_ns_cond = make.PythonTarget(self, here/pythonrootdir/"xist/ns/cond.py") 
    126         mod_xist_ns_form = make.PythonTarget(self, here/pythonrootdir/"xist/ns/form.py") 
    127         mod_xist_ns_php = make.PythonTarget(self, here/pythonrootdir/"xist/ns/php.py") 
    128         mod_xist_ns_jsp = make.PythonTarget(self, here/pythonrootdir/"xist/ns/jsp.py") 
    129         mod_xist_ns_meta = make.PythonTarget(self, here/pythonrootdir/"xist/ns/meta.py") 
    130         mod_xist_ns_ruby = make.PythonTarget(self, here/pythonrootdir/"xist/ns/ruby.py") 
    131         mod_xist_ns_specials = make.PythonTarget(self, here/pythonrootdir/"xist/ns/specials.py") 
    132         mod_xist_ns_htmlspecials = make.PythonTarget(self, here/pythonrootdir/"xist/ns/htmlspecials.py") 
    133         mod_xist_ns_strutshtml = make.PythonTarget(self, here/pythonrootdir/"xist/ns/struts_html.py") 
    134         mod_xist_ns_strutsconfig = make.PythonTarget(self, here/pythonrootdir/"xist/ns/struts_config.py") 
    135         mod_xist_ns_doc = make.PythonTarget(self, here/pythonrootdir/"xist/ns/doc.py") 
    136         mod_xist_ns_text = make.PythonTarget(self, here/pythonrootdir/"xist/ns/text.py") 
    137         mod_xist_parsers = make.PythonTarget(self, here/pythonrootdir/"xist/parsers.py") 
    138         mod_xist_converters = make.PythonTarget(self, here/pythonrootdir/"xist/converters.py") 
    139         mod_xist_presenters = make.PythonTarget(self, here/pythonrootdir/"xist/presenters.py") 
    140         mod_xist_publishers = make.PythonTarget(self, here/pythonrootdir/"xist/publishers.py") 
    141         mod_xist_sims = make.PythonTarget(self, here/pythonrootdir/"xist/sims.py") 
    142         mod_xist_xfind = make.PythonTarget(self, here/pythonrootdir/"xist/xfind.py") 
    143         mod_url = make.PythonTarget(self, here/pythonrootdir/"url.py") 
    144         mod_make = make.PythonTarget(self, here/pythonrootdir/"make.py") 
    145         mod_sisyphus = make.PythonTarget(self, here/pythonrootdir/"sisyphus.py") 
    146         mod_ansistyle = make.PythonTarget(self, here/pythonrootdir/"ansistyle.py") 
    147         mod_toxic = make.PythonTarget(self, here/pythonrootdir/"toxic.py") 
    148         mod_sql = make.PythonTarget(self, here/pythonrootdir/"sql.py") 
    149         mod_orasql = make.PythonTarget(self, here/pythonrootdir/"orasql.py") 
    150         mod_color = make.PythonTarget(self, here/pythonrootdir/"color.py") 
    151         mod_xpit = make.PythonTarget(self, here/pythonrootdir/"xpit.py") 
     118        mod_core = make.PythonTarget(self, here/pythonrootdir/"__init__.py", readaction=readaction) 
     119        mod_xist = make.PythonTarget(self, here/pythonrootdir/"xist/__init__.py", readaction=readaction) 
     120        mod_xist_xsc = make.PythonTarget(self, here/pythonrootdir/"xist/xsc.py", readaction=readaction) 
     121        mod_xist_ns = make.PythonTarget(self, here/pythonrootdir/"xist/ns/__init__.py", readaction=readaction) 
     122        mod_xist_ns_html = make.PythonTarget(self, here/pythonrootdir/"xist/ns/html.py", readaction=readaction) 
     123        mod_xist_ns_xml = make.PythonTarget(self, here/pythonrootdir/"xist/ns/xml.py", readaction=readaction) 
     124        mod_xist_ns_wml = make.PythonTarget(self, here/pythonrootdir/"xist/ns/wml.py", readaction=readaction) 
     125        mod_xist_ns_ihtml = make.PythonTarget(self, here/pythonrootdir/"xist/ns/ihtml.py", readaction=readaction) 
     126        mod_xist_ns_docbook = make.PythonTarget(self, here/pythonrootdir/"xist/ns/docbook.py", readaction=readaction) 
     127        mod_xist_ns_abbr = make.PythonTarget(self, here/pythonrootdir/"xist/ns/abbr.py", readaction=readaction) 
     128        mod_xist_ns_cond = make.PythonTarget(self, here/pythonrootdir/"xist/ns/cond.py", readaction=readaction) 
     129        mod_xist_ns_form = make.PythonTarget(self, here/pythonrootdir/"xist/ns/form.py", readaction=readaction) 
     130        mod_xist_ns_php = make.PythonTarget(self, here/pythonrootdir/"xist/ns/php.py", readaction=readaction) 
     131        mod_xist_ns_jsp = make.PythonTarget(self, here/pythonrootdir/"xist/ns/jsp.py", readaction=readaction) 
     132        mod_xist_ns_meta = make.PythonTarget(self, here/pythonrootdir/"xist/ns/meta.py", readaction=readaction) 
     133        mod_xist_ns_ruby = make.PythonTarget(self, here/pythonrootdir/"xist/ns/ruby.py", readaction=readaction) 
     134        mod_xist_ns_specials = make.PythonTarget(self, here/pythonrootdir/"xist/ns/specials.py", readaction=readaction) 
     135        mod_xist_ns_htmlspecials = make.PythonTarget(self, here/pythonrootdir/"xist/ns/htmlspecials.py", readaction=readaction) 
     136        mod_xist_ns_strutshtml = make.PythonTarget(self, here/pythonrootdir/"xist/ns/struts_html.py", readaction=readaction) 
     137        mod_xist_ns_strutsconfig = make.PythonTarget(self, here/pythonrootdir/"xist/ns/struts_config.py", readaction=readaction) 
     138        mod_xist_ns_doc = make.PythonTarget(self, here/pythonrootdir/"xist/ns/doc.py", readaction=readaction) 
     139        mod_xist_ns_text = make.PythonTarget(self, here/pythonrootdir/"xist/ns/text.py", readaction=readaction) 
     140        mod_xist_parsers = make.PythonTarget(self, here/pythonrootdir/"xist/parsers.py", readaction=readaction) 
     141        mod_xist_converters = make.PythonTarget(self, here/pythonrootdir/"xist/converters.py", readaction=readaction) 
     142        mod_xist_presenters = make.PythonTarget(self, here/pythonrootdir/"xist/presenters.py", readaction=readaction) 
     143        mod_xist_publishers = make.PythonTarget(self, here/pythonrootdir/"xist/publishers.py", readaction=readaction) 
     144        mod_xist_sims = make.PythonTarget(self, here/pythonrootdir/"xist/sims.py", readaction=readaction) 
     145        mod_xist_xfind = make.PythonTarget(self, here/pythonrootdir/"xist/xfind.py", readaction=readaction) 
     146        mod_url = make.PythonTarget(self, here/pythonrootdir/"url.py", readaction=readaction) 
     147        mod_make = make.PythonTarget(self, here/pythonrootdir/"make.py", readaction=readaction) 
     148        mod_sisyphus = make.PythonTarget(self, here/pythonrootdir/"sisyphus.py", readaction=readaction) 
     149        mod_ansistyle = make.PythonTarget(self, here/pythonrootdir/"ansistyle.py", readaction=readaction) 
     150        mod_toxic = make.PythonTarget(self, here/pythonrootdir/"toxic.py", readaction=readaction) 
     151        mod_sql = make.PythonTarget(self, here/pythonrootdir/"sql.py", readaction=readaction) 
     152        mod_orasql = make.PythonTarget(self, here/pythonrootdir/"orasql.py", readaction=readaction) 
     153        mod_color = make.PythonTarget(self, here/pythonrootdir/"color.py", readaction=readaction) 
     154        mod_xpit = make.PythonTarget(self, here/pythonrootdir/"xpit.py", readaction=readaction) 
    152155 
    153156        for id in files: 
     
    156159                newid = id.withExt(ext[:-3]) 
    157160                parser = xmlparser 
    158                 f = make.XISTTarget(self, here/srcdir/id) 
     161                f = make.XISTTarget(self, here/srcdir/id, readaction=readaction) 
    159162                f2 = make.XISTTarget( 
    160163                    self, 
    161164                    here/builddir/newid, 
    162                     action= 
    163                         readaction+ 
     165                    convertaction= 
     166                        selectaction+ 
    164167                        make.XISTParseAction(parser, root/newid)+ 
    165168                        xistconvertaction+ 
    166                         make.XISTPublishAction(publisher, root/newid)+ 
    167                         writeaction 
     169                        make.XISTPublishAction(publisher, root/newid), 
     170                    writeaction=writeaction, 
     171                    readaction=readaction, 
    168172                ) 
    169                 f3 = make.XISTTarget(self, here/installdir/newid, action=readaction+writeaction+modeaction) 
     173                f3 = make.XISTTarget(self, here/installdir/newid, convertaction=selectaction, writeaction=writeaction+modeaction, readaction=readaction) 
    170174                f2.dependOn(make.MainDep, f) 
    171175                f2.dependOn(pyns, *auxFiles) 
     
    177181                # Source version of the page 
    178182                pagesrcid = id 
    179                 f2 = make.XISTTarget(self, here/builddir/pagesrcid, action=readaction+writeaction) 
    180                 f3 = make.XISTTarget(self, here/installdir/pagesrcid, action=readaction+writeaction+modeaction) 
     183                f2 = make.XISTTarget(self, here/builddir/pagesrcid, convertaction=selectaction, writeaction=writeaction, readaction=readaction) 
     184                f3 = make.XISTTarget(self, here/installdir/pagesrcid, convertaction=selectaction, writeaction=writeaction+modeaction, readaction=readaction) 
    181185                f2.dependOn(make.MainDep, f) 
    182186                f3.dependOn(make.MainDep, f2) 
     
    189193                    self, 
    190194                    here/builddir/txtid, 
    191                     action= 
    192                         readaction+ 
     195                    convertaction= 
     196                        selectaction+ 
    193197                        make.XISTParseAction(parser, root/txtid)+ 
    194198                        xistconverttextaction+ 
    195                         xisttextaction+ 
    196                         writeaction 
     199                        xisttextaction, 
     200                    writeaction=writeaction, 
     201                    readaction=readaction, 
    197202                ) 
    198203                t2.dependOn(make.MainDep, f) 
     
    200205     
    201206                build.dependOn(t2) 
    202                 t3 = make.XISTTarget(self, here/installdir/txtid, action=readaction+writeaction+modeaction) 
     207                t3 = make.XISTTarget(self, here/installdir/txtid, convertaction=selectaction, writeaction=writeaction+modeaction, readaction=readaction) 
    203208                t3.dependOn(make.MainDep, t2) 
    204209                install.dependOn(t3) 
     
    209214                    self, 
    210215                    here/builddir/foid, 
    211                     action= 
    212                         readaction+ 
     216                    convertaction= 
     217                        selectaction+ 
    213218                        make.XISTParseAction(parser, root/foid)+ 
    214219                        foaction+ 
    215220                        xistconvertfoaction+ 
    216                         make.XISTPublishAction(fopublisher, root/foid)+ 
    217                         writeaction 
     221                        make.XISTPublishAction(fopublisher, root/foid), 
     222                    writeaction=writeaction, 
     223                    readaction=readaction, 
    218224                ) 
    219225                fot2.dependOn(make.MainDep, f) 
     
    221227 
    222228                build.dependOn(fot2) 
    223                 fot3 = make.XISTTarget(self, here/installdir/foid, action=readaction+writeaction+modeaction) 
     229                fot3 = make.XISTTarget(self, here/installdir/foid, convertaction=selectaction, writeaction=writeaction+modeaction, readaction=readaction) 
    224230                fot3.dependOn(make.MainDep, fot2) 
    225231                install.dependOn(fot3) 
     
    230236                    self, 
    231237                    here/builddir/pdfid, 
    232                     action= 
    233                         readaction+ 
    234                         fopaction+ 
    235                         writeaction 
     238                    convertaction=selectaction+fopaction, 
     239                    writeaction=writeaction, 
     240                    readaction=readaction, 
    236241                ) 
    237242                t2.dependOn(make.MainDep, fot2) 
    238243 
    239244                build.dependOn(t2) 
    240                 t3 = make.PDFTarget(self, here/installdir/pdfid, action=readaction+writeaction+modeaction) 
     245                t3 = make.PDFTarget(self, here/installdir/pdfid, convertaction=selectaction, writeaction=writeaction+modeaction, readaction=readaction) 
    241246                t3.dependOn(make.MainDep, t2) 
    242247                install.dependOn(t3) 
     
    275280 
    276281        for (target, source) in params: 
    277             source = make.XMLTarget(self, here/repositorydir/source) 
     282            source = make.XMLTarget(self, here/repositorydir/source) # no actions 
    278283            for ext in ("html", "fo", "txt"): 
    279284                p[here/builddir/(target+"." + ext)].dependOn(source) 
     
    324329                f.dependOn(*mods) 
    325330 
    326             f2 = make.PythonTarget(self, here/builddir/(base + "index_module.py"), action=readaction+writeaction) 
     331            f2 = make.PythonTarget(self, here/builddir/(base + "index_module.py"), convertaction=selectaction, writeaction=writeaction, readaction=readaction) 
    327332            f2.dependOn(make.MainDep, mods[0]) 
    328333            build.dependOn(f2) 
    329             f3 = make.PythonTarget(self, here/installdir/(base + "index_module.py"), action=readaction+writeaction+modeaction) 
     334            f3 = make.PythonTarget(self, here/installdir/(base + "index_module.py"), convertaction=selectaction, writeaction=writeaction+modeaction, readaction=readaction) 
    330335            f3.dependOn(make.MainDep, f2) 
    331336            install.dependOn(f3) 
  • site/make/Download.htmlxsc

    r357 r361  
    66or choose one of the following archives:</par> 
    77<py:alldownloads> 
     8<py:downloads version="1.0" date="09/29/2005"> 
     9<py:download href="make/ll-make-1.0.win32.exe" /> 
     10<py:download href="make/ll-make-1.0-1.noarch.rpm" /> 
     11<py:download href="make/ll-make-1.0-1.src.rpm" /> 
     12<py:download href="make/ll-make-1.0.zip" /> 
     13<py:download href="make/ll-make-1.0.tar.bz2" /> 
     14<py:download href="make/ll-make-1.0.tar.gz" /> 
     15</py:downloads> 
    816<py:downloads version="0.26" date="07/29/2005"> 
    917<py:download href="make/ll-make-0.26.win32.exe" />