maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject svn commit: r587358 - in /maven/components/branches/maven-2.0.x/maven-core/src/bin: mvnDebug mvnDebug.bat
Date Tue, 23 Oct 2007 01:49:32 GMT
Author: brianf
Date: Mon Oct 22 18:49:25 2007
New Revision: 587358

URL: http://svn.apache.org/viewvc?rev=587358&view=rev
Log:
more reliable debug scripts. these don't change the eternal values so that terminated scripts
won't cause problems.

Modified:
    maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug
    maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat

Modified: maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug?rev=587358&r1=587357&r2=587358&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug Mon Oct 22 18:49:25
2007
@@ -33,8 +33,7 @@
 #       set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
 # ----------------------------------------------------------------------------
 
-ORIG_MAVEN_OPTS=$MAVEN_OPTS
-MAVEN_OPTS=$ORIG_MAVEN_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+INT_MAVEN_OPTS=$MAVEN_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
 
 echo Preparing to Execute Maven in Debug Mode
 
@@ -160,10 +159,9 @@
 fi
 
 exec "$JAVACMD" \
-  $MAVEN_OPTS \
+  $INT_MAVEN_OPTS \
   -classpath "${M2_HOME}"/boot/classworlds-*.jar \
   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
   "-Dmaven.home=${M2_HOME}"  \
   ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
 
- MAVEN_OPTS=$ORIG_MAVEN_OPTS

Modified: maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat?rev=587358&r1=587357&r2=587358&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat Mon Oct 22 18:49:25
2007
@@ -32,8 +32,7 @@
 @REM set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
 @REM ----------------------------------------------------------------------------
 
-set ORIG_MAVEN_OPTS=%MAVEN_OPTS%
-set MAVEN_OPTS=%ORIG_MAVEN_OPTS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+set INT_MAVEN_OPTS=%MAVEN_OPTS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
 @echo Preparing to Execute Maven in Debug Mode
 
 @REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@@ -145,7 +144,7 @@
 @REM Start MAVEN2
 :runm2
 
-%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf"
"-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %INT_MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf"
"-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
 if ERRORLEVEL 1 goto error
 goto end
 
@@ -172,6 +171,6 @@
 if "%MAVEN_BATCH_PAUSE%" == "on" pause
 
 if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-set MAVEN_OPTS=%ORIG_MAVEN_OPTS%
+
 exit /B %ERROR_CODE%
 



Mime
View raw message