From e5320b624d7299bb2fc18edda2c07f9d11767fc0 Mon Sep 17 00:00:00 2001 From: Emmanuel Venisse Date: Thu, 17 Nov 2005 10:27:31 +0000 Subject: [PATCH] Fix bootstrap under windows. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345219 13f79535-47bb-0310-9956-ffa450edef68 --- bootstrap.bat | 6 +++--- bootstrap/bootstrap-mini/build.bat | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bootstrap.bat b/bootstrap.bat index 7057a1b988..4dd482ee52 100644 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -31,7 +31,7 @@ @REM ---------------------------------------------------------------------------- @REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo on +@echo off @REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' @if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% @@ -138,6 +138,8 @@ cd maven-core-it-verifier cd .. +del bootstrap\bootstrap-mini.jar + echo echo ----------------------------------------------------------------------- echo Running integration tests @@ -146,8 +148,6 @@ cd maven-core-it call maven-core-it %MAVEN_CMD_LINE_ARGS% cd .. -del bootstrap\bootstrap-mini.jar - :end @REM set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" goto endNT diff --git a/bootstrap/bootstrap-mini/build.bat b/bootstrap/bootstrap-mini/build.bat index 0a06a58fa7..fe4751d009 100644 --- a/bootstrap/bootstrap-mini/build.bat +++ b/bootstrap/bootstrap-mini/build.bat @@ -10,12 +10,10 @@ if exist %buildDir% rmdir /S/Q %buildDir% mkdir %buildDir% mkdir %classesDir% -del bootstrap-mini.jar - dir /B /s %srcDir%\*.java >sources "%JAVA_HOME%\bin\javac" -d %classesDir% @sources del /F/Q sources cd %classesDir% -"%JAVA_HOME%\bin\jar" -cfm ..\..\bootstrap-mini.jar ..\..\src\main\resources\META-INF\MANIFEST.MF *.* +"%JAVA_HOME%\bin\jar" -cfm ..\bootstrap-mini.jar ..\..\src\main\resources\META-INF\MANIFEST.MF *.* cd ..\..