[Laszlo-checkins] r7546 - in openlaszlo/trunk: . WEB-INF/lps/schema
ben@openlaszlo.org
ben at openlaszlo.org
Fri Dec 14 13:49:01 PST 2007
Author: ben
Date: 2007-12-14 13:48:57 -0800 (Fri, 14 Dec 2007)
New Revision: 7546
Modified:
openlaszlo/trunk/WEB-INF/lps/schema/build.xml
openlaszlo/trunk/build.xml
Log:
Change 20071214-ben-J by ben at slim.local on 2007-12-14 11:43:10 PST
in /Users/ben/src/svn/openlaszlo/trunk-to-kill-dtd
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Stop building the dtd, ever
New Features:
Bugs Fixed: LPP-5235 Stop generating the dtd in every build
Technical Reviewer: ptw
QA Reviewer: minsky (pending)
Documentation:
As discussed in email, our current dtd is better than nothing at all, although, since it is not being maintained, you could save yourself some trouble by generating it once and just checking it in to svn.
I've checked in the current dtd and related files (xsd, rng, rnc) to
http://svn.openlaszlo.org/attic/schema/
and with this change, the build no longer tries to do anything at
all with building or thinking about or including the dtd
Notice that the build file in WEB-INF/lps/schema/build.xml
no longer even mentions python. This might well be our last
use of python in the build.
Release Notes:
Details:
Tests:
ant dist-one succeeds.
Modified: openlaszlo/trunk/WEB-INF/lps/schema/build.xml
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/schema/build.xml 2007-12-14 19:46:12 UTC (rev 7545)
+++ openlaszlo/trunk/WEB-INF/lps/schema/build.xml 2007-12-14 21:48:57 UTC (rev 7546)
@@ -18,10 +18,9 @@
<property name="rnc" value="lzx.rnc"/>
<property name="docrng" value="lzxdoc.rng"/>
<property name="rng" value="lzx.rng"/>
- <property name="dtd" value="lzx.dtd"/>
<property name="xsd" value="lzx.xsd"/>
<property name="html" value="lzx-reference.html"/>
- <property name="python.exec" value="python" />
+
<mkdir dir="build"/>
<condition property="schemas.uptodate">
<and>
@@ -31,8 +30,6 @@
<include name="lzx.rnc"/>
</srcfiles>
</uptodate>
- <uptodate property="dtd.uptodate" value="false" srcfile="${rng}" targetfile="${dtd}">
- </uptodate>
<uptodate property="xsd.uptodate" value="false" srcfile="${rnc}" targetfile="${xsd}"/>
</and>
</condition>
@@ -53,17 +50,6 @@
<style in="build/lzx.direct.rng" out="${docrng}" style="strip-private.xsl"/>
</target>
- <target name="dtd"
- description="Generate DTD" depends="rng"
- unless="schemas.uptodate" >
- <exec executable="${python.exec}" taskname="rng2dtd" failonerror="true" >
- <arg value="rng2dtd.py"/>
- <arg value="${rng}"/>
- <arg value="-o"/>
- <arg value="${dtd}"/>
- </exec>
- </target>
-
<target name="clean"
description="Remove generated schema files" depends="init">
<delete dir="${build}"/>
Modified: openlaszlo/trunk/build.xml
===================================================================
--- openlaszlo/trunk/build.xml 2007-12-14 19:46:12 UTC (rev 7545)
+++ openlaszlo/trunk/build.xml 2007-12-14 21:48:57 UTC (rev 7546)
@@ -230,8 +230,8 @@
</target>
<!--============== Convenience Targets [simple] ==================-->
- <target name="simple" depends="disable-tomcat,disable-dtd,build"
- description="Just do a simple build, without tomcat or a dtd or doc." />
+ <target name="simple" depends="disable-tomcat,build"
+ description="Just do a simple build, without tomcat or doc." />
<!--============== Convenience Targets [nightly] ==================-->
<target name="nightly" depends="disable-tomcat"
@@ -261,11 +261,6 @@
<property name="skip.nsi-dev" value="true" />
</target>
- <target name="disable-dtd"
- description="Don't want the endless dtd task to run? Just run this target first.">
- <property name="skip.dtd" value="true" />
- </target>
-
<!--=============== Target [init] ===================-->
<target name="init" description="Target for initialization"
depends="build-opt"
@@ -405,7 +400,6 @@
<include name="*.sit"/>
<include name="*.dmg"/>
<include name="*.exe"/>
- <include name="tools/lzx.dtd" />
<include name="tools/lzx.rnc" />
<include name="tools/lzx.rng" />
<include name="tools/lzx.xsd" />
@@ -456,13 +450,7 @@
unless="no.tomcat">
<ant target="webapp.undeploy" />
</target>
-
- <!--================ Target [dtd] ==============-->
- <target name="dtd" depends="init"
- description="build the dtd, only" >
- <ant dir="${webapp-lps-home}/schema" target="dtd" />
- </target>
-
+
<!--================ Target [build-source-distro] ==============-->
<target name="build-source-distro"
description="Build source distribution"
@@ -495,7 +483,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 -->
@@ -706,10 +694,7 @@
<target name="build-dist-dir-dev"
description="Prepares dev copy of dist directory"
depends="disable-tomcat,init" unless="done.build-dist-dir-dev" >
-
- <!-- Explicitly build the dtd when we're building a distribution -->
- <ant target="dtd" />
-
+
<copy todir="${builddir-dev}" >
<fileset dir="${builddir}">
<patternset refid="manifest.top" />
@@ -810,8 +795,7 @@
<!--================ Target [dist-dev] ==============-->
<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" />
+
<ant target="build-dist-dir-dev" inheritrefs="true" />
<ant target="prefetch" inheritrefs="true" />
@@ -1013,7 +997,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}" />
More information about the Laszlo-checkins
mailing list