View Issue Details [ Jump to Notes ] | [ Issue History ] [ Print ] |
ID | Project | Category | View Status | Date Submitted | Last Update |
0006109 | opensim | [MISC] Compiling / Building | public | 2012-07-27 02:32 | 2012-12-16 06:18 |
|
Reporter | orenh | |
Assigned To | justincc | |
Priority | normal | Severity | minor | Reproducibility | N/A |
Status | closed | Resolution | fixed | |
Platform | | Operating System | | Operating System Version | |
Product Version | master (dev code) | |
Target Version | master (dev code) | Fixed in Version | | |
|
Summary | 0006109: [PATCH] Use the same log4net.dll as OpenMetaverse |
Description | Copied the log4net.dll file from OpenMetaverse to OpenSim. This solves the problem where errors that happen in OpenMetaverse aren't logged, and instead we get errors about OpenMetaverse.Logger. |
Steps To Reproduce | Cause OpenMetaverse to log an error, and you'll see that it logs an unrelated error about OpenMetaverse.Logger because it can't load log4net.
For example: http://opensimulator.org/mantis/view.php?id=5358 [^] |
Additional Information | The problem was that we were using a slightly different version of log4net.dll than OpenMetaverse, so whenever OpenMetaverse tried to write to the log it failed and produced an assembly error instead. The two versions of log4net are basically the same (version 1.2.10.0): the only difference is that the version in OpenSim had a publickey, and the version in OpenMetaverse does not.
Here are a few more details. The log4net.dll in OpenSim was taken directly from the log4net site. It includes a publickey, and was compiled for .NET 2.0. The log4net.dll in OpenMetaverse isn't on the log4net site (not now, anyway): perhaps it was compiled separately. It's compiled for .NET 3.5, and doesn't include a publickey.
If you compare the manifests (using ildasm.exe) then you can see the difference:
1. OpenSim.exe manifest:
.assembly extern log4net
{
.publickeytoken = (1B 44 E1 D4 26 11 58 21 )
.ver 1:2:10:0
}
2. OpenMetaverse.dll manifest:
.assembly extern log4net
{
.ver 1:2:10:0
}
An alternative solution would be to change the log4net.dll in OpenMetaverse instead of the one in OpenSim. However, it's easier to change our own project than someone else's... At some point, presumably, everyone will switch to the latest version of log4net (1.2.11) and then we'll all be using the same DLL. |
Tags | No tags attached. |
|
Git Revision or version number | bacab6406c3bbc9587089ada7c675c0dc0359ff9 |
Run Mode | Grid (Multiple Regions per Sim) |
Physics Engine | ODE |
Script Engine | |
Environment | .NET / Windows64 |
Mono Version | 2.10 |
Viewer | |
|
Attached Files | 0001-Use-the-same-log4net.dll-as-OpenMetaverse.patch [^] (269,158 bytes) 2012-07-27 02:32
0002-Changed-references-to-a-specific-version-of-log4net-.patch [^] (12,510 bytes) 2012-07-27 02:33 [Show Content] [Hide Content]From a57fb4638d956bb81b7cb7c9a9da52f0b3bdbce7 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz <orenh@kitely.com>
Date: Fri, 27 Jul 2012 12:16:22 +0300
Subject: [PATCH 2/2] Changed references to a specific version of log4net to
generic references. Recompiled the 32-bit executables.
Every other project already has generic references to log4net: only OpenSim.32BitLaunch and Robust.32BitLaunch were using specific references.
Also removed OpenSim.32BitLaunch.pdb from git, since we don't store other PDB's in git either.
---
.../OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj | 33 +++++++++++++-------
.../Robust.32BitLaunch/Robust.32BitLaunch.csproj | 23 +++++++++-----
bin/OpenSim.32BitLaunch.exe | Bin 5632 -> 5632 bytes
bin/OpenSim.32BitLaunch.pdb | Bin 11776 -> 0 bytes
bin/Robust.32BitLaunch.exe | Bin 5632 -> 5632 bytes
5 files changed, 36 insertions(+), 20 deletions(-)
delete mode 100644 bin/OpenSim.32BitLaunch.pdb
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
index d829e69..1c3812b 100644
--- a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
+++ b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
@@ -10,8 +10,13 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenSim._32BitLaunch</RootNamespace>
<AssemblyName>OpenSim.32BitLaunch</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -22,31 +27,35 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\..\..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <PlatformTarget>x86</PlatformTarget>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
+ <Reference Include="log4net">
+ <HintPath>..\..\..\bin\log4net.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
+ <Reference Include="OpenSim">
+ <SpecificVersion>False</SpecificVersion>
+ <ExecutableExtension>.exe</ExecutableExtension>
+ <HintPath>..\..\..\bin\OpenSim.exe</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Region\Application\OpenSim.csproj">
- <Project>{438A9556-0000-0000-0000-000000000000}</Project>
- <Name>OpenSim</Name>
- </ProjectReference>
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
index 481b3f8..6c493ed 100644
--- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
+++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
@@ -1,17 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
+ <ProjectGuid>{7BF0D929-06E7-4036-A28C-4F3E520FF0AB}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Robust._32BitLaunch</RootNamespace>
<AssemblyName>Robust.32BitLaunch</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -22,22 +26,25 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\..\..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <PlatformTarget>x86</PlatformTarget>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
+ <Reference Include="log4net">
<HintPath>..\..\..\bin\log4net.dll</HintPath>
</Reference>
- <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Robust">
<SpecificVersion>False</SpecificVersion>
+ <ExecutableExtension>.exe</ExecutableExtension>
<HintPath>..\..\..\bin\Robust.exe</HintPath>
</Reference>
<Reference Include="System" />
diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe
index cc73c8bc981264031193f9d8f48d083ff8801d0d..19fddb16d8a12e19351f658d7293eec27c0774b9 100755
GIT binary patch
delta 802
zcmX|8Ur19?9RBXvT(*te`~yWw8$+Bn=i2f{MqoNJ&{UiVqR^%-9c|vrb_e|-+=Ebr
zkmDE?1R>OePd)4@g7V3y>aDjLy$De+(o+Oc-<|HB!};!azw`Zm=XZXm6e@)_9@zKh
znkUQaC9&U7_P4l`fE&QAZlGQIMM%yn6Ux5aR+c>QQ*Q)p+*bgHOt~X+QrK4?9thr`
z2XN-Or3bwxJ7ckw#TG5*Q0hKw*B4@Nu$i$U*g~wT&U~_Nb7-xU4l-L2`KJo}hsRlB
z6+Ntw#Q>vdOhA>5w(Kdh=D<)^TQGGFLC;8=z)|z(Pp6c&J@MNo@7VR#Zal+F(TgqY
ziYT@*11D|Y#5v*|JP5;uL1GJLi6?6qz%}yIH9dxV<QHoCXbls1Ol1-8i8t|qSiooE
zT~z6_mskQE?5vm|k(q`r1(kBcPrFB*d3(f|o*Q|6zFPM6-`J7s&Tje6skV10IKFHc
z`aoZwrl(g5nOrfOGPHbH%P+}a&S@bauec%?na_M-^8nr$8Lmw}?xqWvO2iZ2*YuvX
zk6*@~T<ujq^>6H&k2^dtf0$Cfadr8o(%E#Xke;95F^Nnr9E%QRjImU4WpO#IUtd7w
zuj{_(NScxL5eI&--Sv@_TgP4~JMvOfVD-7#cSNjt77OISG)_<-hK3w;q_Be980R;K
zbS=#?3{D*b=;PGL()1K~p&W|H(rHl5v!^C5)nX>m%AA+!$<iI?DpVddeN}9Oa7)eG
a*%qN)<%)4dSw@sot-SKuMMY`-r~C&IwVn3>
delta 686
zcmYjPOK1~O6g}@{5|hkeXH2@P#m1mbG=$h{P)ngrf+Z?eI<2%=FrU`8w5A~@AQZ{C
z(Jox1JjA$B0$o^FLO|Uq2uc^-bzO8J6kVztOVK-H%y@@6bKkjV&fK~084)8=Ta{LO
z&ZXBL8ocgY3;2`_pa3X`fx{xeBVvk;vbxw{bE-c8WZZy*>I`s+tP&Gfxm11nm(UPW
z0WV5aEQT~IJ!Pj^JI&jvi?y}3peI5Wp+lwvc*tixcLvEh(^k8d{X|<|IfIh@YN_6q
z{KsMkI6+-gf51588yFNn_|lPGS_TtK%Q=&$;G`Mp<nWk_UrbaTU$_zwH>F~=4^Obp
z<7nUmAHW8#QF9)A;zNYjp&|+yX+j@zgk2T}Ej(%Q{g@|yz+x_0sKX#8j~9fCcuja4
z?+910i4-Kmnlf4;CY-%2+`Q}jCaF^&FDBNv_bwRv)|I`HM<sE`8}_)nQlGbvYm))d
z@W#bY?-)P8L|TpwoBL~;(7&NTca65TCIe%7N>8L$-rSRqCLSlFZ}0ndWg0t@=ch-D
zvju(O)^xd4DJ;gtE4jBjHJhu<{VPQK`w|P~%h^gHKOZg5<eK~P1Kur}2cs3wlfYNg
ztre1J9DK%R#BfKjbI6=BV(sfRO(WLa>iEtaXW<s_wPWI?rZP15HHnL>CJQ-|P>1
CkcN!_
diff --git a/bin/OpenSim.32BitLaunch.pdb b/bin/OpenSim.32BitLaunch.pdb
deleted file mode 100644
index 5083dd5df55f3252aafaf38f604cb826b7012cc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 11776
zcmeHM?`vCC7=F{%Eoqu=>9o2{C7Yew+Io|=nx<9O+O$Hjq1CLVN+eCQ)P^RxBgxe1
z2k#W-K8WmtARSIn#{~VT=un46N^v3xPWK1+K~!*cBC=1d&vSotL8Ky`lBM@;pFHQB
z`<`>peb0N(kM~A1se)Qmr%S%DKit;li^d-Ebt{2@r+&v^OdvJ-zubysiFwE^2HC$=
zV1fA+TQ;%<LSlQsMjn6nmmQ7}=drCOKpt6HsRP$)__3v`El^w4PiH^eKUv^arNeQ;
z*AsC-aUk;Cxnu6#1FwaZ&yH{V(QVb`HNuwav%ufY|6C8t=YQt;<bUPrv&P1IqN`Jn
z^et|_=sg*e`H{D4-dq@Zc<!ekzVV*yGxF}!#~=4jU-X`D6}jq+oS!_K@BjMH3&S7&
zI`HkW!aH-^Hc;MedF$NSum1Sx`SHZq{RhTwH%jf_8^r=|m>sqFM(MZR&-Gbgd1-lx
zYrDo~!oBg4!|8l1lZ%%MNAk15)$Bo4%@(bk($zVTDGeu&<Wn>8(SrJ9A(>NBMUhl*
zTt)rjwfd`By}p@4{i#eTYt%n{tv=VBe&9iX!hYHNQ{5E*+0V}J0}c(X4}I74z@_mE
zj(@w)qdr1}`dE=E9KU@4+g^F<rHKiosn-wiS{ksWGAzJ%PLWnGd$VA6seBE<xNTxF
z$4{ckOdixMwO-bH8L)JDy<S?pW3i*fQaY#W+>5dkKrb)}P^VdZ`n{0W8AXzQhCZ}O
zN2k=)UFiFH@%_gxMLyl*s`=!-4<@M-l|ktQ*P$Zs&3%V4H#qcqzabyu4ImEuS^c^V
z`F6AXE=+SwwtzQ-?*=!4_k!;L!)G=6?S60<7+W6g0Jset0k?w>f)(%>*bk0_1K=mX
zmzS2c1h@nFNih1WCBbM*%YtDK4Ua1KfnNj%!LNY3!E@jc_!OA!yl(Poa1Y8|u&xIh
z9=t&YTEWi(;{ekEpb<u;P9thDj<d@wi=ey*P=Kh;mJapU_U~XPV46x#`;g}t+ETq1
z;F)fR%YTLMQv)XOU10hEe00?pkX)De)~Idy+ZrnNr3$b>Lk0A~?!xuAz@5@)t;bmB
z!z0nQ#8AFeIGPw$Gx?Gfnq-fDoolYc+yFGo{<5+_FhIegSB1hQ(H7eRRciqs)_lI(
zWuh_t=yuVpy#ZeWC-k^hZ?N^c>fe8k@zbsj{oG%V<C<IcE;h(7?iq}=55Sp6h5<{O
zk=U+hF3($K#@B)J?*rBqvP-@&v!iex`p?$R&v%+dV#b@4L|IHpF=I;7-8C2thJrZ%
z$UPq`S1jMN&UPX>s~MaDYs8}~I99(?P>+5~;d5Hd^P%O*>kWBX@iX(*yoDjWp&?HF
z=0@7OS~0xV_dlLl{ll63Y$QLeia(#srHkS(7E=D1bn;NTFqKtPvqr&mCYvt$uS5Kg
z!3NrrF#`%W8Z3iv%1r=;^VM#EXLwuIX8{kYGe)uiApRh#?#Lo%kk)_+U?0$e_oyA{
z2RI)v_OcD&*f56T0yst-6DPor#|;46XEcK2$TQ{^z?RCfz|ED@6}u<41#Aoa&ldO-
D<QQ&F
diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
index 4d2698b9fb2bdc85cd32ef3a2bfd798cc221735d..3a4c33b433f3a9e394caf61a8f08444163f68d75 100644
GIT binary patch
delta 585
zcmZWmOGq106g}_FOiVJ<kQg^b7YRa5Vk-HF1x1J`DhRDj1d)QoYA9mxlc0hw65S{$
z;_x=no#4XHs!SK9D?xG5o!E9EB8cEFwB5AX6nZDt+4Mf{;oNiYeLUVNhKu3tb@}#9
z?V!Hdz()1MVV4#HUV$P3{7`hiS4#sL)$2i^LHK!CjIbs)Ay!zym!M%Y`YAaSz)y2_
zK%$xfHt}AIh(RtFHXZ~|zzsNa)S3-=Ocu4+n8n5|W@C?YR@WD%<v=a%@_?7{*-e`>
zmwueH&D4?haJ99PD>46n_uL=^Mvnmo;21)iuuEAc8}pLHc*Q4{<k><HJJ{pTv4>M0
z!y$(70uGdUC*cU(Xn~4eLN7)M>#Nv^3F6IFJ&sl49aVjxiYe@pGLAFCDO?cdaYeX{
zJ9I%V(raKdKhHEkOe#$bhOYdU-I>d-#<i_q-5<`cl`qrfq$oLq;<NLZbBIMX8i#42
zxy>oxQSOsj`znx3^`w4&%76X%wy#e=%FP{Yl)stgbhnF&+ESCuWHV#=jA+)LK56~u
uC3W#qyw>V@B4jLRB_>X^gyC}COO6;Kh|y^^{&-Z*)9r?*?mN>XHGctTQFFoo
delta 665
zcmYjPO=uHA7=1JOX_H+-(gZK<A&bx?HO8c&6<P`*2~srB(pYLGVv{u1VB5sqBo~oH
z^dMNI%U&wdYOx4G1ZD415j^S5iyjIpcv9*?Q7EF{u97(Ly?yiM?VFkXwiRxL*Kb-k
z>c=wb+5p>9+jFk;5HJTC3E-<umAv8tAkus%1Po{r4{P%*z;?82tm$u&*%*^l95(nQ
zV7(Wx(3}Bw?Xnovrn$Ab^;hs9=mwmSX|Wpgm^9X<`7SMXshxGaU4uVN5y3tq0X*oX
z=OFebD0!jdwpV;4o4bra?!GE-bS(d=*aPS`jLrv~hHxGe+Bd$;L_Ke@FfK~k1#7iA
zj62xoqu9m^K8`jS6L8=QKS4MTHzE))Md-y6VZVuou|oWasmF1P__(Q`GBJw>q!jU*
z@Dkn;D)>lv1)p&e))t)xcKV>NQbe>_TY!c1tF|9jcSeW?o@T#Kwtx5C-E5rupxtnW
z9KHSN_iqM0XC&>h^AYc1+F2nsZS>cO;Z)bDcBzxQ0x*+JXB%%52U8E9r|-S|nLOBh
zvTt-QHI|!IO0tqm$z`RM&n=c3xk|OPs+3ob7AtZ|dnQDp=~AJ-l$)s(>PjsVA5NBQ
znS6b<crj94EC9>@ehf;(ZG-z&=@4%Xsgh4mifc@FxjtDOF&sx6BN)|xc?8bykLe!Y
JK2xJTe*pfOiunKl
--
1.7.10.msysgit.1
|
|