Author: borisk
Date: 2006-12-17 13:54:34 -0500 (Sun, 17 Dec 2006)
New Revision: 69628
Modified:
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/AssemblyInfo.vb
trunk/mono-basic/vbruntime/VB.J2EE.build.bat
trunk/mono-basic/vbruntime/VB.build.bat
Log:
TARGET_JVM fixes and workarounds.
Modified: trunk/mono-basic/vbruntime/Microsoft.VisualBasic/AssemblyInfo.vb
===================================================================
--- trunk/mono-basic/vbruntime/Microsoft.VisualBasic/AssemblyInfo.vb
2006-12-17 18:46:38 UTC (rev 69627)
+++ trunk/mono-basic/vbruntime/Microsoft.VisualBasic/AssemblyInfo.vb
2006-12-17 18:54:34 UTC (rev 69628)
@@ -74,5 +74,7 @@
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyDelaySign(True)>
+#If TARGET_JVM = False Then
<Assembly: AssemblyKeyFile("msfinal.pub")>
+#End If
Modified: trunk/mono-basic/vbruntime/VB.J2EE.build.bat
===================================================================
--- trunk/mono-basic/vbruntime/VB.J2EE.build.bat 2006-12-17 18:46:38 UTC
(rev 69627)
+++ trunk/mono-basic/vbruntime/VB.J2EE.build.bat 2006-12-17 18:54:34 UTC
(rev 69628)
@@ -73,7 +73,7 @@
pushd bin
echo on
echo converting dll to jar without validator
-"%VMW4J2EE_DIR%\bin\jcsc.exe" %CD%\Microsoft.VisualBasic.dll /debug:3
/novalidator /out:%CD%\Microsoft.VisualBasic.jar
/classpath:%VMW4J2EE_JGAC_JARS%;%CD%\Microsoft.VisualBasic.jar
/lib:%CD%;"%VMW4J2EE_DIR%\jgac\jre5";"%VMW4J2EE_DIR%\jgac" >>%BUILD_LOG% 2<&1
+"%VMW4J2EE_DIR%\bin\jcsc.exe" %CD%\Microsoft.VisualBasic.dll /debug:3
/novalidator /out:%CD%\Microsoft.VisualBasic.jar
/classpath:%VMW4J2EE_JGAC_JARS%;%CD%\Microsoft.VisualBasic.jar
/lib:%CD%;"%VMW4J2EE_DIR%\jgac\jre5";"%VMW4J2EE_DIR%\jgac\vmw4j2ee_110"
>>%BUILD_LOG% 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO EXCEPTION
echo running java validator
"%JAVA_HOME%\bin\java.exe" -cp
.;..;"%VMW4J2EE_DIR%\bin\validator.jar";"%VMW4J2EE_DIR%\bin\bcel.jar";%VMW4J2EE_JGAC_JARS%;"%CD%\Microsoft.VisualBasic.jar"
-Xms256m -Xmx512m validator.Validator -jar:"%CD%\Microsoft.VisualBasic.jar"
>>%BUILD_LOG% 2<&1
Modified: trunk/mono-basic/vbruntime/VB.build.bat
===================================================================
--- trunk/mono-basic/vbruntime/VB.build.bat 2006-12-17 18:46:38 UTC (rev
69627)
+++ trunk/mono-basic/vbruntime/VB.build.bat 2006-12-17 18:54:34 UTC (rev
69628)
@@ -145,7 +145,7 @@
resgen strings.txt
rem TODO: replace vbc with C:\cygwin\monobuild\vbnc\vbnc\bin\vbnc.exe
echo on
-vbc -target:library -optionstrict+ -out:..\bin\Microsoft.VisualBasic.dll
-novbruntimeref %VB_COMPILE_OPTIONS% %VB_COMPILE_OPTIONS_J2EE% -r:mscorlib.dll
-r:System.dll -r:System.Windows.Forms.dll -r:System.Drawing.dll
-keyfile:msfinal.pub /res:strings.resources %VB_SOURCES%
+vbc -target:library -optionstrict+ -out:..\bin\Microsoft.VisualBasic.dll
-novbruntimeref %VB_COMPILE_OPTIONS% %VB_COMPILE_OPTIONS_J2EE% -r:mscorlib.dll
-r:System.dll -r:System.Windows.Forms.dll -r:System.Drawing.dll -r:"C:\Program
Files\Mainsoft\Visual MainWin for J2EE V2\jgac\vmw4j2ee_110\J2SE.Helpers.dll"
/res:strings.resources %VB_SOURCES% >>%BUILD_LOG% 2<&1
IF %ERRORLEVEL% NEQ 0 GOTO EXCEPTION
:FINALLY
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
