Changeset 559:f8a9cdd82318 in livinglogic.python.www

Show
Ignore:
Timestamp:
06/26/08 19:19:26 (11 years ago)
Author:
Walter Doerwald <walter@…>
Branch:
default
Message:

Use the new make version. Add ULL pages.

Location:
site
Files:
2 added
2 modified

Legend:

Unmodified
Added
Removed
  • site/Python_xmlns.py

    r527 r559  
    652652        classes provide a conversion method to transform the XML tree (e.g. into 
    653653        HTML). XIST can be considered 'object oriented XSL'. 
     654        """, 
     655    ), 
     656    PythonSourcePage(u"ull", 
     657        XISTPage(u"howto", 
     658            crumb=u"Howto", 
     659            title=u"ll.ullc howto · Python software · LivingLogic AG", 
     660            header=u"ll.ullc documentation", 
     661            subheader=u"How to use ULL", 
     662            url=u"root:ull/Howto.html", 
     663            localkeywords=[], 
     664            linktitle=u"How to use ULL", 
     665        ), 
     666        crumb=u"ll.ullc", 
     667        title=u"ll.ullc · Python software · LivingLogic AG", 
     668        header=u"ll.ullc", 
     669        subheader=(u"Templating language"), 
     670        url=u"root:ull/index.html", 
     671        linktitle=u"Module ll.ullc: A templating language", 
     672        description=u""" 
     673        ll.ullc provides a crossplatform templating language. 
    654674        """, 
    655675    ), 
  • site/m.py

    r517 r559  
    6161            except KeyError: 
    6262                continue 
    63             f1 = self.add(make.FileAction(here/srcdir/id)) 
    64             f2 = self.add(f1 / make.FileAction(here/builddir/id)) 
    65             f3 = self.add(f2 / make.FileAction(here/installdir/id) / make.ModeAction(0644)) 
     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)) 
    6666            if aux: 
    6767                auxFiles.append(f2) 
     
    7070 
    7171        for id in pixelfiles: 
    72             f1 = self.add(make.FileAction(here/xistdir/id)) 
    73             f2 = self.add(f1 / make.FileAction(here/builddir/id)) 
    74             f3 = self.add(f2 / make.FileAction(here/installdir/id) / make.ModeAction(0644)) 
     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)) 
    7575            auxFiles.append(f2) 
    7676            build.addinputs(f2) 
     
    8686 
    8787        # These are not the real installed modules, but their source 
    88         file_core = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.core/src/ll/__init__.py")) 
    89         file_xist = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/__init__.py")) 
    90         file_xist_xsc = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/xsc.py")) 
    91         file_xist_ns = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/__init__.py")) 
    92         file_xist_ns_html = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/html.py")) 
    93         file_xist_ns_xml = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/xml.py")) 
    94         file_xist_ns_wml = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/wml.py")) 
    95         file_xist_ns_ihtml = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/ihtml.py")) 
    96         file_xist_ns_docbook = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/docbook.py")) 
    97         file_xist_ns_abbr = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/abbr.py")) 
    98         file_xist_ns_cond = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/cond.py")) 
    99         file_xist_ns_form = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/form.py")) 
    100         file_xist_ns_php = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/php.py")) 
    101         file_xist_ns_jsp = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/jsp.py")) 
    102         file_xist_ns_meta = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/meta.py")) 
    103         file_xist_ns_ruby = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/ruby.py")) 
    104         file_xist_ns_specials = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/specials.py")) 
    105         file_xist_ns_htmlspecials = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/htmlspecials.py")) 
    106         file_xist_ns_strutshtml = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/struts_html.py")) 
    107         file_xist_ns_strutsconfig = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/struts_config.py")) 
    108         file_xist_ns_doc = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/doc.py")) 
    109         file_xist_ns_rng = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/rng.py")) 
    110         file_xist_ns_kid = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/kid.py")) 
    111         file_xist_ns_detox = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/detox.py")) 
    112         file_xist_ns_toxic = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/ns/toxic.py")) 
    113         file_xist_parsers = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/parsers.py")) 
    114         file_xist_converters = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/converters.py")) 
    115         file_xist_presenters = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/presenters.py")) 
    116         file_xist_publishers = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/publishers.py")) 
    117         file_xist_sims = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/sims.py")) 
    118         file_xist_xfind = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/xfind.py")) 
    119         file_xist_css = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xist/css.py")) 
    120         file_misc = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/misc.py")) 
    121         file_url = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/url.py")) 
    122         file_make = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/make.py")) 
    123         file_sisyphus = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/sisyphus.py")) 
    124         file_daemon = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/daemon.py")) 
    125         file_color = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/color.py")) 
    126         file_xpit = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.xist/src/ll/xpit.py")) 
    127         file_orasql = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.orasql/src/ll/orasql/__init__.py")) 
    128         file_nightshade = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.nightshade/src/ll/nightshade.py")) 
    129         file_pycoco = self.add(make.FileAction(here/repositorydir/"LivingLogic.Python.pycoco/src/pycoco/__init__.py")) 
     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_ull = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/ullc.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_xpit = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.xist/src/ll/xpit.py")) 
     128        file_orasql = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.orasql/src/ll/orasql/__init__.py")) 
     129        file_nightshade = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.nightshade/src/ll/nightshade.py")) 
     130        file_pycoco = self.add(make.FileAction(key=here/repositorydir/"LivingLogic.Python.pycoco/src/pycoco/__init__.py")) 
    130131 
    131132        # Data for Additional dependencies (News & Install) 
     
    142143            "xist/Migration": "LivingLogic.Python.xist/MIGRATION.rst", 
    143144            "xist/OldMigration": "LivingLogic.Python.xist/OLDMIGRATION.rst", 
     145            "ull/Howto": "LivingLogic.Python.xist/docs/ULL.rst", 
    144146            "url/Howto": "LivingLogic.Python.xist/docs/URL_Howto.xml", 
    145147            "orasql/History": "LivingLogic.Python.orasql/NEWS.rst", 
     
    157159            "core/index": (file_core, file_xist_ns_doc), 
    158160            "url/index": (file_url, file_xist_ns_doc), 
     161            "ull/index": (file_ull, file_xist_ns_doc), 
    159162            "make/index": (file_make, file_xist_ns_doc), 
    160163            "sisyphus/index": (file_sisyphus, file_xist_ns_doc), 
     
    200203 
    201204        def makens(id): 
    202             f1 = self.add(make.FileAction(here/srcdir/id)) 
     205            f1 = self.add(make.FileAction(key=here/srcdir/id)) 
    203206            buildid = here/builddir/id 
    204             f2 = self.add(f1 / make.FileAction(buildid) / make.ModuleAction(), buildid) 
     207            f2 = self.add(f1 / make.FileAction(key=buildid) / make.ModuleAction(), buildid) 
    205208            return f2 
    206209 
     
    216219                path = str(id.withoutext().path) 
    217220 
    218                 f = self.add(make.FileAction(here/srcdir/id)) 
     221                f = self.add(make.FileAction(key=here/srcdir/id)) 
    219222 
    220223                collect = make.CollectAction() 
     
    222225 
    223226                if path in docdeps: 
    224                     docxml = self.add(make.FileAction(here/repositorydir/docdeps[path])) 
     227                    docxml = self.add(make.FileAction(key=here/repositorydir/docdeps[path])) 
    225228                    collect.addinputs(docxml) 
    226229                if path in moddeps: 
    227230                    mods = moddeps[path] 
    228231                    collect.addinputs(*mods) 
    229                     mod2 = self.add(mods[0] / make.FileAction(here/builddir/(path + "_module.py"))) 
    230                     mod3 = self.add(mod2 / make.FileAction(here/installdir/(path + "_module.py")) / make.ModeAction(0644)) 
     232                    mod2 = self.add(mods[0] / make.FileAction(key=here/builddir/(path + "_module.py"))) 
     233                    mod3 = self.add(mod2 / make.FileAction(key=here/installdir/(path + "_module.py")) / make.ModeAction(mode=0644)) 
    231234                    build.addinputs(mod2) 
    232235                    install.addinputs(mod3) 
     
    238241                    make.XISTConvertAction() / 
    239242                    make.XISTPublishAction(publisher=publisher, base=root/newid) / 
    240                     make.FileAction(here/builddir/newid) 
     243                    make.FileAction(key=here/builddir/newid) 
    241244                ) 
    242                 f3 = self.add(f2 / make.FileAction(here/installdir/newid)) 
     245                f3 = self.add(f2 / make.FileAction(key=here/installdir/newid)) 
    243246                build.addinputs(f2) 
    244247                install.addinputs(f3) 
     
    247250                # Source version of the page 
    248251                pagesrcid = id 
    249                 f2 = self.add(f / make.FileAction(here/builddir/pagesrcid)) 
    250                 f3 = self.add(f2 / make.FileAction(here/installdir/pagesrcid) / make.ModeAction(0644)) 
     252                f2 = self.add(f / make.FileAction(key=here/builddir/pagesrcid)) 
     253                f3 = self.add(f2 / make.FileAction(key=here/installdir/pagesrcid) / make.ModeAction(mode=0644)) 
    251254                build.addinputs(f2) 
    252255                install.addinputs(f3) 
     
    270273                    ExtractContentAction() / 
    271274                    make.XISTTextAction() / 
    272                     make.FileAction(here/builddir/txtid) 
     275                    make.FileAction(key=here/builddir/txtid) 
    273276                ) 
    274277                t3 = self.add( 
    275278                    t2 / 
    276                     make.FileAction(here/installdir/txtid) / 
    277                     make.ModeAction(0644) 
     279                    make.FileAction(key=here/installdir/txtid) / 
     280                    make.ModeAction(mode=0644) 
    278281                ) 
    279282                build.addinputs(t2)