svn commit: r739147 - in /maven/components/trunk/apache-maven/src: bin/mvnUpdate bin/mvnUpdate.bat main/assembly/bin.xml

[og...@apache.org]

Author: ogusakov
Date: Fri Jan 30 02:39:23 2009
New Revision: 739147

URL: http://svn.apache.org/viewvc?rev=739147&view=rev
Log:
[MNG-3962] - moved self-update into bin/.cd

Modified:
    maven/components/trunk/apache-maven/src/bin/mvnUpdate
    maven/components/trunk/apache-maven/src/bin/mvnUpdate.bat
    maven/components/trunk/apache-maven/src/main/assembly/bin.xml

Modified: maven/components/trunk/apache-maven/src/bin/mvnUpdate
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/bin/mvnUpdate?rev=739147&r1=739146&r2=739147&view=diff
==============================================================================
--- maven/components/trunk/apache-maven/src/bin/mvnUpdate (original)
+++ maven/components/trunk/apache-maven/src/bin/mvnUpdate Fri Jan 30 02:39:23 2009
@@ -156,7 +156,7 @@
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
-  -jar "${M2_HOME}"/.cd/bin/*.jar \
+  -jar "${M2_HOME}"/bin/.cd/bin/*.jar \
   -m "${M2_HOME}"  \
   $QUOTED_ARGS
 

Modified: maven/components/trunk/apache-maven/src/bin/mvnUpdate.bat
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/bin/mvnUpdate.bat?rev=739147&r1=739146&r2=739147&view=diff
==============================================================================
--- maven/components/trunk/apache-maven/src/bin/mvnUpdate.bat (original)
+++ maven/components/trunk/apache-maven/src/bin/mvnUpdate.bat Fri Jan 30 02:39:23 2009
@@ -144,7 +144,7 @@
 if "%@eval[2+2]" == "4" goto 4NTCWJars
 
 @REM -- Regular WinNT shell
-for %%i in ("%M2_HOME%"\.cd\bin\*.jar) do set UPDATE_JAR="%%i"
+for %%i in ("%M2_HOME%"\bin\.cd\bin\*.jar) do set UPDATE_JAR="%%i"
 goto runm2
 
 @REM The 4NT Shell from jp software

Modified: maven/components/trunk/apache-maven/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/apache-maven/src/main/assembly/bin.xml?rev=739147&r1=739146&r2=739147&view=diff
==============================================================================
--- maven/components/trunk/apache-maven/src/main/assembly/bin.xml (original)
+++ maven/components/trunk/apache-maven/src/main/assembly/bin.xml Fri Jan 30 02:39:23 2009
@@ -61,7 +61,7 @@
       </excludes>
     </dependencySet>
     <dependencySet>
-      <outputDirectory>.cd/bin</outputDirectory>
+      <outputDirectory>bin/.cd/bin</outputDirectory>
       <includes>
         <include>org.sonatype.mercury:mercury-mp3-cli</include>
       </includes>
@@ -105,7 +105,7 @@
     </fileSet>
     <fileSet>
       <directory>src/.cd</directory>
-      <outputDirectory>.cd</outputDirectory>
+      <outputDirectory>bin/.cd</outputDirectory>
     </fileSet>
   </fileSets>
 </assembly>