[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnetlib/System.Configuration.Install Assembly
From: |
Rhys Weatherley <address@hidden> |
Subject: |
[Dotgnu-pnet-commits] CVS: pnetlib/System.Configuration.Install AssemblyInstaller.cs, 1.1, 1.2 S.cs, 1.1, 1.2 System.Configuration.Install.build, 1.1, 1.2 |
Date: |
Fri, 08 Aug 2003 21:53:33 -0400 |
Update of /cvsroot/dotgnu-pnet/pnetlib/System.Configuration.Install
In directory subversions:/tmp/cvs-serv5800/System.Configuration.Install
Modified Files:
AssemblyInstaller.cs S.cs System.Configuration.Install.build
Log Message:
Add the string resources for "System.Configuration.Install".
Index: AssemblyInstaller.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Configuration.Install/AssemblyInstaller.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** AssemblyInstaller.cs 9 Aug 2003 01:36:36 -0000 1.1
--- AssemblyInstaller.cs 9 Aug 2003 01:53:29 -0000 1.2
***************
*** 310,314 ****
}
throw new
InvalidOperationException
!
(S._("Installer_CouldNotLoadAssembly"), e);
}
}
--- 310,316 ----
}
throw new
InvalidOperationException
! (String.Format
!
(S._("Installer_CouldNotLoadAssembly"),
! filename), e);
}
}
Index: S.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Configuration.Install/S.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** S.cs 9 Aug 2003 01:36:36 -0000 1.1
--- S.cs 9 Aug 2003 01:53:29 -0000 1.2
***************
*** 37,44 ****
#if ECMA_COMPAT
private static ECMAResourceManager ourResources = null;
- private static ECMAResourceManager runtimeResources = null;
#else
private static ResourceManager ourResources = null;
- private static ResourceManager runtimeResources = null;
#endif
--- 37,42 ----
***************
*** 49,54 ****
{
String value;
-
- // Try the resources in this assembly
first.
if(ourResources == null)
{
--- 47,50 ----
***************
*** 61,82 ****
#endif
}
! value = ourResources.GetString(tag,
null);
! if(value != null)
! {
! return value;
! }
!
! // 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);
}
}
--- 57,61 ----
#endif
}
! return ourResources.GetString(tag,
null);
}
}
Index: System.Configuration.Install.build
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Configuration.Install/System.Configuration.Install.build,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** System.Configuration.Install.build 9 Aug 2003 01:36:36 -0000 1.1
--- System.Configuration.Install.build 9 Aug 2003 01:53:29 -0000 1.2
***************
*** 22,31 ****
</references>
- <!--
<resources>
<includes if="${CONFIG_RUNTIME_INFRA}"
name="../resources/en_US/System.Configuration.Install/System.Configuration.Install.resources"/>
</resources>
- -->
<arg compiler="cscc"
value="-fassembly-version=1.0.5000.0"/>
--- 22,29 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnetlib/System.Configuration.Install AssemblyInstaller.cs, 1.1, 1.2 S.cs, 1.1, 1.2 System.Configuration.Install.build, 1.1, 1.2,
Rhys Weatherley <address@hidden> <=
- Prev by Date:
[Dotgnu-pnet-commits] CVS: pnetlib/resources/en_US/System.Configuration.Install .cvsignore, NONE, 1.1 Installer.txt, NONE, 1.1 Makefile.am, NONE, 1.1
- Next by Date:
[Dotgnu-pnet-commits] CVS: pnetlib/resources/en_US/System.Configuration.Install - New directory
- Previous by thread:
[Dotgnu-pnet-commits] CVS: pnetlib/resources/en_US/System.Configuration.Install .cvsignore, NONE, 1.1 Installer.txt, NONE, 1.1 Makefile.am, NONE, 1.1
- Next by thread:
[Dotgnu-pnet-commits] CVS: pnetlib/resources/en_US/System.Configuration.Install - New directory
- Index(es):