Changeset 611:36b6d56e6837 in livinglogic.python.www

Show
Ignore:
Timestamp:
09/10/09 13:46:25 (10 years ago)
Author:
Walter Doerwald <walter@…>
Branch:
default
Message:

ll-xist 3.7.

Location:
site
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • site/Download.htmlxsc

    r610 r611  
    99or choose one of the following archives:</p> 
    1010<py:downloads name="xist"> 
     11<py:download version="3.7" date="09/10/2009"/> 
    1112<py:download version="3.6.6" date="07/09/2009"/> 
    1213<py:download version="3.6.5" date="06/02/2009"/> 
  • site/m.py

    r587 r611  
    77 
    88 
    9 class XISTFOAction(make.PipeAction): 
     9class XISTFOAction(make.TransformAction): 
    1010    def execute(self, project, data): 
    1111        project.writestep("Wrapping input in fodoc") 
     
    1313 
    1414 
    15 class ExtractContentAction(make.PipeAction): 
     15class ExtractContentAction(make.TransformAction): 
    1616    def execute(self, project, data): 
    1717        project.writestep("Extracting content") 
    18         return data.walknode(css.selector("td.content"))[0].content 
     18        return data.walknode(css.selector("div.content"))[0].content 
    1919 
    2020 
     
    3434        install = self.add(make.PhonyAction(), "install") 
    3535        clean = self.add( 
    36             make.PhonyAction("clean the build directory").addinputs( 
    37                 make.alwaysaction / make.CommandAction("rm -rf %s" % (here/builddir).local()) 
     36            make.PhonyAction( 
     37                make.CommandAction("rm -rf %s" % builddir.local(), make.alwaysaction), 
     38                doc="clean the build directory", 
    3839            ), 
    3940            "clean" 
     
    4142 
    4243        installclean = self.add( 
    43             make.PhonyAction("clean the build and install directory").addinputs( 
    44                 make.alwaysaction / make.CommandAction("rm -rf %s/*" % (here/installdir).local()), 
    45                 clean 
     44            make.PhonyAction( 
     45                make.CommandAction("rm -rf %s*" % installdir.local(), clean), 
     46                doc="clean the build and install directory", 
    4647            ), 
    4748            "installclean" 
     
    5354        pixelfiles = [ file for file in xistdir.walkfiles() if str(file).startswith("px/") and file.ext=="gif" ] 
    5455 
    55         copyextensions = {"gif": True, "jpg": True, "css": False, "js": False} 
     56        copyextensions = {"gif": True, "jpg": True, "png": True, "css": False, "js": False} 
    5657        auxFiles = [] 
    5758        for id in files: 
     
    6162            except KeyError: 
    6263                continue 
    63             f1 = self.add(make.FileAction(key=here/srcdir/id)) 
    64             f2 = self.add(f1 / make.FileAction(key=here/builddir/id)) 
    65             f3 = self.add(f2 / make.FileAction(key=here/installdir/id) / make.ModeAction(mode=0644)) 
     64            f1 = self.add(make.FileAction(srcdir/id)) 
     65            f2 = self.add(make.FileAction(builddir/id, f1)) 
     66            f3 = self.add(make.FileAction(installdir/id, f2).chmod(0644)) 
    6667            if aux: 
    6768                auxFiles.append(f2) 
     
    7071 
    7172        for id in pixelfiles: 
    72             f1 = self.add(make.FileAction(key=here/xistdir/id)) 
    73             f2 = self.add(make.FileAction(input=f1, key=here/builddir/id)) 
    74             f3 = self.add(make.ModeAction(input=make.FileAction(input=f2, key=here/installdir/id), mode=0644)) 
     73            f1 = self.add(make.FileAction(xistdir/id)) 
     74            f2 = self.add(make.FileAction(builddir/id, f1)) 
     75            f3 = self.add(make.FileAction(installdir/id, f2).chmod(0644)) 
    7576            auxFiles.append(f2) 
    7677            build.addinputs(f2) 
     
    8687 
    8788        # These are not the real installed modules, but their source 
    88         file_core = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.core/src/ll/__init__.py")) 
    89         file_xist = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/__init__.py")) 
    90         file_xist_xsc = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/xsc.py")) 
    91         file_xist_ns = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/__init__.py")) 
    92         file_xist_ns_html = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/html.py")) 
    93         file_xist_ns_xml = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/xml.py")) 
    94         file_xist_ns_wml = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/wml.py")) 
    95         file_xist_ns_ihtml = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/ihtml.py")) 
    96         file_xist_ns_docbook = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/docbook.py")) 
    97         file_xist_ns_abbr = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/abbr.py")) 
    98         file_xist_ns_cond = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/cond.py")) 
    99         file_xist_ns_form = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/form.py")) 
    100         file_xist_ns_php = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/php.py")) 
    101         file_xist_ns_jsp = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/jsp.py")) 
    102         file_xist_ns_meta = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/meta.py")) 
    103         file_xist_ns_ruby = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/ruby.py")) 
    104         file_xist_ns_specials = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/specials.py")) 
    105         file_xist_ns_htmlspecials = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/htmlspecials.py")) 
    106         file_xist_ns_strutshtml = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/struts_html.py")) 
    107         file_xist_ns_strutsconfig = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/struts_config.py")) 
    108         file_xist_ns_doc = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/doc.py")) 
    109         file_xist_ns_rng = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/rng.py")) 
    110         file_xist_ns_kid = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/kid.py")) 
    111         file_xist_ns_detox = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/detox.py")) 
    112         file_xist_ns_toxic = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/toxic.py")) 
    113         file_xist_parsers = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/parsers.py")) 
    114         file_xist_converters = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/converters.py")) 
    115         file_xist_presenters = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/presenters.py")) 
    116         file_xist_publishers = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/publishers.py")) 
    117         file_xist_sims = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/sims.py")) 
    118         file_xist_xfind = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/xfind.py")) 
    119         file_xist_css = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/css.py")) 
    120         file_misc = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/misc.py")) 
    121         file_url = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/url.py")) 
    122         file_ul4 = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/ul4c.py")) 
    123         file_make = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/make.py")) 
    124         file_sisyphus = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/sisyphus.py")) 
    125         file_daemon = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/daemon.py")) 
    126         file_color = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/color.py")) 
    127         file_orasql = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.orasql/src/ll/orasql/__init__.py")) 
    128         file_nightshade = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.nightshade/src/ll/nightshade.py")) 
    129         file_pycoco = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.pycoco/src/pycoco/__init__.py")) 
     89        file_core = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.core/src/ll/__init__.py")) 
     90        file_xist = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/__init__.py")) 
     91        file_xist_xsc = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/xsc.py")) 
     92        file_xist_ns = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/__init__.py")) 
     93        file_xist_ns_html = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/html.py")) 
     94        file_xist_ns_xml = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/xml.py")) 
     95        file_xist_ns_wml = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/wml.py")) 
     96        file_xist_ns_ihtml = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/ihtml.py")) 
     97        file_xist_ns_docbook = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/docbook.py")) 
     98        file_xist_ns_abbr = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/abbr.py")) 
     99        file_xist_ns_cond = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/cond.py")) 
     100        file_xist_ns_form = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/form.py")) 
     101        file_xist_ns_php = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/php.py")) 
     102        file_xist_ns_jsp = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/jsp.py")) 
     103        file_xist_ns_meta = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/meta.py")) 
     104        file_xist_ns_ruby = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/ruby.py")) 
     105        file_xist_ns_specials = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/specials.py")) 
     106        file_xist_ns_htmlspecials = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/htmlspecials.py")) 
     107        file_xist_ns_strutshtml = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/struts_html.py")) 
     108        file_xist_ns_strutsconfig = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/struts_config.py")) 
     109        file_xist_ns_doc = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/doc.py")) 
     110        file_xist_ns_rng = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/rng.py")) 
     111        file_xist_ns_kid = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/kid.py")) 
     112        file_xist_ns_detox = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/detox.py")) 
     113        file_xist_ns_toxic = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/toxic.py")) 
     114        file_xist_parsers = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/parsers.py")) 
     115        file_xist_converters = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/converters.py")) 
     116        file_xist_presenters = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/presenters.py")) 
     117        file_xist_publishers = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/publishers.py")) 
     118        file_xist_sims = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/sims.py")) 
     119        file_xist_xfind = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/xfind.py")) 
     120        file_xist_css = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/css.py")) 
     121        file_misc = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/misc.py")) 
     122        file_url = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/url.py")) 
     123        file_ul4 = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/ul4c.py")) 
     124        file_make = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/make.py")) 
     125        file_sisyphus = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/sisyphus.py")) 
     126        file_daemon = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/daemon.py")) 
     127        file_color = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/color.py")) 
     128        file_orasql = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/orasql/__init__.py")) 
     129        file_nightshade = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.nightshade/src/ll/nightshade.py")) 
     130        file_pycoco = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.pycoco/src/pycoco/__init__.py")) 
    130131 
    131132        # Data for Additional dependencies (News & Install) 
     
    201202 
    202203        def makens(id): 
    203             f1 = self.add(make.FileAction(key=here/srcdir/id)) 
    204             buildid = here/builddir/id 
    205             f2 = self.add(f1 / make.FileAction(key=buildid) / make.ModuleAction(), buildid) 
     204            f1 = self.add(make.FileAction(srcdir/id)) 
     205            buildid = builddir/id 
     206            f2 = make.FileAction(buildid, f1) 
     207            f2 = make.ModuleAction(f2) 
    206208            return f2 
    207209 
    208         pynspool = make.XISTPoolAction( 
    209             makens("Python_xmlns.py"), 
    210         ) 
     210        pynspool = make.CallAction(xsc.Pool, makens("Python_xmlns.py")) 
    211211 
    212212        for id in files: 
     
    217217                path = str(id.withoutext().path) 
    218218 
    219                 f = self.add(make.FileAction(key=here/srcdir/id)) 
    220  
    221                 collect = make.CollectAction() 
     219                f = self.add(make.FileAction(srcdir/id)) 
     220 
     221                collect = make.CollectAction(f) 
    222222                collect.addinputs(*auxFiles) 
    223223 
    224224                if path in docdeps: 
    225                     docxml = self.add(make.FileAction(key=here/repositorydir/docdeps[path])) 
     225                    docxml = self.add(make.FileAction(repositorydir/docdeps[path])) 
    226226                    collect.addinputs(docxml) 
    227227                if path in moddeps: 
    228228                    mods = moddeps[path] 
    229229                    collect.addinputs(*mods) 
    230                     mod2 = self.add(mods[0] / make.FileAction(key=here/builddir/(path + "_module.py"))) 
    231                     mod3 = self.add(mod2 / make.FileAction(key=here/installdir/(path + "_module.py")) / make.ModeAction(mode=0644)) 
     230                    mod2 = self.add(make.FileAction(builddir/(path + "_module.py"), mods[0])) 
     231                    mod3 = self.add(make.FileAction(installdir/(path + "_module.py"), mod2).chmod(0644)) 
    232232                    build.addinputs(mod2) 
    233233                    install.addinputs(mod3) 
    234234 
    235                 f2 = self.add( 
    236                     f / 
    237                     collect / 
    238                     make.XISTParseAction(builder=xmlbuilder, pool=pynspool, base=root/newid) / 
    239                     make.XISTConvertAction() / 
    240                     make.XISTBytesAction(publisher=publisher, base=root/newid) / 
    241                     make.FileAction(key=here/builddir/newid) 
    242                 ) 
    243                 f3 = self.add(f2 / make.FileAction(key=here/installdir/newid)) 
     235                f2 = make.XISTParseAction(input=collect, builder=xmlbuilder, pool=pynspool, base=root/newid).callattr("conv").callattr("bytes", base=root/newid, publisher=publisher) 
     236                f2 = make.FileAction(builddir/newid, f2) 
     237                f3 = self.add(make.FileAction(installdir/newid, f2)) 
    244238                build.addinputs(f2) 
    245239                install.addinputs(f3) 
     
    248242                # Source version of the page 
    249243                pagesrcid = id 
    250                 f2 = self.add(f / make.FileAction(key=here/builddir/pagesrcid)) 
    251                 f3 = self.add(f2 / make.FileAction(key=here/installdir/pagesrcid) / make.ModeAction(mode=0644)) 
     244                f2 = self.add(make.FileAction(builddir/pagesrcid, f)) 
     245                f3 = self.add(make.FileAction(installdir/pagesrcid, f2).chmod(0644)) 
    252246                build.addinputs(f2) 
    253247                install.addinputs(f3) 
    254248 
    255249                # Plain text version of the page 
    256                 realf = f 
     250                collect = f 
    257251                if path in docdeps or path in moddeps: 
    258                     collect = make.CollectAction() 
     252                    collect = make.CollectAction(collect) 
    259253                    if path in docdeps: 
    260254                        collect.addinputs(docxml) 
     
    262256                        mods = moddeps[path] 
    263257                        collect.addinputs(*mods) 
    264                     realf /= collect 
    265258 
    266259                txtid = id.withext("txt") 
    267                 t2 = self.add( 
    268                     realf / 
    269                     make.XISTParseAction(builder=xmlbuilder, pool=pynspool, base=root/txtid) / 
    270                     make.XISTConvertAction(target=html) / 
    271                     ExtractContentAction() / 
    272                     make.XISTTextAction() / 
    273                     make.FileAction(key=here/builddir/txtid) 
    274                 ) 
    275                 t3 = self.add( 
    276                     t2 / 
    277                     make.FileAction(key=here/installdir/txtid) / 
    278                     make.ModeAction(mode=0644) 
    279                 ) 
     260                t2 = make.XISTParseAction(input=collect, builder=xmlbuilder, pool=pynspool, base=root/txtid).callattr("conv", target=html) 
     261                t2 = make.CallAction(html.astext, t2) 
     262                t2 = make.FileAction(builddir/txtid, t2) 
     263 
     264                t3 = self.add(make.FileAction(installdir/txtid, t2).chmod(0644)) 
    280265                build.addinputs(t2) 
    281266                install.addinputs(t3)