Fix TARGET_JVM scripts.

svn path=/trunk/mono-basic/; revision=68248
mono · Nov 21, 2006 · 5a3f926 · 5a3f926
1 parent 13513eb
commit 5a3f926
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/vbruntime/VB.replace.bat b/vbruntime/VB.replace.bat
@@ -1,4 +1,4 @@
-echo off
+echo on
 echo ====================================
 echo = 	Replace Microsoft.VisualBasic.dll at the GAC
 echo =	
@@ -11,7 +11,7 @@ echo Get batch command parameters.
 SET VB_BUILD_PARAM_NET_VERSION="%1"
 
 echo Set command parameters default.
-IF %VB_BUILD_PARAM_NET_VERSION%=="" SET VB_BUILD_PARAM_NET_VERSION=1
+IF %VB_BUILD_PARAM_NET_VERSION%=="" SET VB_BUILD_PARAM_NET_VERSION="1"
 
 echo Set .NET SDK env.
 IF %VB_BUILD_PARAM_NET_VERSION%=="1" (
@@ -22,11 +22,17 @@ IF NOT DEFINED VSINSTALLDIR call "%VS80COMNTOOLS%vsvars32.bat"
 )
 SET NET_FRAMEWORK_PATH=%FRAMEWORKDIR%\%FRAMEWORKVERSION%\
 
+IF %VB_BUILD_PARAM_NET_VERSION%=="1" (
+SET GACUTIL="%NET_FRAMEWORK_PATH%gacutil"
+)
+IF %VB_BUILD_PARAM_NET_VERSION%=="2" (
+SET GACUTIL="%VSINSTALLDIR%\SDK\v2.0\Bin\gacutil"
+)
 pushd bin
 sn -Vr Microsoft.VisualBasic.dll
 IF %ERRORLEVEL% NEQ 0 GOTO EXCEPTION
 
-%NET_FRAMEWORK_PATH%gacutil -i Microsoft.VisualBasic.dll -f
+%GACUTIL% -i Microsoft.VisualBasic.dll -f
 IF %ERRORLEVEL% NEQ 0 GOTO EXCEPTION
 popd
 

diff --git a/vbruntime/VB.restore.bat b/vbruntime/VB.restore.bat
@@ -22,8 +22,15 @@ IF NOT DEFINED VSINSTALLDIR call "%VS80COMNTOOLS%vsvars32.bat"
 )
 SET NET_FRAMEWORK_PATH=%FRAMEWORKDIR%\%FRAMEWORKVERSION%\
 
+
+IF %VB_BUILD_PARAM_NET_VERSION%=="1" (
+SET GACUTIL="%NET_FRAMEWORK_PATH%gacutil"
+)
+IF %VB_BUILD_PARAM_NET_VERSION%=="2" (
+SET GACUTIL="%VSINSTALLDIR%\SDK\v2.0\Bin\gacutil"
+)
 pushd %NET_FRAMEWORK_PATH%
-del Microsoft.VisualBasic.dll
+IF EXIST Microsoft.VisualBasic.orig del Microsoft.VisualBasic.dll
 IF %ERRORLEVEL% NEQ 0 GOTO EXCEPTION
 
 ren Microsoft.VisualBasic.orig Microsoft.VisualBasic.dll