Update of /var/cvs/speeltuin/ernst/vpro-wizards
In directory james.mmbase.org:/tmp/cvs-serv16798/applications/vpro-wizards
Modified Files:
build.xml build.properties.default
Log Message:
the ant build no longer copies the fckeditor into the /templates dir.
See also: http://cvs.mmbase.org/viewcvs/speeltuin/ernst/vpro-wizards
Index: build.xml
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- build.xml 22 Oct 2008 11:45:06 -0000 1.8
+++ build.xml 27 Oct 2008 14:43:24 -0000 1.9
@@ -4,7 +4,7 @@
<property name="project.package"
value="org/mmbase/applications/vpro-wizards" />
<property name="project.comment" value="The VPRO wizard toolkit for
MMBase" />
- <property name="project.jars.includes"
value="spring.jar,spring-webmvc.jar,spring-test.jar,collections-generic*.jar,commons-collections*.jar,commons-fileupload*.jar,commons-lang*.jar,oscache*.jar,nekohtml*.jar,xercesImpl.jar"
/>
+ <property name="project.jars.includes"
value="spring.jar,spring-webmvc.jar,collections-generic*.jar,commons-collections*.jar,commons-fileupload*.jar,commons-lang*.jar,oscache*.jar,nekohtml*.jar,xercesImpl.jar"
/>
<property name="project.jars.dir" location="build" />
<property name="java.source.version" value="1.5" />
@@ -20,18 +20,20 @@
</target>
<target name="compile" depends="vpro-wizards.jars,buildbase.compile" />
- <target name="install.templates"
depends="vpro-wizards.jars,buildbase.install.templates" />
<!-- copy the web.xml fragment too-->
<target name="install" depends="buildbase.install" >
<copy tofile="${webapp.dir}/WEB-INF/vprowizards.web.xml"
file="WEB-INF/web.fragment.xml" />
</target>
- <target name="clean" depends="buildbase.clean">
- <delete dir="${fckeditor.destination}"/>
+ <!-- copy thefck editors into the templates folder fragment too-->
+ <target name="install.templates"
depends="vpro-wizards.jars,buildbase.install.templates" >
+ <copy todir="${fckeditor.destination}" preservelastmodified="true">
+ <fileset dir="${expand.dir}/fckeditor" />
+ </copy>
+ <copy file="ext/fckconfig.js" todir="${fckeditor.destination}"/>
</target>
-
<!--copy all the resources to the classes dir, so they become part of
the jar-->
<target name="copy.resources">
<copy todir="${project.build.dir}/classes">
@@ -78,10 +80,10 @@
<antcall target="downloadzip">
<param name="sourcefile" value="${fckeditor.url}" />
<param name="destfile"
value="${download.dir}/${fckeditor.file}" />
- <param name="destdir"
value="templates/system/javascript/" />
- <param name="expandedfile"
value="templates/system/javascript/CFKeditor" />
+ <param name="destdir" value="${expand.dir}" />
+ <param name="expandedfile"
value="${expand.dir}/${fckeditor.file}" />
</antcall>
- <copy file="ext/fckconfig.js" todir="${fckeditor.destination}"/>
+
<!--commons lang-->
<echo message="download commons-lang" />
Index: build.properties.default
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/build.properties.default,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- build.properties.default 22 Oct 2008 11:45:06 -0000 1.5
+++ build.properties.default 27 Oct 2008 14:43:24 -0000 1.6
@@ -44,5 +44,5 @@
fckeditor.version=2.6.3
fckeditor.file=${fckeditor.name}_${fckeditor.version}.zip
fckeditor.url=http://surfnet.dl.sourceforge.net/sourceforge/fckeditor/${fckeditor.file}
-fckeditor.destination=templates/system/javascript/fckeditor
+fckeditor.destination=${templates.dir}/${project.target.templates.dir}/system/javascript/fckeditor
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
