Fix bootstrap under windows.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345219 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Emmanuel Venisse 2005-11-17 10:27:31 +00:00
parent e30e6ca949
commit e5320b624d
2 changed files with 4 additions and 6 deletions

View File

@ -31,7 +31,7 @@
@REM ---------------------------------------------------------------------------- @REM ----------------------------------------------------------------------------
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' @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' @REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% @if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
@ -138,6 +138,8 @@ cd maven-core-it-verifier
cd .. cd ..
del bootstrap\bootstrap-mini.jar
echo echo
echo ----------------------------------------------------------------------- echo -----------------------------------------------------------------------
echo Running integration tests echo Running integration tests
@ -146,8 +148,6 @@ cd maven-core-it
call maven-core-it %MAVEN_CMD_LINE_ARGS% call maven-core-it %MAVEN_CMD_LINE_ARGS%
cd .. cd ..
del bootstrap\bootstrap-mini.jar
:end :end
@REM set local scope for the variables with windows NT shell @REM set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" goto endNT if "%OS%"=="Windows_NT" goto endNT

View File

@ -10,12 +10,10 @@ if exist %buildDir% rmdir /S/Q %buildDir%
mkdir %buildDir% mkdir %buildDir%
mkdir %classesDir% mkdir %classesDir%
del bootstrap-mini.jar
dir /B /s %srcDir%\*.java >sources dir /B /s %srcDir%\*.java >sources
"%JAVA_HOME%\bin\javac" -d %classesDir% @sources "%JAVA_HOME%\bin\javac" -d %classesDir% @sources
del /F/Q sources del /F/Q sources
cd %classesDir% 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 ..\.. cd ..\..