[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] pnetlib/Basic Basic.build, 1.6, 1.7 S.cs, 1.1, 1.
From: |
Rhys Weatherley <address@hidden> |
Subject: |
[Dotgnu-pnet-commits] pnetlib/Basic Basic.build, 1.6, 1.7 S.cs, 1.1, 1.2 |
Date: |
Mon, 13 Oct 2003 01:36:29 +0000 |
Update of /cvsroot/dotgnu-pnet/pnetlib/Basic
In directory subversions:/tmp/cvs-serv8469/Basic
Modified Files:
Basic.build S.cs
Log Message:
Add missing resources for the "Microsoft.VisualBasic" assembly.
Index: Basic.build
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Basic/Basic.build,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Basic.build 19 Sep 2003 05:23:09 -0000 1.6
--- Basic.build 13 Oct 2003 01:36:27 -0000 1.7
***************
*** 23,32 ****
</references>
- <!--
<resources>
<includes if="${CONFIG_RUNTIME_INFRA}"
!
name="../resources/en_US/Microsoft.VisualBasic/Microsoft.VisualBasic.resources"/>
</resources>
- -->
<arg compiler="cscc" value="-Wno-empty-input"/>
--- 23,30 ----
</references>
<resources>
<includes if="${CONFIG_RUNTIME_INFRA}"
!
name="../resources/en_US/Basic/Microsoft.VisualBasic.resources"/>
</resources>
<arg compiler="cscc" value="-Wno-empty-input"/>
Index: S.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Basic/S.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** S.cs 16 May 2003 05:35:00 -0000 1.1
--- S.cs 13 Oct 2003 01:36:27 -0000 1.2
***************
*** 26,30 ****
// This class provides string resource support to the rest
! // of the System.Drawing library assembly. It is accessed using
// the "S._(tag)" convention.
--- 26,30 ----
// This class provides string resource support to the rest
! // of the Microsoft.VisualBasic library assembly. It is accessed using
// the "S._(tag)" convention.
***************
*** 35,38 ****
--- 35,40 ----
// Cached copy of the resources for this assembly and mscorlib.
+ // We avoid loading the mscorlib resources in non-ECMA mode,
+ // so that the assembly can be used with other CLR's.
#if ECMA_COMPAT
private static ECMAResourceManager ourResources = null;
***************
*** 40,44 ****
#else
private static ResourceManager ourResources = null;
- private static ResourceManager runtimeResources = null;
#endif
--- 42,45 ----
***************
*** 67,82 ****
}
// Try the fallbacks in the runtime
library.
if(runtimeResources == null)
{
- #if ECMA_COMPAT
runtimeResources = new
ECMAResourceManager
("runtime",
(typeof(String)).Assembly);
- #else
- runtimeResources = new
ResourceManager
- ("runtime",
(typeof(String)).Assembly);
- #endif
}
return runtimeResources.GetString(tag,
null);
}
}
--- 68,82 ----
}
+ #if ECMA_COMPAT
// Try the fallbacks in the runtime
library.
if(runtimeResources == null)
{
runtimeResources = new
ECMAResourceManager
("runtime",
(typeof(String)).Assembly);
}
return runtimeResources.GetString(tag,
null);
+ #else
+ return tag;
+ #endif
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] pnetlib/Basic Basic.build, 1.6, 1.7 S.cs, 1.1, 1.2,
Rhys Weatherley <address@hidden> <=
- Prev by Date:
[Dotgnu-pnet-commits] pnetlib ChangeLog, 1.1405, 1.1406 configure.in, 1.97, 1.98
- Next by Date:
[Dotgnu-pnet-commits] pnetlib/Basic/CompilerServices ObjectType.cs, 1.5, 1.6 Utils.cs, 1.4, 1.5
- Previous by thread:
[Dotgnu-pnet-commits] pnetlib ChangeLog, 1.1405, 1.1406 configure.in, 1.97, 1.98
- Next by thread:
[Dotgnu-pnet-commits] pnetlib/Basic/CompilerServices ObjectType.cs, 1.5, 1.6 Utils.cs, 1.4, 1.5
- Index(es):