svn commit: r534251 - /maven/maven-1/core/trunk/maven.xml

[ah...@apache.org]

Author: aheritier
Date: Tue May  1 14:46:53 2007
New Revision: 534251

URL: http://svn.apache.org/viewvc?view=rev&rev=534251
Log:
Remove commented stuffs

Modified:
    maven/maven-1/core/trunk/maven.xml

Modified: maven/maven-1/core/trunk/maven.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/maven.xml?view=diff&rev=534251&r1=534250&r2=534251
==============================================================================
--- maven/maven-1/core/trunk/maven.xml (original)
+++ maven/maven-1/core/trunk/maven.xml Tue May  1 14:46:53 2007
@@ -123,9 +123,6 @@
       <ant:arg value="-e"/>
       <ant:env key="MAVEN_HOME" value="${installerDir}"/>
     </ant:exec>
-    <!-- Temporarily disabled - we cannot release this at Apache due to GPL libraries included
-    <attainGoal name="maven:build-seed-repo" />
--->
   </goal>
 
   <goal name="maven:build-plugin-profile" description="Generates the last versions list of plugins.">
@@ -150,25 +147,6 @@
     <ant:echo>Be careful to also update the document : ${maven.docs.src}/plugins/bundledHistory.xml</ant:echo>
   </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" description="Generate maven distributions (zip, tar, exe, ...)">
     <j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}"/>
     <j:set var="installerDir" value="${maven.build.dir}/installer/${tag}"/>
@@ -189,59 +167,12 @@
     <ant:zip zipfile="${maven.build.dir}/installer/${tag}.zip">
       <ant:zipfileset dir="${maven.build.dir}/installer" includes="${tag}/**"/>
     </ant:zip>
-    <!--
-    <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.nsis.build.dir" value="${installerDir}"/>
         <attainGoal name="nsis"/>
         <ant:copy tofile="${maven.build.dir}/installer/${pom.artifactId}-${pom.currentVersion}.exe" file="${maven.build.dir}/${maven.nsis.final.name}.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>