Fix make dist

Search and replace all the files renamed in 9dd69426
 and removed in 70cc60e

diff --git a/mcs/class/Mono.CSharp/Mono.CSharp-net_2_0.csproj b/mcs/class/Mono.CSharp/Mono.CSharp-net_2_0.csproj
index b08c0e5cae8bd98208662f0fdb9a1b1f7713ca27..120af1590108b818561fc617eff4735b65a764d7 100644 (file)
--- a/mcs/class/Mono.CSharp/Mono.CSharp-net_2_0.csproj
+++ b/mcs/class/Mono.CSharp/Mono.CSharp-net_2_0.csproj
@@ -88,7 +88,6 @@
    <Compile Include="..\..\mcs\typemanager.cs" />
    <Compile Include="..\..\mcs\typespec.cs" />
    <Compile Include="..\..\mcs\visit.cs" />
-   <Compile Include="..\..\mcs\symbolwriter.cs" />
    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />

diff --git a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_0.csproj b/mcs/class/Mono.CSharp/Mono.CSharp-net_4_0.csproj
index c2fc0835f7ef47c640aa4c0792e68ff3c1559c1c..03d8a279ac43a3e0645604feb8cea569a24e8482 100644 (file)
--- a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_0.csproj
+++ b/mcs/class/Mono.CSharp/Mono.CSharp-net_4_0.csproj
@@ -88,7 +88,6 @@
    <Compile Include="..\..\mcs\typemanager.cs" />
    <Compile Include="..\..\mcs\typespec.cs" />
    <Compile Include="..\..\mcs\visit.cs" />
-   <Compile Include="..\..\mcs\symbolwriter.cs" />
    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />

diff --git a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_5.csproj b/mcs/class/Mono.CSharp/Mono.CSharp-net_4_5.csproj
index a2ef901ae20dd6690b9cf71c040d850372e4febe..eb650f9d6dee6505bb7544534212d38530002dd0 100644 (file)
--- a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_5.csproj
+++ b/mcs/class/Mono.CSharp/Mono.CSharp-net_4_5.csproj
@@ -88,7 +88,6 @@
    <Compile Include="..\..\mcs\typemanager.cs" />
    <Compile Include="..\..\mcs\typespec.cs" />
    <Compile Include="..\..\mcs\visit.cs" />
-   <Compile Include="..\..\mcs\symbolwriter.cs" />
    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
    <Compile Include="..\..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />

diff --git a/mcs/class/Mono.CSharp/Mono.CSharp.csproj b/mcs/class/Mono.CSharp/Mono.CSharp.csproj
index 91765f33421875fc60db780de3a41bf36fcb985d..4275fe1a25813e7bb68bc9a9380fa5ca1c854baf 100755 (executable)
--- a/mcs/class/Mono.CSharp/Mono.CSharp.csproj
+++ b/mcs/class/Mono.CSharp/Mono.CSharp.csproj
@@ -216,9 +216,6 @@
     <Compile Include="..\..\mcs\support.cs">\r
       <Link>support.cs</Link>\r
     </Compile>\r
-    <Compile Include="..\..\mcs\symbolwriter.cs">\r
-      <Link>symbolwriter.cs</Link>\r
-    </Compile>\r
     <Compile Include="..\..\mcs\typemanager.cs">\r
       <Link>typemanager.cs</Link>\r
     </Compile>\r
@@ -264,4 +261,4 @@
   <PropertyGroup>\r
     <PreBuildEvent>"$(ProjectDir)..\..\jay\jay" -cvt &lt; "$(ProjectDir)..\..\jay\skeleton.cs" "$(ProjectDir)..\..\mcs\cs-parser.jay" &gt; "$(ProjectDir)cs-parser.cs"</PreBuildEvent>\r
   </PropertyGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/mcs/mcs/dmcs.exe.sources b/mcs/mcs/dmcs.exe.sources
index c409d1719c4b37da7cbaa7b859bb0b3de2e9a8b5..f90e75a555f5e546d72d70fa785d6c4ce36a7396 100644 (file)
--- a/mcs/mcs/dmcs.exe.sources
+++ b/mcs/mcs/dmcs.exe.sources
@@ -41,14 +41,13 @@ pending.cs
 property.cs
 reflection.cs
 report.cs
-rootcontext.cs
-roottypes.cs
+settings.cs
+module.cs
 statement.cs
 support.cs
 typemanager.cs
 typespec.cs
 visit.cs
-symbolwriter.cs
 ../class/Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs
 ../class/Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs
 ../class/Mono.CompilerServices.SymbolWriter/MonoSymbolWriter.cs

diff --git a/mcs/mcs/mcs-build.csproj b/mcs/mcs/mcs-build.csproj
index b28b26fb8526430a17f7dabab67fa328d782ab1f..02b4f140342155ede5a49a422af4f4134e3c2717 100644 (file)
--- a/mcs/mcs/mcs-build.csproj
+++ b/mcs/mcs/mcs-build.csproj
@@ -93,7 +93,6 @@
    <Compile Include="typemanager.cs" />
    <Compile Include="typespec.cs" />
    <Compile Include="visit.cs" />
-   <Compile Include="symbolwriter.cs" />
    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />

diff --git a/mcs/mcs/mcs-net_4_0.csproj b/mcs/mcs/mcs-net_4_0.csproj
index d5112c2b39ec4278131d17caa959214ffa1b4a1e..c24aede98cca71b3138fa8eed7640c5da7d35379 100644 (file)
--- a/mcs/mcs/mcs-net_4_0.csproj
+++ b/mcs/mcs/mcs-net_4_0.csproj
@@ -85,14 +85,13 @@
    <Compile Include="property.cs" />
    <Compile Include="reflection.cs" />
    <Compile Include="report.cs" />
-   <Compile Include="rootcontext.cs" />
-   <Compile Include="roottypes.cs" />
+   <Compile Include="settings.cs" />
+   <Compile Include="module.cs" />
    <Compile Include="statement.cs" />
    <Compile Include="support.cs" />
    <Compile Include="typemanager.cs" />
    <Compile Include="typespec.cs" />
    <Compile Include="visit.cs" />
-   <Compile Include="symbolwriter.cs" />
    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />

diff --git a/mcs/mcs/mcs-net_4_5.csproj b/mcs/mcs/mcs-net_4_5.csproj
index ce6a411f0c227954f85a24cbd69e8225c5402db1..3cb627ab17c29586f9bf9d5005a93fc1cce0c1c7 100644 (file)
--- a/mcs/mcs/mcs-net_4_5.csproj
+++ b/mcs/mcs/mcs-net_4_5.csproj
@@ -93,7 +93,6 @@
    <Compile Include="typemanager.cs" />
    <Compile Include="typespec.cs" />
    <Compile Include="visit.cs" />
-   <Compile Include="symbolwriter.cs" />
    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolFile.cs" />
    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolTable.cs" />
    <Compile Include="..\class\Mono.CompilerServices.SymbolWriter\MonoSymbolWriter.cs" />

diff --git a/po/mcs/POTFILES.in b/po/mcs/POTFILES.in
index 87e67c3df5920a1d0ca61516fc765683ae81393c..00d25f6dc72d6cd59d73ac41533d3310feeb53fa 100644 (file)
--- a/po/mcs/POTFILES.in
+++ b/po/mcs/POTFILES.in
@@ -40,10 +40,9 @@ mcs/mcs/pending.cs
 mcs/mcs/property.cs
 mcs/mcs/reflection.cs
 mcs/mcs/report.cs
-mcs/mcs/rootcontext.cs
-mcs/mcs/roottypes.cs
+mcs/mcs/settings.cs
+mcs/mcs/module.cs
 mcs/mcs/statement.cs
 mcs/mcs/support.cs
 mcs/mcs/typespec.cs
 mcs/mcs/typemanager.cs
-mcs/mcs/symbolwriter.cs

diff --git a/po/mcs/de.po b/po/mcs/de.po
index da702c814ec19be82ca3c3dc8815df2806cca480..42764cf63beee81f96c01e2107aa00a4355f6a15 100644 (file)
--- a/po/mcs/de.po
+++ b/po/mcs/de.po
@@ -2869,12 +2869,12 @@ msgstr ""
 msgid "Cannot set the `IndexerName' attribute on an indexer marked override"
 msgstr ""
 
-#: mcs/mcs/roottypes.cs:327
+#: mcs/mcs/module.cs:327
 #, csharp-format
 msgid "Value specified for the argument to `{0}' is not valid"
 msgstr ""
 
-#: mcs/mcs/roottypes.cs:546
+#: mcs/mcs/module.cs:546
 #, csharp-format
 msgid "The namespace `{0}' already contains a definition for `{1}'"
 msgstr ""

diff --git a/po/mcs/es.po b/po/mcs/es.po
index df14e5562196ef40706b5fb40c3dbd9c36911473..6d2ad007c7e44ce9fd03247d34dfd311dbf8a5a4 100644 (file)
--- a/po/mcs/es.po
+++ b/po/mcs/es.po
@@ -2961,12 +2961,12 @@ msgstr ""
 "No puede especificar el atributo `DefaultMember' en un tipo que contiene un "
 "indexador"
 
-#: mcs/mcs/roottypes.cs:327
+#: mcs/mcs/module.cs:327
 #, csharp-format
 msgid "Value specified for the argument to `{0}' is not valid"
 msgstr ""
 
-#: mcs/mcs/roottypes.cs:546
+#: mcs/mcs/module.cs:546
 #, csharp-format
 msgid "The namespace `{0}' already contains a definition for `{1}'"
 msgstr ""

diff --git a/po/mcs/ja.po b/po/mcs/ja.po
index e17b48eddc015a14b7f1ed5a073ae5388adb8c25..67552dd8ad7222a3a73c546dd103e3eeadace45a 100644 (file)
--- a/po/mcs/ja.po
+++ b/po/mcs/ja.po
@@ -2924,12 +2924,12 @@ msgstr ""
 msgid "Cannot set the `IndexerName' attribute on an indexer marked override"
 msgstr "インデクサを含む型には`DefaultMember'属性を指定できません"
 
-#: mcs/mcs/roottypes.cs:327
+#: mcs/mcs/module.cs:327
 #, csharp-format
 msgid "Value specified for the argument to `{0}' is not valid"
 msgstr ""
 
-#: mcs/mcs/roottypes.cs:546
+#: mcs/mcs/module.cs:546
 #, csharp-format
 msgid "The namespace `{0}' already contains a definition for `{1}'"
 msgstr ""

diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot
index 9bbbbd19fb1a6d38470aa7cf4ffe09bd6233ac97..b871a100eb8c7061bf9b85e9c2751ea3f74b8e1a 100644 (file)
--- a/po/mcs/mcs.pot
+++ b/po/mcs/mcs.pot
@@ -2822,12 +2822,12 @@ msgstr ""
 msgid "Cannot set the `IndexerName' attribute on an indexer marked override"
 msgstr ""
 
-#: mcs/mcs/roottypes.cs:327
+#: mcs/mcs/module.cs:327
 #, csharp-format
 msgid "Value specified for the argument to `{0}' is not valid"
 msgstr ""
 
-#: mcs/mcs/roottypes.cs:546
+#: mcs/mcs/module.cs:546
 #, csharp-format
 msgid "The namespace `{0}' already contains a definition for `{1}'"
 msgstr ""

diff --git a/po/mcs/pt_BR.po b/po/mcs/pt_BR.po
index b5222fb9bc6743af7080f456b5ad4c3e46acd594..46cbdcf66e102257c00598aacabe37bcce9dae06 100644 (file)
--- a/po/mcs/pt_BR.po
+++ b/po/mcs/pt_BR.po
@@ -3363,14 +3363,14 @@ msgstr ""
 "Não foi possível definir o atributo \"IndexerName\" em um indexador marcado "
 "como sobrescrito"
 
-#: mcs/mcs/roottypes.cs:327
+#: mcs/mcs/module.cs:327
 #, fuzzy, csharp-format
 msgid "Value specified for the argument to `{0}' is not valid"
 msgstr ""
 "Valor especificado para o argumento ao \"System.Runtime.InteropServices."
 "DefaultCharSetAttribute\" não é válido"
 
-#: mcs/mcs/roottypes.cs:546
+#: mcs/mcs/module.cs:546
 #, csharp-format
 msgid "The namespace `{0}' already contains a definition for `{1}'"
 msgstr "O namespace \"{0}\" já contém uma definição para \"{1}\""