lenya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gre...@apache.org
Subject svn commit: r178305 - in /lenya/trunk/src: resources/javadoc.css targets/docs-build.xml targets/ide-build.xml targets/init-build.xml targets/properties-build.xml
Date Tue, 24 May 2005 22:45:18 GMT
Author: gregor
Date: Tue May 24 15:45:17 2005
New Revision: 178305

URL: http://svn.apache.org/viewcvs?rev=178305&view=rev
Log:
No longer call init twice, do not call cocoon resources to webapp

Added:
    lenya/trunk/src/resources/javadoc.css
      - copied unchanged from r178190, lenya/trunk/src/webapp/resources/css/javadoc.css
Modified:
    lenya/trunk/src/targets/docs-build.xml
    lenya/trunk/src/targets/ide-build.xml
    lenya/trunk/src/targets/init-build.xml
    lenya/trunk/src/targets/properties-build.xml

Modified: lenya/trunk/src/targets/docs-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/docs-build.xml?rev=178305&r1=178304&r2=178305&view=diff
==============================================================================
--- lenya/trunk/src/targets/docs-build.xml (original)
+++ lenya/trunk/src/targets/docs-build.xml Tue May 24 15:45:17 2005
@@ -52,7 +52,7 @@
              windowtitle="${Name} API - Version ${version}"
              doctitle="${Name}"
              bottom="Copyright © ${year} Apache Software Foundation. All Rights
Reserved."
-             stylesheetfile="${resource.dir}/javadoc.css"
+             stylesheetfile="${src.resource.dir}/javadoc.css"
              source="1.4">
       <!-- sources -->
       <sourcepath>

Modified: lenya/trunk/src/targets/ide-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/ide-build.xml?rev=178305&r1=178304&r2=178305&view=diff
==============================================================================
--- lenya/trunk/src/targets/ide-build.xml (original)
+++ lenya/trunk/src/targets/ide-build.xml Tue May 24 15:45:17 2005
@@ -67,7 +67,7 @@
     <property name="libs" refid="libs"/>
 
     <!-- expand properties in the template file -->
-    <copy file="src/resources/dev/eclipse/classpath-tmpl.xml"
+    <copy file="${src.resource.dir}/dev/eclipse/classpath-tmpl.xml"
           tofile="${build.temp}/classpath-temp.xml"
           filtering="yes"
           overwrite="yes">
@@ -95,12 +95,12 @@
     <!-- now build the .classpath file -->
     <xslt in="${build.temp}/classpath-temp.xml" out="${basedir}/.classpath"
           processor="trax"
-          style="src/resources/dev/eclipse/make-classpath.xsl">
+          style="${src.resource.dir}/dev/eclipse/make-classpath.xsl">
        <param name="exportlib" expression="${ide.eclipse.export.libs}"/>
     </xslt>
 
     <!-- copy the project file (expand version) -->
-    <copy file="src/resources/dev/eclipse/project"
+    <copy file="${src.resource.dir}/dev/eclipse/project"
           tofile="${basedir}/.project"
           overwrite="yes">
     </copy>

Modified: lenya/trunk/src/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?rev=178305&r1=178304&r2=178305&view=diff
==============================================================================
--- lenya/trunk/src/targets/init-build.xml (original)
+++ lenya/trunk/src/targets/init-build.xml Tue May 24 15:45:17 2005
@@ -45,7 +45,7 @@
   </target>
 
   <!-- Build Cocoon with our properties -->
-  <target name="build-cocoon" depends="init" unless="cocoon.build.webapp.dir.exists">
+  <target name="build-cocoon" unless="cocoon.build.webapp.dir.exists">
     <copy todir="${cocoon.src.dir}" filtering="off">
       <fileset dir="${src.cocoon.properties.dir}"/>
     </copy>
@@ -56,6 +56,7 @@
   <target name="prepare-cocoon" depends="check-cocoon" unless="gump.skipcocoonbuild">
     <copy todir="${build.webapp}" filtering="off">
       <fileset dir="${cocoon.webapp.dir}">
+        <exclude name="resources/**"/>
         <exclude name="*.xml"/>
         <exclude name="*.xslt"/>
         <exclude name="test-suite/**"/>

Modified: lenya/trunk/src/targets/properties-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/properties-build.xml?rev=178305&r1=178304&r2=178305&view=diff
==============================================================================
--- lenya/trunk/src/targets/properties-build.xml (original)
+++ lenya/trunk/src/targets/properties-build.xml Tue May 24 15:45:17 2005
@@ -101,7 +101,7 @@
   -->
   <property name="src.webapp.dir" value="src/webapp"/>
   <property name="tools.tasks.dest" value="tools/anttasks"/>
-  <property name="resource.dir"  value="${src.webapp.dir}/resources/css"/>
+  <property name="src.resource.dir"  value="src/resources"/>
   <!-- cocoon build properties directory -->
   <property name="src.cocoon.properties.dir" value="src/cocoon"/>
   <!-- hsqldb database config files directory -->



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org


Mime
View raw message