[Laszlo-checkins] r17792 - in openlaszlo/trunk: WEB-INF/lps/misc lps/components/utils

[ptw@openlaszlo.org]

Author: ptw
Date: 2010-10-30 09:36:52 -0700 (Sat, 30 Oct 2010)
New Revision: 17792

Removed:
   openlaszlo/trunk/lps/components/utils/dataselectioninclude.lzx
Modified:
   openlaszlo/trunk/WEB-INF/lps/misc/lzx-autoincludes.properties
   openlaszlo/trunk/lps/components/utils/dataselectionmanager.lzx
Log:
Change ptw-20101030-HBr by ptw at padme.home on 2010-10-30 12:33:09 EDT
    in /Users/ptw/OpenLaszlo/trunk-3
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Try #2 to fix the build

Bugs Fixed:  LPP-9475 4.7-based tree fails to compile in 4.9 with no useful error message

Technical Reviewer: henry.minsky at gmail.com (pending)
QA Reviewer: antun (pending)

Details:
    It turns out it is not the <include> that causes the doc to fail
    to generate.  It is the doc comment inside the <library> tag.  For
    some reason, when the doc generator sees a doc comment, it only
    processes the next xml tag after that and ignores everything
    else.  Moving the doc comment outside the library lets me put
    everything back to the way it should be (include dependency
    directly in the library, autoincludes.properties not hand-edited,
    no kludge dataselectioninclude file).

Tests:
    local doc build, kicking off another nightly



Modified: openlaszlo/trunk/WEB-INF/lps/misc/lzx-autoincludes.properties
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/misc/lzx-autoincludes.properties	2010-10-30 16:36:38 UTC (rev 17791)
+++ openlaszlo/trunk/WEB-INF/lps/misc/lzx-autoincludes.properties	2010-10-30 16:36:52 UTC (rev 17792)
@@ -69,10 +69,7 @@
 datalistselector: base/datalistselector.lzx
 datamarker: charts/common/datamarker.lzx
 datapoints: charts/common/datapoints.lzx
-# Danger, Will Robinson!  Do not change this hand-created entry
-# See LPP-9475 for complete details
-dataselectionmanager: utils/dataselectioninclude.lzx
-# End hand-edit
+dataselectionmanager: utils/dataselectionmanager.lzx
 dataseries: charts/common/dataseries.lzx
 datastyle: charts/styles/chartstyle.lzx
 datastylelist: charts/styles/chartstyle.lzx

Deleted: openlaszlo/trunk/lps/components/utils/dataselectioninclude.lzx

Modified: openlaszlo/trunk/lps/components/utils/dataselectionmanager.lzx
===================================================================
--- openlaszlo/trunk/lps/components/utils/dataselectionmanager.lzx	2010-10-30 16:36:38 UTC (rev 17791)
+++ openlaszlo/trunk/lps/components/utils/dataselectionmanager.lzx	2010-10-30 16:36:52 UTC (rev 17792)
@@ -1,4 +1,3 @@
-<library>
 <!---
    
     @copyright Copyright 2001-2010 Laszlo Systems, Inc.  All Rights Reserved.
@@ -10,9 +9,8 @@
     @subtopic Helpers
     @devnote TODO: [20080930 anba] (LPP-6080) uncomment typing in method signatures
   -->
-
-<!-- See LPP-9180 for why we cannot directly include the dependency on selectionmanager -->
-
+<library>
+<include href="utils/selectionmanager.lzx" />
 <class name="dataselectionmanager" extends="selectionmanager">
     <doc>
         <tag name="shortdesc"><text> A selection manager for views generated by a lazily-replicated datapath.</text></tag>