Change 20100401-bargull-TPw by barg...@bargull02 on 2010-04-01 23:44:11
in /home/anba/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: tweak build process for windows
Bugs Fixed: LPP-8858 (Reference: make reference build work on windows
machines)
Technical Reviewer: ptw
QA Reviewer: ?
Doc Reviewer: (pending)
Overview:
Building the docs on windows should be working now
Details:
Comment.java:
- split comment lines in an os-independent way, that means don't use the
"line.separator" system property, but a regular expression to detect the
line ending
- this change is necessary, because some files used solely \n to break
lines, so applying the windows line separator \r\n didn't detect an EOL
build.xml:
Both path transformations are performed on the caller side, because
1) too much logic makes xsl even more awkward to read
2) and I wanted to avoid duplicate code in the ruby scripts
- target "dbk.examples.preprocess"
-- replace any backslash characters with normal slashes, this is
necessary because the "base.dir" param (see dbkpreprocessexamples.xsl)
is a part of a file-protocol URI (file:///..)
- target "reference.frameset.generate"
-- normalize path to use slash characters, apparently ruby gets confused
when you mix / and \ in a single path
-- if toccheck fails it shouldn't make the complete build fail when
running the QUICK version (QUICK uses only a small subset of all
classes, therefore toccheck will always fail in this mode)
js2doc-verbose.xsl:
- re-order elements, xls:attribute must appear before any output
elements (xsl:message is considered as an output element!), otherwise
the xslt engine reports a warning ("attribute xyz outside of element")
js2doc-comment2dbk.xsl:
- <xalanredirect:write> doesn't work for me (no idea why), I had to add
<redirect:write> and the corresponding xml namespace declaration for
"redirect".
- next curiosity: for <redirect:write>, I had to prefix the path with
"build/reference/" (no idea why)
dbkpreprocessexamples.xsl:
- changed programsource variable to use the file-protocol to refer to
local files (programsource is an absolute path and on windows absolute
paths start with the drive letter. But the document() function expects a
valid URI, therefore it interprets the drive letter as the protocol
name, this approach won't succeed since there is no valid protocol named
"C" or "D" or on whatever drive OpenLaszlo is installed)
build-opt.xml:
- windows restriction is no longer necessary if this patch works
This patch works with my local Windows 7 plus cygwin environment, but it
should be tested on other Windows environments. Is anybody out there
using Windows, so he can perform the necessary QA?
Tests:
cd docs/src
ant clean build
Files:
M WEB-INF/lps/server/src/org/openlaszlo/js2doc/Comment.java
M docs/src/build.xml
M docs/src/xsl/js2doc-verbose.xsl
M docs/src/xsl/js2doc-comment2dbk.xsl
M docs/src/xsl/dbkpreprocessexamples.xsl
M build-tools/build-opt.xml
Changeset:
http://svn.openlaszlo.org/openlaszlo/patches/20100401-bargull-TPw.tar
