brett 2004/03/10 20:47:50
Modified: . Tag: MAVEN-1_0-BRANCH maven.xml
Log:
more on installation
Revision Changes Path
No revision
No revision
1.97.2.20 +71 -22 maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/maven.xml,v
retrieving revision 1.97.2.19
retrieving revision 1.97.2.20
diff -u -r1.97.2.19 -r1.97.2.20
--- maven.xml 10 Mar 2004 14:35:06 -0000 1.97.2.19
+++ maven.xml 11 Mar 2004 04:47:50 -0000 1.97.2.20
@@ -138,25 +138,7 @@
overwrite="yes"/>
</goal>
- <!-- ================================================================== -->
- <!-- I N S T A L L D E F A U L T G O A L -->
- <!-- ================================================================== -->
- <!-- This is meant to avoid having to bootstrap for such trivial things -->
- <!-- as modifying plugins or maven's code. -->
- <!-- ================================================================== -->
-
- <goal name="maven:install"
- description="Build and copy new plugins and a new maven jar to
${maven.home}">
-
- <attainGoal name="maven:plugins-install"/>
- <!--
- When we'll have online / offline mechanisms, we will check to see if
- we have to do anything related to the web.
- <attainGoal name="install:from-web"/>
- -->
- </goal>
-
- <goal name="maven:installer" prereqs="jar:jar">
+ <goal name="maven:build-install" prereqs="jar:jar">
<j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}" />
<j:set var="installerDir" value="${maven.build.dir}/installer/${tag}" />
<ant:delete dir="${installerDir}" />
@@ -216,7 +198,30 @@
/>
</j:if>
</j:forEach>
+ </goal>
+
+<!--
+ <goal name="maven:install">
+ <i:ask
+ question="Enter the installation directory (contents will be deleted): "
+ answer="newMavenHome"
+ />
+ <j:if test="${empty(newMavenHome)}">
+ <ant:fail>You must specify an installation directory</ant:fail>
+ </j:if>
+
+ <attainGoal name="maven:build-install" />
+ <ant:delete dir="${newMavenHome}" />
+ <ant:copy todir="${newMavenHome}">
+ <ant:fileset dir="${installerDir}" />
+ </ant:copy>
+ </goal>
+-->
+
+ <goal name="maven:installer" prereqs="maven:build-install">
+ <j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}" />
+ <j:set var="installerDir" value="${maven.build.dir}/installer/${tag}" />
<ant:tar longfile="gnu" tarfile="${maven.build.dir}/installer/${tag}.tar">
<ant:tarfileset dir="${installerDir}">
<ant:exclude name="**/maven"/>
@@ -240,16 +245,60 @@
<ant:delete file="${maven.build.dir}/installer/${tag}.tar"/>
- <!-- Create a zip file -->
- <ant:zip zipfile="${maven.build.dir}/installer/${tag}.zip">
- <ant:zipfileset dir="${installerDir}"/>
+<!--
+ <u:tokenize var="pluginList" delim=",">${maven.lite.plugins}</u:tokenize>
+
+ <j:set var="installerDirLite" value="${installerDir}-lite" />
+ <ant:copy todir="${installerDirLite}">
+ <ant:fileset dir="${installerDir}">
+ <ant:exclude name="plugins/**" />
+ </ant:fileset>
+ <ant:fileset dir="${installerDir}">
+ <j:forEach var="pluginName" items="${pluginList}">
+ <ant:include name="plugins/maven-${pluginName}-plugin-*.jar"/>
+ </j:forEach>
+ <ant:include name="plugins/project.xml" />
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:tar longfile="gnu" tarfile="${maven.build.dir}/installer/${tag}-lite.tar">
+ <ant:tarfileset dir="${installerDirLite}">
+ <ant:exclude name="**/maven"/>
+ <ant:exclude name="**/install_repo.sh"/>
+ </ant:tarfileset>
+ <ant:tarfileset dir="${installerDirLite}" mode="755">
+ <ant:include name="**/maven"/>
+ <ant:include name="**/install_repo.sh"/>
+ </ant:tarfileset>
+ </ant:tar>
+
+ <ant:bzip2
+ zipfile="${maven.build.dir}/installer/${tag}-lite.tar.bz2"
+ src="${maven.build.dir}/installer/${tag}-lite.tar"
+ />
+
+ <ant:gzip
+ zipfile="${maven.build.dir}/installer/${tag}-lite.tar.gz"
+ src="${maven.build.dir}/installer/${tag}-lite.tar"
+ />
+
+ <ant:delete file="${maven.build.dir}/installer/${tag}-lite.tar"/>
+
+ <ant:zip zipfile="${maven.build.dir}/installer/${tag}-lite.zip">
+ <ant:zipfileset dir="${installerDirLite}" />
</ant:zip>
+-->
<j:choose>
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
<j:set var="maven.dist.bin.assembly.dir" value="${installerDir}" />
<attainGoal name="nsis" />
<ant:copy
tofile="${maven.build.dir}/installer/${pom.artifactId}-${pom.currentVersion}.exe"
file="${maven.build.dir}/${pom.artifactId}.exe" />
+<!--
+ <j:set var="maven.dist.bin.assembly.dir" value="${installerDirLite}" />
+ <attainGoal name="nsis" />
+ <ant:copy
tofile="${maven.build.dir}/installer/${pom.artifactId}-${pom.currentVersion}-lite.exe"
file="${maven.build.dir}/${pom.artifactId}.exe" />
+-->
</j:when>
<j:otherwise>
<ant:echo>WARNING: nsis installer not generated. Run again on windows if
needed.</ant:echo>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
