mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.8.0.309

Browse Source 
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mcs/tools/mconfig/Makefile
View File

@@ -6,17 +6,12 @@ LOCAL_MCS_FLAGS =
LIB_REFS = System.Xml System
PROGRAM = mconfig.exe
BUILT_SOURCES=Mono.MonoConfig/consts.cs
Mono.MonoConfig/consts.cs: Mono.MonoConfig/consts.cs.in
sed -e "s;@MONO_SYSCONFDIR@;$(sysconfdir);g" < $< > $@
install-local: install-local-data
install-local-data:
$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/mono/mconfig/
$(INSTALL_DATA) data/config.xml $(DESTDIR)$(sysconfdir)/mono/mconfig
EXTRA_DISTFILES = TODO data/config.xml Mono.MonoConfig/consts.cs.in
EXTRA_DISTFILES = TODO data/config.xml
include ../../build/executable.make

43
mcs/tools/mconfig/Mono.MonoConfig/consts.cs.in
View File

@@ -1,43 +0,0 @@
//
// Authors:
// Marek Habersack (mhabersack@novell.com)
//
// (C) 2007 Novell, Inc
//
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.IO;
namespace Mono.MonoConfig
{
public class Constants
{
public static readonly string GlobalConfigPath;
static Constants ()
{
GlobalConfigPath = String.Format ("@MONO_SYSCONFDIR@{0}mono{0}mconfig{0}config.xml",
Path.DirectorySeparatorChar);
}
}
}

2
mcs/tools/mconfig/mconfig.cs
View File

@@ -270,7 +270,7 @@ namespace Mono.MonoConfig
class MConfig
{
static string[] configPaths = {
Constants.GlobalConfigPath,
Path.GetFullPath (Path.Combine (Environment.CommandLine, "..", "..", "..","..", "etc", "mono", "mconfig", "config.xml")),
Path.Combine (ConfigPath, "config.xml"),
Path.Combine (".", "mconfig.xml"),
null