Update of /var/cvs/all
In directory james.mmbase.org:/tmp/cvs-serv4071
Modified Files:
install-dependency.xml
Log Message:
ported from didactor, didactor should somehow use this one
See also: http://cvs.mmbase.org/viewcvs/all
Index: install-dependency.xml
===================================================================
RCS file: /var/cvs/all/install-dependency.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- install-dependency.xml 16 Jul 2008 12:55:09 -0000 1.1
+++ install-dependency.xml 25 Jul 2008 13:23:07 -0000 1.2
@@ -6,12 +6,14 @@
<property name="download.dir" location="download" />
<property name="version" value="1.9.0-SNAPSHOT" />
<property name="prefix" value="mmbase-" />
- <property name="mmbase.templates.path" value="mmbase" />
+ <property name="mmbase.templates.path" value="mmbase/" />
<property name="base" value="mmbase" />
<property name="local.repository"
value="${user.home}/.maven/repository" />
<property name="remote.repository" value="http://www.mmbase.org/maven";
/>
<property name="remote.repository2"
value="http://repo1.maven.org/maven/"; />
+ <property name="mmbase.ignorefiles" value="templates/index.jsp" />
+
<target name="unzipdownloadzip" if="download.zip.present"
unless="download.dir.present">
<unzip src="${download.zip}" dest="${download.dir}" overwrite="false" />
@@ -45,7 +47,7 @@
<target name="testexpanded">
- <echo message="Testing for ${expandedfile}"/>
+ <echo level="debug" message="Testing for ${expandedfile}"/>
<available file="${expandedfile}" property="expanded"/>
</target>
@@ -77,7 +79,7 @@
</target>
<target name="install.module" depends="get.module">
- <echo message="${prefix}${name}-${version}" />
+ <echo level="debug" message="${prefix}${name}-${version}" />
<unzip src="${download.dir}/${prefix}${name}-${version}.mmbase-module"
dest="${dest}/mmbase/components/${name}">
<patternset>
<include name="blocks/**"/>
@@ -85,16 +87,16 @@
<mapper type="glob" from="blocks/*" to="*" />
</unzip>
<unzip src="${download.dir}/${prefix}${name}-${version}.mmbase-module"
dest="${dest}">
- <patternset>
+ <patternset excludes="${ignorefiles}">
<include name="templates/**"/>
</patternset>
- <mapper type="glob" from="templates/*" to="${mmbase.templates.path}/*" />
+ <mapper type="glob" from="templates/*" to="${mmbase.templates.path}*" />
</unzip>
<unzip src="${download.dir}/${prefix}${name}-${version}.mmbase-module"
dest="${dest}/WEB-INF/">
<patternset>
<include name="config/**"/>
</patternset>
- <mapper type="glob" from="config/*" to="*" />
+ <mapper type="glob" from="config/*" to="config/*" />
</unzip>
<unzip src="${download.dir}/${prefix}${name}-${version}.mmbase-module"
dest="${dest}/WEB-INF/lib">
<patternset>
@@ -110,11 +112,37 @@
</unzip>
</target>
- <target name="mmbase" depends="log4j,commons-fileupload">
- <antcall target="install.module">
+ <target name="install.module.minimalistic" depends="get.module">
+ <echo level="debug" message="${prefix}${name}-${version}" />
+ <unzip src="${download.dir}/${prefix}${name}-${version}.mmbase-module"
dest="${dest}/mmbase/components/${name}">
+ <patternset>
+ <include name="blocks/**"/>
+ </patternset>
+ <mapper type="glob" from="blocks/*" to="*" />
+ </unzip>
+ <unzip src="${download.dir}/${prefix}${name}-${version}.mmbase-module"
dest="${dest}">
+ <patternset excludes="${ignorefiles}">
+ <include name="templates/**"/>
+ </patternset>
+ <mapper type="glob" from="templates/*" to="${mmbase.templates.path}*" />
+ </unzip>
+ <unzip src="${download.dir}/${prefix}${name}-${version}.mmbase-module"
dest="${dest}/WEB-INF/lib">
+ <patternset>
+ <include name="lib/**"/>
+ </patternset>
+ <mapper type="glob" from="lib/*" to="*" />
+ </unzip>
+
+ </target>
+
+ <target name="mmbase" unless="mmbase.installed" depends="commons-fileupload">
+ <antcall target="install.module.minimalistic">
<param name="name" value="" />
<param name="prefix" value="mmbase" />
+ <param name="mmbase.templates.path" value="" />
+ <param name="ignorefiles" value="${mmbase.ignorefiles}" />
</antcall>
+ <property name="mmbase.installed" value="yes" />
</target>
<target name="mmbase.jar">
@@ -123,23 +151,71 @@
</antcall>
</target>
- <target name="editwizard" depends="dove,mmbase">
+ <target name="editwizard" depends="dove,mmbase"
unless="editwizard.installed">
<antcall target="install.module">
<param name="name" value="editwizard" />
- <param name="mmbase.templates.path" value="mmbase/edit/wizard" />
+ <param name="mmbase.templates.path" value="mmbase/edit/wizard/" />
</antcall>
+ <property name="editwizard.installed" value="yes" />
</target>
- <target name="dove" depends="mmbase">
+ <target name="dove" depends="mmbase" unless="dove.installed">
<antcall target="install.module">
<param name="name" value="dove" />
</antcall>
+ <property name="dove.installed" value="yes" />
</target>
- <target name="taglib" depends="mmbase,jstl">
+ <target name="taglib" depends="mmbase,jstl" unless="taglib.installed">
<antcall target="install.module">
<param name="name" value="taglib" />
</antcall>
+ <property name="taglib.installed" value="yes" />
+ </target>
+
+ <target name="crontab" depends="mmbase" unless="crontab.installed">
+ <antcall target="install.module">
+ <param name="name" value="crontab" />
+ </antcall>
+ <property name="crontab.installed" value="yes" />
+ </target>
+
+ <target name="email" depends="mmbase">
+ <antcall target="install.module">
+ <param name="name" value="email" />
+ </antcall>
+ </target>
+
+ <target name="clustering" depends="mmbase">
+ <antcall target="install.module">
+ <param name="name" value="clustering" />
+ </antcall>
+ </target>
+
+ <target name="resources" depends="mmbase">
+ <antcall target="install.module">
+ <param name="name" value="resources" />
+ </antcall>
+ </target>
+
+ <target name="jumpers" depends="mmbase">
+ <antcall target="install.module">
+ <param name="name" value="jumpers" />
+ </antcall>
+ </target>
+
+ <target name="richtext" depends="mmbase" unless="richtext.installed">
+ <antcall target="install.module">
+ <param name="name" value="richtext" />
+ </antcall>
+ <property name="richtext.installed" value="yes" />
+ </target>
+
+
+ <target name="searchrelate" depends="mmbase,jstl">
+ <antcall target="install.module">
+ <param name="name" value="searchrelate" />
+ </antcall>
</target>
<target name="rmmci-client">
@@ -154,15 +230,16 @@
<param name="file" value="${base}/jars/${name}-${version}.jar" />
<param name="destfile" value="${name}-${version}.jar" />
</antcall>
- <copy file="${download.dir}/${name}-${version}.jar" todir="${dest}"
preservelastmodified="true" overwrite="false" failonerror="false" />
+ <copy file="${download.dir}/${name}-${version}.jar" todir="${jardest}"
preservelastmodified="true" overwrite="false" failonerror="false" />
</target>
- <target name="log4j">
+ <target name="log4j" unless="log4j.installed">
<antcall target="install.jar">
<param name="name" value="log4j" />
<param name="base" value="log4j" />
<param name="version" value="1.2.13" />
</antcall>
+ <property name="log4j.installed" value="yes" />
</target>
<target name="junit">
@@ -173,12 +250,18 @@
</antcall>
</target>
- <target name="jstl">
+ <target name="jstl" unless="jstl.installed">
<antcall target="install.jar">
<param name="name" value="jstl" />
<param name="base" value="jstl" />
<param name="version" value="1.1.2" />
</antcall>
+ <antcall target="install.jar">
+ <param name="name" value="standard" />
+ <param name="base" value="taglibs" />
+ <param name="version" value="1.1.2" />
+ </antcall>
+ <property name="jstl.installed" value="yes" />
</target>
@@ -200,22 +283,31 @@
- <target name="commons-fileupload">
+ <target name="commons-fileupload" unless="fileupload.installed">
<antcall target="install.jar">
<param name="name" value="commons-fileupload" />
<param name="base" value="commons-fileupload" />
<param name="version" value="1.0" />
</antcall>
+ <property name="fileupload.installed" value="yes" />
</target>
- <target name="oscache">
+ <target name="oscache" unless="oscache.installed">
<antcall target="install.jar">
<param name="name" value="oscache" />
<param name="base" value="opensymphony" />
<param name="version" value="2.4.1" />
</antcall>
+ <antcall target="install.jar">
+ <param name="name" value="commons-logging" />
+ <param name="base" value="commons-logging" />
+ <param name="version" value="1.1" />
+ </antcall>
+ <property name="oscache.installed" value="yes" />
</target>
- <target name="minimalistic" depends="mmbase,taglib,oscache" />
+ <target name="minimalistic" depends="mmbase,taglib,oscache,log4j"
unless="minimalistic.installed">
+ <property name="minimalistic.installed" value="yes" />
+ </target>
</project>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
