Author: ben
Date: 2007-11-14 11:12:03 -0800 (Wed, 14 Nov 2007)
New Revision: 7263
Modified:
openlaszlo/branches/wafflecone/build.xml
Log:
Change 20071114-ben-u by [EMAIL PROTECTED] on 2007-11-14 11:08:04 PST
in /Users/ben/src/svn/openlaszlo/branches/wafflecone
for http://svn.openlaszlo.org/openlaszlo/branches/wafflecone
Summary: merge doc images fix from trunk
New Features:
Bugs Fixed: LPP-4960 Images not displaying or corrupted in Developer Guide
Technical Reviewer:
QA Reviewer: mamye (pending)
Doc Reviewer:
Documentation:
svn merge r7041:7042 from trunk.
Release Notes:
Details:
fir
Tests:
http://labs.openlaszlo.org/wafflecone-nightly/docs/developers/images/dev_console_dhtml.gif
should not be corrupted. It should be pretty.
Modified: openlaszlo/branches/wafflecone/build.xml
===================================================================
--- openlaszlo/branches/wafflecone/build.xml 2007-11-14 19:10:57 UTC (rev
7262)
+++ openlaszlo/branches/wafflecone/build.xml 2007-11-14 19:12:03 UTC (rev
7263)
@@ -155,7 +155,6 @@
<include name="logo.gif" />
<include name="includes/**" />
- <include name="images/**" />
<include name="developers/**" />
<include name="deployers/**" />
@@ -165,6 +164,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/**" />
@@ -173,6 +176,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/**" />
@@ -634,7 +667,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}">
@@ -655,12 +688,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>
@@ -978,11 +1005,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" />
@@ -1022,6 +1044,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
