Max did check his merge in. It's possible something went wrong with my integrate, though, I'll look into it.

Did you apply my changes to an absolutely clean tree?

jim

On Dec 1, 2006, at 9:32 AM, Benjamin Shine wrote:


Not approved yet --
Is it possible your tree doesn't have Max's merge of trunk to legals? Applying this change gives me a compilation error

[javac] Compiling 513 source files to /Users/ben/src/svn/openlaszlo/ branches/legals/WEB-INF/lps/server/build [javac] /Users/ben/src/svn/openlaszlo/branches/legals/WEB-INF/ lps/server/src/org/openlaszlo/compiler/CanvasCompiler.java:163: cannot find symbol
    [javac] symbol  : method insertCSS()
[javac] location: class org.openlaszlo.compiler.CompilationEnvironment
    [javac]         mEnv.insertCSS();
    [javac]             ^
[javac] /Users/ben/src/svn/openlaszlo/branches/legals/WEB-INF/ lps/server/src/org/openlaszlo/compiler/Compiler.java:381: cannot find symbol [javac] symbol : method setCSSHandler (org.openlaszlo.css.CSSHandler) [javac] location: class org.openlaszlo.compiler.CompilationEnvironment
    [javac]                     env.setCSSHandler(handler);
    [javac]                        ^
...

These api's were removed in trunk with my second round of CSS development, and recently merged from legals to trunk. I'm trying to identify an exact change number, but having trouble. I think perhaps Max hasn't checked in his merge yet?

-ben


On Nov 30, 2006, at 3:51 PM, Jim Grandy wrote:

Change 20061130-jgrandyw-t by [EMAIL PROTECTED] on 2006-11-30 15:44:14 PST
    in /Users/jgrandyw/dev/svn/openlaszlo/branches/legals

Summary:Merge js2doc tools from private branch

New Features:New tool, js2doc, that extracts comments from js2 files and places them in an xml file. Ant tasks for docs/src that extract documentation from the LFC and renders them (very roughly) to HTML.

Bugs Fixed:LPP-1436 LPP-1438

Technical Reviewer: ben
QA Reviewer: ptw
Doc Reviewer:

Details:

svn merge -r 2584:2658 http://svn.openlaszlo.org/openlaszlo/ branches/legalsdt svn merge -r 2659:2751 http://svn.openlaszlo.org/openlaszlo/ branches/legalsdt

    To build:

    Update http://svn.openlaszlo.org/vendor first.

    > cd docs/src
    > ant -buildfile build-lfc.xml lfc.html

    Book is temporarily in docs/src/contents/reference.

Along the way I also cleaned up some stale javadoc comments, nothing big.

Please note I added some var declarations in the LFC where they were introduced only on first set rather than formally declared. I haven't noticed any difference in compilation or behavior, but please be on the lookout for changes.

Tests: ant clean build doc test ; cd docs/src ; ant -buildfile build-lfc.xml lfc.html

Files:
M      WEB-INF/lps/schema/lzx.rnc
M      WEB-INF/lps/lfc/core/LzDictionary.lzs
M      WEB-INF/lps/lfc/core/LzNode.lzs
M      WEB-INF/lps/lfc/core/LzConstants.lzs
M      WEB-INF/lps/lfc/core/UserClass.lzs
M      WEB-INF/lps/lfc/core/Class.lzs
M      WEB-INF/lps/lfc/core/LzDefs.lzs
M      WEB-INF/lps/lfc/views/LaszloCanvas.lzs
M      WEB-INF/lps/lfc/LaszloLibrary.lzs
M      WEB-INF/lps/lfc/events/LaszloEvents.lzs
M      WEB-INF/lps/lfc/controllers/LzAnimatorGroup.lzs
M      WEB-INF/lps/lfc/controllers/LaszloLayout.lzs
M      WEB-INF/lps/lfc/controllers/LaszloAnimation.lzs
M      WEB-INF/lps/lfc/data/LzDataNode.lzs
M      WEB-INF/lps/lfc/data/LzDataElement.lzs
M      WEB-INF/lps/lfc/data/LzDatapath.lzs
M      WEB-INF/lps/lfc/data/LzDataAttrBind.lzs
M      WEB-INF/lps/lfc/compiler/LzRuntime.lzs
M      WEB-INF/lps/server/src/org/openlaszlo/js2doc/Schema_Test.java
A  +   WEB-INF/lps/server/src/org/openlaszlo/js2doc/Comment_Test.java
A + WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/ unitcomment2.js A + WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/ test_include.xml A + WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/ unitcomment.xml
A  +   WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/more
A + WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/more/ more.js A + WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/ unitcomment2.xml M WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/ LaszloEvents.js A + WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/ simplecomment.js M WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/ LaszloEvents.xml M WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/ shortest.xml A + WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/ simplecomment.xml A + WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/ test_include.js A + WEB-INF/lps/server/src/org/openlaszlo/js2doc/tests/ unitcomment.js
A  +   WEB-INF/lps/server/src/org/openlaszlo/js2doc/Comment.java
M      WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2Doc_Test.java
M      WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2Doc.java
M      WEB-INF/lps/server/src/org/openlaszlo/js2doc/Main.java
M      WEB-INF/lps/server/src/org/openlaszlo/js2doc/JS2DocUtils.java
M      WEB-INF/lps/server/src/org/openlaszlo/js2doc/js2doc.rnc
M WEB-INF/lps/server/src/org/openlaszlo/js2doc/ WholeFile_Test.java
M      WEB-INF/lps/server/src/org/openlaszlo/utils/FileUtils.java
M      WEB-INF/lps/server/src/org/openlaszlo/utils/LZHttpUtils.java
M      WEB-INF/lps/server/src/org/openlaszlo/utils/StringUtils.java
M WEB-INF/lps/server/src/org/openlaszlo/xml/internal/ XMLRPCCompiler.java M WEB-INF/lps/server/src/org/openlaszlo/xml/internal/ DataCommon.java M WEB-INF/lps/server/src/org/openlaszlo/xml/internal/ DataCompiler.java M WEB-INF/lps/server/src/org/openlaszlo/xml/internal/ XMLCompiler.java
M      WEB-INF/lps/server/src/org/openlaszlo/cache/Cache.java
M      WEB-INF/lps/server/src/org/openlaszlo/cache/RequestCache.java
M WEB-INF/lps/server/src/org/openlaszlo/compiler/ SolutionMessages.java M WEB-INF/lps/server/src/org/openlaszlo/compiler/ ViewCompiler.java M WEB-INF/lps/server/src/org/openlaszlo/compiler/ ElementCompiler.java M WEB-INF/lps/server/src/org/openlaszlo/compiler/ CompilationErrorHandler.java
M      WEB-INF/lps/server/src/org/openlaszlo/compiler/ViewSchema.java
M      WEB-INF/lps/server/src/org/openlaszlo/compiler/SWFWriter.java
M WEB-INF/lps/server/src/org/openlaszlo/compiler/ CompilationEnvironment.java
M      WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
M      WEB-INF/lps/server/src/org/openlaszlo/compiler/Canvas.java
M WEB-INF/lps/server/src/org/openlaszlo/compiler/ TextCompiler.java M WEB-INF/lps/server/src/org/openlaszlo/compiler/ CompilationError.java M WEB-INF/lps/server/src/org/openlaszlo/compiler/ CompilerUtils.java M WEB-INF/lps/server/src/org/openlaszlo/compiler/ SourceLocatorSAXOutputter.java
M      WEB-INF/lps/server/build.xml
A  +   docs/src/build-lfc.xml
D      docs/src/wrappers/animatorgroup.html
D      docs/src/wrappers/node.html
D      docs/src/wrappers/animator.html
D      docs/src/wrappers/lzdataelement.html
D      docs/src/wrappers/layout.html
D      docs/src/wrappers/canvas.html
D      docs/src/wrappers/class.html
A  +   docs/src/xsl/js2doc2dbk.xsl

Changeset: http://svn.openlaszlo.org/openlaszlo/patches/20061130- jgrandyw-t.tar


Reply via email to