Author: ben
Date: 2007-10-25 15:00:36 -0700 (Thu, 25 Oct 2007)
New Revision: 7013
Modified:
openlaszlo/branches/paperpie/build.xml
Log:
Change 20071025-ben-OLvgxS by [EMAIL PROTECTED] on 2007-10-25 14:52:17 PDT
in /home/ben/src/svn/openlaszlo/branches/paperpie
for http://svn.openlaszlo.org/openlaszlo/branches/paperpie
Summary: Make images in developer's guide not get corrupted in build process
New Features:
Bugs Fixed: Images not displaying or corrupted in Developer Guide LPP-4960
Technical Reviewer: ptw (pending)
QA Reviewer: mkratt
Doc Reviewer: (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:
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/branches/paperpie/build.xml
===================================================================
--- openlaszlo/branches/paperpie/build.xml 2007-10-25 22:00:14 UTC (rev
7012)
+++ openlaszlo/branches/paperpie/build.xml 2007-10-25 22:00:36 UTC (rev
7013)
@@ -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/**" />
@@ -462,7 +495,7 @@
</target>
<target name="package-source-distro"
- description="Turn source dirs into packages"
depends="disable-tomcat,init,dtd">
+ description="Turn source dirs into packages"
depends="disable-tomcat,init">
<echo message="packaging source distro into ${source-distro-gzfile}" />
<!-- Create tar gz -->
@@ -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" /> I hate the dtd -->
<copy todir="${builddir-dev}" >
<fileset dir="${builddir}">
@@ -744,7 +777,7 @@
<target name="dist-dev" depends="disable-tomcat,init,build-core"
unless="done.dist.dev"
description="Build 'developer' distributions" >
<!-- Explicitly build the dtd when we're building a distribution -->
- <ant dir="${webapp-lps-home}/schema" target="dtd" />
+<!-- i hate the dtd <ant dir="${webapp-lps-home}/schema" target="dtd" />
-->
<ant target="build-dist-dir-dev" inheritrefs="true" />
<ant target="prefetch" inheritrefs="true" />
@@ -946,7 +979,7 @@
<!--================ Target [build-dist-dir-core] ==============-->
<target name="build-dist-dir-core"
description="Build lps core distribution directory for tgz (w/out
precache)"
- depends="disable-tomcat,init,build,doc,dtd"
+ depends="disable-tomcat,init,build,doc"
unless="build-dist-dir-core.done">
<property name="webapp" value="${builddir}/lps-${version.id}" />
@@ -1023,6 +1056,15 @@
<filter token="VERSIONID" value="${version.id}"/>
</filterset>
</copy>
+
+ <!-- Copy the images for the docs in, without doing VERSIONID
substitution.
+ Fixes LPP-4920 [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
