Author: ben
Date: 2007-10-29 15:46:21 -0700 (Mon, 29 Oct 2007)
New Revision: 7042
Modified:
openlaszlo/trunk/build.xml
Log:
Change 20071025-ben-K by [EMAIL PROTECTED] on 2007-10-25 17:56:48 PDT
in /Users/ben/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Fix for LPP-4960, images are corrupted in reference and developer's
guide
New Features:
Bugs Fixed: LPP-4960 Images not displaying or corrupted in Developer Guide
Technical Reviewer: ptw
QA Reviewer: frisco (pending)
Doc Reviewer: frisco (pending)
Documentation:
When copying images from $LPS_HOME/docs into the build directories,
in preparation for tarring or gzipping, ant used to try to do
token substitution on images. Some of our images apparently had
the string VERSIONID id in them, when their bits were interpreted
as character data. This change copies the images into the build
directories without doing the token replacement.
Release Notes:
Details:
This was checked in to paperpie as r7013; I am hand-merging it to
trunk.
Tests:
Run a build, and deploy it. Go to the compiler chapter of the developer's
guide. (For paperpie, this is at
http://labs.openlaszlo.org/paperpie-nightly/docs/developers/compiler.html )
In section 1.1, there should be an image of the developer's console. Before
this change, that image was corrupted.
More specifically,
http://labs.openlaszlo.org/paperpie-nightly/docs/developers/images/dev_console_dhtml.gif
should be a good image. Before this change, that image was corrupt.
Modified: openlaszlo/trunk/build.xml
===================================================================
--- openlaszlo/trunk/build.xml 2007-10-29 19:56:44 UTC (rev 7041)
+++ openlaszlo/trunk/build.xml 2007-10-29 22:46:21 UTC (rev 7042)
@@ -156,7 +156,6 @@
<include name="logo.gif" />
<include name="includes/**" />
- <include name="images/**" />
<include name="developers/**" />
<include name="deployers/**" />
@@ -166,6 +165,10 @@
<include name="contributors/**" />
<include name="contribref/**" />
+ <!-- Exclude images, because we don't want to replace VERSIONID inside
images. -->
+ <exclude name="**/*.png" />
+ <exclude name="**/*.gif" />
+
<include name="guide_fr/**" />
<include name="installation/**" />
@@ -174,6 +177,36 @@
</patternset>
+ <patternset id="manifest.webapp.docs.images">
+ <!-- these are relative to the docs subdirectory, but only contain
images -->
+ <include name="images/*.png" />
+ <include name="images/*.gif" />
+
+ <include name="includes/**/*.png" />
+ <include name="developers/**/*.png" />
+ <include name="deployers/**/*.png" />
+ <include name="component-design/**/*.png" />
+ <include name="component-browser/**/*.png" />
+ <include name="reference/**/*.png" />
+ <include name="contributors/**/*.png" />
+ <include name="contribref/**/*.png" />
+ <include name="guide_fr/**/*.png" />
+ <include name="installation/**/*.png" />
+
+ <include name="includes/**/*.gif" />
+ <include name="developers/**/*.gif" />
+ <include name="deployers/**/*.gif" />
+ <include name="component-design/**/*.gif" />
+ <include name="component-browser/**/*.gif" />
+ <include name="reference/**/*.gif" />
+ <include name="contributors/**/*.gif" />
+ <include name="contribref/**/*.gif" />
+ <include name="guide_fr/**/*.gif" />
+ <include name="installation/**/*.gif" />
+
+
+ </patternset>
+
<patternset id="manifest.test" >
<include name="test/**" />
<include name="**/test-golden-files/**" />
@@ -635,7 +668,7 @@
depends="disable-tomcat,init" unless="done.build-dist-dir-dev" >
<!-- Explicitly build the dtd when we're building a distribution -->
- <ant target="dtd" />
+ <ant target="dtd" />
<copy todir="${builddir-dev}" >
<fileset dir="${builddir}">
@@ -656,12 +689,6 @@
</filterset>
</copy>
- <copy todir="${builddir-dev}" file="docs/changelog.html">
- <filterset>
- <filter token="VERSIONID" value="${version.id}"/>
- </filterset>
- </copy>
-
<copy tofile="${builddir-dev}/README.txt"
file="README.txt" overwrite="true">
<filterset>
@@ -979,11 +1006,6 @@
<filter token="VERSIONID" value="${version.id}"/>
</filterset>
</copy>
- <copy todir="${builddir}" file="docs/changelog.html">
- <filterset>
- <filter token="VERSIONID" value="${version.id}"/>
- </filterset>
- </copy>
<copy todir="${builddir}" file="docs/logo.gif" />
@@ -1023,6 +1045,15 @@
<filter token="VERSIONID" value="${version.id}"/>
</filterset>
</copy>
+
+ <!-- Copy the images for the docs in, without doing VERSIONID
substitution.
+ Fixes LPP-4960 [bshine 24 oct 2007 -->
+ <copy todir="${webapp}/docs">
+ <fileset dir="./docs">
+ <patternset refid="manifest.webapp.docs.images" />
+ </fileset>
+ </copy>
+
<copy tofile="${webapp}/index.html" file="quick-index.html" >
<filterset>
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
