Author: rafim
Date: 2006-10-09 04:12:45 -0400 (Mon, 09 Oct 2006)
New Revision: 66441
Modified:
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb
trunk/mono-basic/vbruntime/TODO.txt
trunk/mono-basic/vbruntime/VB.J2EE.build.bat
trunk/mono-basic/vbruntime/VB.build.bat
Log:
Adjust the VB.J2EE.build.bat to support converting VB2.0 to J2EE
Modified:
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb
===================================================================
---
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb
2006-10-09 07:33:14 UTC (rev 66440)
+++
trunk/mono-basic/vbruntime/Microsoft.VisualBasic/Microsoft.VisualBasic.ApplicationServices/WindowsFormsApplicationBase.vb
2006-10-09 08:12:45 UTC (rev 66441)
@@ -30,71 +30,77 @@
#if NET_2_0
Imports System
Imports System.Threading
+#If TARGET_JVM = False Then 'Windows.Forms Not Supported by Grasshopper
Imports System.Windows.Forms
-
+#End If
+
Namespace Microsoft.VisualBasic.ApplicationServices
-
- Public Class WindowsFormsApplicationBase
- Inherits ConsoleApplicationBase
- Public Sub New()
- End Sub
-
- Public Sub New(ByVal mode As AuthenticationMode)
- End Sub
-
- Protected Shared ReadOnly Property UseCompatibleTextRendering()
As Boolean
- Get
- Return False
- End Get
- End Property
-
+
+ Public Class WindowsFormsApplicationBase
+ Inherits ConsoleApplicationBase
+ Public Sub New()
+ End Sub
+
+ Public Sub New(ByVal mode As AuthenticationMode)
+ End Sub
+
+ Protected Shared ReadOnly Property UseCompatibleTextRendering() As
Boolean
+ Get
+ Return False
+ End Get
+ End Property
+
'<MonoTODO("We ignore the commandLine argument")> _
Public Sub Run(ByVal commandLine() As String)
+#If TARGET_JVM = False Then 'Not Supported by Grasshopper
Throw New Exception("Visual Basic 2005 applications are not
supported")
Application.Run()
+#Else
+ Throw New NotImplementedException
+#End If
End Sub
-
- Dim is_single_instance As Boolean = False
- Protected Property IsSingleInstance() As Boolean
- Get
- Return is_single_instance
- End Get
- Set (ByVal Value As Boolean)
- is_single_instance = value
- End Set
- End Property
-
- Dim enable_visual_styles As Boolean = False
- Protected Property EnableVisualStyles() As Boolean
- Get
- Return enable_visual_styles
- End Get
- Set (ByVal Value As Boolean)
- enable_visual_styles = value
- End Set
- End Property
-
- Dim save_my_settings_on_exit As Boolean = False
- Protected Property SaveMySettingsOnExit() As Boolean
- Get
- Return save_my_settings_on_exit
- End Get
- Set (ByVal Value As Boolean)
- save_my_settings_on_exit = value
- End Set
- End Property
-
- Dim shutdown_style As ShutdownMode
- Protected Property ShutdownStyle() As ShutdownMode
- Get
- Return shutdown_style
- End Get
- Set (ByVal Value As ShutdownMode)
- shutdown_style = value
- End Set
- End Property
- End Class
+
+ Dim is_single_instance As Boolean = False
+ Protected Property IsSingleInstance() As Boolean
+ Get
+ Return is_single_instance
+ End Get
+ Set(ByVal Value As Boolean)
+ is_single_instance = Value
+ End Set
+ End Property
+
+ Dim enable_visual_styles As Boolean = False
+ Protected Property EnableVisualStyles() As Boolean
+ Get
+ Return enable_visual_styles
+ End Get
+ Set(ByVal Value As Boolean)
+ enable_visual_styles = Value
+ End Set
+ End Property
+
+ Dim save_my_settings_on_exit As Boolean = False
+ Protected Property SaveMySettingsOnExit() As Boolean
+ Get
+ Return save_my_settings_on_exit
+ End Get
+ Set(ByVal Value As Boolean)
+ save_my_settings_on_exit = Value
+ End Set
+ End Property
+
+ Dim shutdown_style As ShutdownMode
+ Protected Property ShutdownStyle() As ShutdownMode
+ Get
+ Return shutdown_style
+ End Get
+ Set(ByVal Value As ShutdownMode)
+ shutdown_style = Value
+ End Set
+ End Property
+ End Class
End Namespace
-
+
#End If
Modified: trunk/mono-basic/vbruntime/TODO.txt
===================================================================
--- trunk/mono-basic/vbruntime/TODO.txt 2006-10-09 07:33:14 UTC (rev 66440)
+++ trunk/mono-basic/vbruntime/TODO.txt 2006-10-09 08:12:45 UTC (rev 66441)
@@ -12,7 +12,6 @@
Unit tests TODO
====================
* vbnc tests status - run the 3 test suites using the VB dll compiled with
vbnc.
-* clenaups - merge the NUnit tests from Test\OldTests\Microsoft.VisualBasic
into the NUnit files at \Test
* build - Integrate the tests into the mono build system.
====================
@@ -61,5 +60,4 @@
======================
Grasshopper Java TODO
======================
-* J2EE - Convert Microsoft.VisualBasic.dll into J2EE (Grasshopper 2.0) jar.
* run vbnc test suite using Grasshopper 2.0
\ No newline at end of file
Modified: trunk/mono-basic/vbruntime/VB.J2EE.build.bat
===================================================================
--- trunk/mono-basic/vbruntime/VB.J2EE.build.bat 2006-10-09 07:33:14 UTC
(rev 66440)
+++ trunk/mono-basic/vbruntime/VB.J2EE.build.bat 2006-10-09 08:12:45 UTC
(rev 66441)
@@ -5,13 +5,21 @@
echo = NOTE: firest, build the Microsoft.VisualBasic.dll using the
TARGET_JVM=True define flag.
echo =
echo = sample usage:
-echo = VB.J2EE.build.bat
+echo = VB.J2EE.build.bat 2 debug
echo =
echo ====================================
+echo Get batch command parameters.
+SET VB_BUILD_PARAM_NET_VERSION=%1
+SET VB_BUILD_PARAM_CONFIGURATION=%2
+echo Set command parameters default.
+IF %VB_BUILD_PARAM_NET_VERSION%=="" SET VB_BUILD_PARAM_NET_VERSION=2
+IF %VB_BUILD_PARAM_CONFIGURATION%=="" SET VB_BUILD_PARAM_CONFIGURATION=debug
+
+echo Build the .NET assembly which will be converted into java.
SET VB_COMPILE_OPTIONS_J2EE=/define:TARGET_JVM=True
-call VB.build.bat 1 debug
+call VB.build.bat %VB_BUILD_PARAM_NET_VERSION% %VB_BUILD_PARAM_CONFIGURATION%
IF %ERRORLEVEL% NEQ 0 GOTO EXCEPTION
rem ====================================
@@ -26,7 +34,13 @@
rem = Grasshopper variables and jars
rem ===========================
+IF %VB_BUILD_PARAM_NET_VERSION%=="1" (
SET VMW4J2EE_DIR=C:\Program Files\Mainsoft\Visual MainWin for J2EE
+)
+IF %VB_BUILD_PARAM_NET_VERSION%=="2" (
+SET VMW4J2EE_DIR=C:\Program Files\Mainsoft\Visual MainWin for J2EE V2
+)
+
SET VMW4J2EE_JGAC_DIR=jgac\vmw4j2ee_110
SET VMW4J2EE_JGAC_JARS="%VMW4J2EE_DIR%\%VMW4J2EE_JGAC_DIR%\mscorlib.jar"
@@ -37,9 +51,9 @@
SET
VMW4J2EE_JGAC_JARS=%VMW4J2EE_JGAC_JARS%;"%VMW4J2EE_DIR%\%VMW4J2EE_JGAC_DIR%\J2SE.Helpers.jar"
-SET NET_FRAMEWORK_DIR="%WINDIR%\Microsoft.NET\Framework\v1.1.4322"
-echo using NET_FRAMEWORK_DIR=%NET_FRAMEWORK_DIR%
-set path=%path%;%NET_FRAMEWORK_DIR%
+SET BUILD_NET_FRAMEWORK_DIR="%FRAMEWORKDIR%\%FRAMEWORKVERSION%"
+echo using BUILD_NET_FRAMEWORK_DIR=%BUILD_NET_FRAMEWORK_DIR%
+set path=%path%;%BUILD_NET_FRAMEWORK_DIR%
pushd bin
echo on
Modified: trunk/mono-basic/vbruntime/VB.build.bat
===================================================================
--- trunk/mono-basic/vbruntime/VB.build.bat 2006-10-09 07:33:14 UTC (rev
66440)
+++ trunk/mono-basic/vbruntime/VB.build.bat 2006-10-09 08:12:45 UTC (rev
66441)
@@ -1,4 +1,4 @@
-echo off
+rem echo off
echo ====================================
echo = Batch build Microsoft.VisualBasic.dll
echo =
@@ -12,6 +12,7 @@
echo ====================================
echo Get batch command parameters.
+echo Received parameters %1 %2
SET VB_BUILD_PARAM_NET_VERSION="%1"
SET VB_BUILD_PARAM_CONFIGURATION="%2"
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
