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:17 UTC
svn commit: r158338 - in lenya/branches/BRANCH_1_2_X: 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:16 2005
New Revision: 158338
URL: http://svn.apache.org/viewcvs?view=rev&rev=158338
Log:
Honour exlusion patterns for build clean too. This resolves http://issues.apache.org/bugzilla/show_bug.cgi?id=33769
Modified:
lenya/branches/BRANCH_1_2_X/build.properties
lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml
lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml
lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
Modified: lenya/branches/BRANCH_1_2_X/build.properties
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/build.properties?view=diff&r1=158337&r2=158338
==============================================================================
--- lenya/branches/BRANCH_1_2_X/build.properties (original)
+++ lenya/branches/BRANCH_1_2_X/build.properties Sun Mar 20 09:16:16 2005
@@ -21,7 +21,7 @@
# 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=156052
+build.properties.version=157864
#------------------------------------------------------------------------------------
@@ -88,17 +88,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 file uploads
-# (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/branches/BRANCH_1_2_X/src/targets/compile-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml?view=diff&r1=158337&r2=158338
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml Sun Mar 20 09:16:16 2005
@@ -60,14 +60,4 @@
<classpath refid="classpath"/>
</javac>
</target>
-
- <target name="clean" depends="init" description="Cleans the build directories">
- <delete dir="${build.root}"/>
- <delete dir="${dist.root}"/>
-
- <condition property="servlet.engine.tomcat">
- <equals arg1="${web.app.server}" arg2="Tomcat"/>
- </condition>
- <antcall target="clean-tomcat"/>
- </target>
</project>
Modified: lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml?view=diff&r1=158337&r2=158338
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml Sun Mar 20 09:16:16 2005
@@ -35,7 +35,7 @@
<property file="build.properties"/>
<condition property="local.properties.in.sync">
- <equals arg1="${build.properties.version}" arg2="156052"/>
+ <equals arg1="${build.properties.version}" arg2="157864"/>
</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/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml?view=diff&r1=158337&r2=158338
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml Sun Mar 20 09:16:16 2005
@@ -192,6 +192,17 @@
<!-- ============================================================ -->
<!-- Clean targets -->
<!-- ============================================================ -->
+ <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}"/>
+
+ <condition property="servlet.engine.tomcat">
+ <equals arg1="${web.app.server}" arg2="Tomcat"/>
+ </condition>
+ <antcall target="clean-tomcat"/>
+ </target>
<target name="clean-tomcat" description="Resets the deployment by also cleaning the servlet engine context" if="servlet.engine.tomcat">
<!-- Empty server cache - this directory is set in the "local.build.properties" file -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org