You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/03/20 18:16:12 UTC
svn commit: r158337 - in lenya/trunk: build.properties
src/targets/compile-build.xml src/targets/properties-build.xml
src/targets/webapp-build.xml
Author: gregor
Date: Sun Mar 20 09:16:11 2005
New Revision: 158337
URL: http://svn.apache.org/viewcvs?view=rev&rev=158337
Log:
Honour exlusion patterns for build clean too. This resolves http://issues.apache.org/bugzilla/show_bug.cgi?id=33769
Modified:
lenya/trunk/build.properties
lenya/trunk/src/targets/compile-build.xml
lenya/trunk/src/targets/properties-build.xml
lenya/trunk/src/targets/webapp-build.xml
Modified: lenya/trunk/build.properties
URL: http://svn.apache.org/viewcvs/lenya/trunk/build.properties?view=diff&r1=158336&r2=158337
==============================================================================
--- lenya/trunk/build.properties (original)
+++ lenya/trunk/build.properties Sun Mar 20 09:16:11 2005
@@ -17,9 +17,11 @@
#------------------------------------------------------------------------------------
# Build properties version to make sure that local.build.properties is kept in sync
-# NOTE: Do NOT modify this number
+# NOTE: Do NOT modify this number unless you are a Dev and want to modify this file
+# NOTE for Devs: Update this number if this file is being updated.
+# Also update the version number within src/targets/properties-build.xml
-build.properties.version=155806
+build.properties.version=156028
#------------------------------------------------------------------------------------
@@ -29,7 +31,8 @@
#------------------------------------------------------------------------------------
-# The original, unmodified and expanded cocoon webapp directory
+# The cocoon webapp directory
+# You do not have to change this since Lenya will build Cocoon for you
cocoon.webapp.dir=${cocoon.src.dir}/build/webapp
@@ -81,17 +84,19 @@
#------------------------------------------------------------------------------------
-# Files and directories which should be excluded during 'install' and 'reset'
+# Files and directories which should be excluded during 'install', 'clean' and 'reset'
# Comma- or space-separated list of patterns
# All files are included when commented
+# This is useful for preserving content while you are developing a publication
-#target.install.excludes=lenya/pubs/default/content/authoring/**,lenya/pubs/default/content/live/**,lenya/pubs/default/config/ac/passwd/*.iml
+#target.install.excludes=**/pubs/default/content/authoring/**,**/pubs/default/content/live/**,**/pubs/default/config/ac/passwd/*.iml
#target.reset.excludes=${target.install.excludes}
#------------------------------------------------------------------------------------
-# Enable multipart requests
-# (if you do not need it, you may turn this off for security reasons.)
+# Enable file uploads in Lenya
+# If you leave this set to false, asset and image upload will not work.
+# It is disabled by default for security reasons
enable.uploads=false
Modified: lenya/trunk/src/targets/compile-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/compile-build.xml?view=diff&r1=158336&r2=158337
==============================================================================
--- lenya/trunk/src/targets/compile-build.xml (original)
+++ lenya/trunk/src/targets/compile-build.xml Sun Mar 20 09:16:11 2005
@@ -76,9 +76,4 @@
</classpath>
</java>
</target>
-
- <target name="clean" depends="init" description="Cleans the build directories">
- <delete dir="${build.root}"/>
- <delete dir="${dist.root}"/>
- </target>
</project>
Modified: lenya/trunk/src/targets/properties-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/properties-build.xml?view=diff&r1=158336&r2=158337
==============================================================================
--- lenya/trunk/src/targets/properties-build.xml (original)
+++ lenya/trunk/src/targets/properties-build.xml Sun Mar 20 09:16:11 2005
@@ -32,7 +32,7 @@
<property file="build.properties"/>
<condition property="local.properties.in.sync">
- <equals arg1="${build.properties.version}" arg2="155806"/>
+ <equals arg1="${build.properties.version}" arg2="156028"/>
</condition>
<fail unless="local.properties.in.sync" message="It seems that your local.build.properties is NOT in sync with build.properties! The file build.properties has probably been modified by some Apache Lenya developer. Re-copy build.properties to local.build.properties and re-set your local properties to get the two files back in sync. Please apologoize the inconvenience."/>
Modified: lenya/trunk/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/webapp-build.xml?view=diff&r1=158336&r2=158337
==============================================================================
--- lenya/trunk/src/targets/webapp-build.xml (original)
+++ lenya/trunk/src/targets/webapp-build.xml Sun Mar 20 09:16:11 2005
@@ -186,6 +186,14 @@
</delete>
</target>
+ <!-- Cleans the build directory, with the exception of target.reset.excludes -->
+ <target name="clean" depends="init" description="Cleans the build directories">
+ <delete includeEmptyDirs="true">
+ <fileset dir="${build.root}" excludes="${target.reset.excludes}" />
+ </delete>
+ <delete dir="${dist.root}"/>
+ </target>
+
<!-- Install the webapp -->
<target name="install" depends="webapp" description="Install the webapp into servlet engine context">
<!-- Copy From build.webapp=${build.webapp} To tomcat.webapps.dir=${tomcat.webapps.dir} -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org