Removed permanent app.config files and changed build process to only generate them when doing a .NET 2.0 build.

This commit is contained in:
jfrijters 2012-09-17 10:23:23 +00:00
Родитель 8a43584f72
Коммит 19dab6cb3c
6 изменённых файлов: 59 добавлений и 21 удалений

Просмотреть файл

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v2.0.50727" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
</configuration>

Просмотреть файл

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v2.0.50727" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
</configuration>

Просмотреть файл

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v2.0.50727" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
</configuration>

Просмотреть файл

@ -43,8 +43,11 @@
<include name="bin/IKVM.Runtime.JNI.dll" />
<include name="bin/IKVM.OpenJDK.*.dll" />
<include name="bin/ikvm.exe" />
<include name="bin/ikvm.exe.config" />
<include name="bin/ikvmc.exe" />
<include name="bin/ikvmc.exe.config" />
<include name="bin/ikvmstub.exe" />
<include name="bin/ikvmstub.exe.config" />
<include name="bin-x64/JVM.DLL" />
<include name="bin-x86/JVM.DLL" />
<include name="classpath/**.class" />
@ -64,6 +67,7 @@
<include name="tools/pubkey.exe" />
<include name="tools/pubkey.txt" />
<include name="tools/updbaseaddresses.exe" />
<include name="tools/writeappconfig.exe" />
</fileset>
</delete>
</target>

Просмотреть файл

@ -30,5 +30,12 @@
</sources>
</csc>
<exec program="pubkey.exe" useruntimeengine="true" />
<csc target="exe" output="writeappconfig.exe" rebuild="true">
<sources>
<include name="writeappconfig.cs" />
</sources>
</csc>
<exec program="writeappconfig.exe" useruntimeengine="true" />
</target>
</project>

48
tools/writeappconfig.cs Normal file
Просмотреть файл

@ -0,0 +1,48 @@
/*
Copyright (C) 2012 Jeroen Frijters
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
Jeroen Frijters
jeroen@frijters.net
*/
using System;
using System.IO;
class WriteAppConfig
{
const string AppConfig =
@"<?xml version=""1.0"" encoding=""utf-8"" ?>
<configuration>
<startup>
<supportedRuntime version=""v2.0.50727"" />
<supportedRuntime version=""v4.0"" sku="".NETFramework,Version=v4.5"" />
</startup>
</configuration>";
static void Main()
{
if (Environment.Version.Major == 2)
{
File.WriteAllText("../bin/ikvm.exe.config", AppConfig);
File.WriteAllText("../bin/ikvmc.exe.config", AppConfig);
File.WriteAllText("../bin/ikvmstub.exe.config", AppConfig);
}
}
}