Author: jgrandy
Date: 2007-07-16 09:53:22 -0700 (Mon, 16 Jul 2007)
New Revision: 5676
Modified:
openlaszlo/branches/legals/build.xml
Log:
Change 20070714-jgrandyw-8 by [EMAIL PROTECTED] on 2007-07-14 07:46:23 PDT
in /Users/jgrandyw/dev/svn/openlaszlo/branches/legals3
for http://svn.openlaszlo.org/openlaszlo/branches/legals
Summary: Clean up ant tasks that copy docs into dist
New Features:
Bugs Fixed: LPP-4291
Technical Reviewer: ben
QA Reviewer: mamye
Doc Reviewer:
Documentation:
Release Notes:
Details: The ant tasks that copy docs into the distribution were an ugly mess.
I cleaned them up.
Tests: I did a dist-one, installed the Mac distro, and verified that the
documentation was properly included.
Modified: openlaszlo/branches/legals/build.xml
===================================================================
--- openlaszlo/branches/legals/build.xml 2007-07-16 06:43:29 UTC (rev
5675)
+++ openlaszlo/branches/legals/build.xml 2007-07-16 16:53:22 UTC (rev
5676)
@@ -112,21 +112,7 @@
<include name="tools/**" />
<include name="my-apps/**" />
- <include name="docs/**" />
- <exclude name="docs/guide" />
- <exclude name="docs/installation/**" />
- <exclude name="docs/release-notes.html" />
- <exclude name="docs/changelog.html" />
- <exclude name="docs/noship/**" />
- <!-- Don't include the website install instructions and python files -->
- <exclude name="docs/installation/*.py" />
- <exclude name="docs/installation/build/**" />
- <exclude name="docs/src/**" />
- <exclude name="docs/reference/**" />
- <exclude name="docs/contribref/**" />
- <exclude name="docs/guide/**" />
- <exclude name="docs/**/*.in" />
- <exclude name="docs/deployers/**.html" />
+
<include name="WEB-INF/web.xml"/>
<include name="WEB-INF/classes/**"/>
<include name="${webapp-lps-home}/schema/lzx.rng" />
@@ -160,6 +146,32 @@
</patternset>
+ <patternset id="manifest.webapp.docs">
+ <!-- these are relative to docs subdirectory -->
+ <!-- they are specified separately because we filter VERSIONID within
them -->
+
+ <include name="*.html" />
+ <include name="*.dbk" />
+ <include name="logo.gif" />
+
+ <include name="includes/**" />
+ <include name="images/**" />
+
+ <include name="developers/**" />
+ <include name="deployers/**" />
+ <include name="component-design/**" />
+ <include name="reference/**" />
+ <include name="contributors/**" />
+ <include name="contribref/**" />
+
+ <include name="guide_fr/**" />
+
+ <include name="installation/**" />
+ <exclude name="installation/*.py" />
+ <exclude name="installation/build/**" />
+
+ </patternset>
+
<patternset id="manifest.test" >
<include name="test/**" />
<include name="**/test-golden-files/**" />
@@ -995,68 +1007,21 @@
</filterset>
</copy>
-
-
<copy todir="${webapp}">
<fileset dir="." >
<patternset refid="manifest.webapp" />
</fileset>
</copy>
- <copy todir="${webapp}">
- <fileset dir=".">
- <include name="docs/installation/**" />
- <exclude name="docs/installation/*.py" />
- <exclude name="docs/installation/img/**" />
- <exclude name="docs/installation/build/**" />
- <include name="docs/release-notes.html" />
- <include name="docs/changelog.html" />
- <include name="docs/reference/**/*.html" />
- <include name="docs/reference/**/*.lzx" />
- <include name="docs/reference/**/*.jsp" />
- <include name="docs/reference/**/*.txt" />
- <include name="docs/reference/**/*.xml" />
- <include name="docs/contribref/**/*.html" />
- <include name="docs/contribref/**/*.lzx" />
- <include name="docs/contribref/**/*.jsp" />
- <include name="docs/contribref/**/*.txt" />
- <include name="docs/contribref/**/*.xml" />
- <include name="docs/guide/**/*.html" />
- <include name="docs/guide/**/*.lzx" />
- <include name="docs/guide/**/*.jsp" />
- <include name="docs/guide/**/*.txt" />
- <include name="docs/guide/**/*.xml" />
- <include name="docs/deployers/**.html" />
+ <copy todir="${webapp}/docs">
+ <fileset dir="./docs">
+ <patternset refid="manifest.webapp.docs" />
</fileset>
<filterset>
<filter token="VERSIONID" value="${version.id}"/>
</filterset>
</copy>
- <copy todir="${webapp}">
- <fileset dir=".">
- <include name="docs/installation/img/**" />
- <include name="docs/reference/**" />
- <include name="docs/guide/**" />
- <exclude name="docs/reference/**/*.html" />
- <exclude name="docs/reference/**/*.lzx" />
- <exclude name="docs/reference/**/*.jsp" />
- <exclude name="docs/reference/**/*.txt" />
- <exclude name="docs/reference/**/*.xml" />
- <exclude name="docs/contribref/**/*.html" />
- <exclude name="docs/contribref/**/*.lzx" />
- <exclude name="docs/contribref/**/*.jsp" />
- <exclude name="docs/contribref/**/*.txt" />
- <exclude name="docs/contribref/**/*.xml" />
- <exclude name="docs/guide/**/*.html" />
- <exclude name="docs/guide/**/*.lzx" />
- <exclude name="docs/guide/**/*.jsp" />
- <exclude name="docs/guide/**/*.txt" />
- <exclude name="docs/guide/**/*.xml" />
- <exclude name="docs/deployers/**.html" />
- </fileset>
- </copy>
-
<copy tofile="${webapp}/index.html" file="quick-index.html" >
<filterset>
<filter token="BUILDID" value="${build.id}"/>
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
