Attachment #249828 for bug #340045

Lines 808-814 Link Here

(-)mono-9999.bak/mono/mcs/tools/gacutil/driver.cs (-1 / +1 lines)
808	private static string EnsureLib (string dir)	808	private static string EnsureLib (string dir)
809	{	809	{
810	DirectoryInfo d = new DirectoryInfo (dir);	810	DirectoryInfo d = new DirectoryInfo (dir);
811	if (d.Name == "lib")	811	if (d.Name == "lib" \|\| d.Name == "@MONOLIBDIR@")
812	return dir;	812	return dir;
813	return Path.Combine (dir, "lib");	813	return Path.Combine (dir, "lib");
814	}	814	}




	}

	config = g_build_filename (base, "etc", NULL);
	lib = g_build_filename (base, "@MONOLIBDIR@", NULL);
	mono = g_build_filename (lib, "mono/1.0", NULL);
	if (stat (mono, &buf) == -1)
		fallback ();


	bindir = g_path_get_dirname (name);
	installdir = g_path_get_dirname (bindir);
	root = g_build_path (G_DIR_SEPARATOR_S, installdir, "@MONOLIBDIR@", NULL);

	config = g_build_filename (root, "..", "etc", NULL);
#ifdef HOST_WIN32

	if (extra_gac_paths) {
		paths = extra_gac_paths;
		while (!res && *paths) {
			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", aname->name, NULL);
			res = probe_for_partial_name (gacpath, fullname, aname, status);
			g_free (gacpath);
			paths++;

		if (*gp != G_DIR_SEPARATOR)
			continue;
		gp++;
		if (strncmp (gp, "@MONOLIBDIR@", 3))
			continue;
		gp += 3;
		if (*gp != G_DIR_SEPARATOR)

		paths = extra_gac_paths;
		while (!image && *paths) {
			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
					"@MONOLIBDIR@", "mono", "gac", subpath, NULL);
			image = mono_image_open (fullpath, NULL);
			g_free (fullpath);
			paths++;

	if (extra_gac_paths) {
		paths = extra_gac_paths;
		while (!result && *paths) {
			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", subpath, NULL);
			result = mono_assembly_open_full (fullpath, status, refonly);
			g_free (fullpath);
			paths++;

Return to bug 340045

Lines 542-548 Link Here

(-)mono-9999.bak/mono/mono/metadata/assembly.c (-6 / +6 lines)
542	}	542	}
543		543
544	config = g_build_filename (base, "etc", NULL);	544	config = g_build_filename (base, "etc", NULL);
545	lib = g_build_filename (base, "lib", NULL);	545	lib = g_build_filename (base, "@MONOLIBDIR@", NULL);
546	mono = g_build_filename (lib, "mono/1.0", NULL);	546	mono = g_build_filename (lib, "mono/1.0", NULL);
547	if (stat (mono, &buf) == -1)	547	if (stat (mono, &buf) == -1)
548	fallback ();	548	fallback ();
Lines 595-601 Link Here
595		595
596	bindir = g_path_get_dirname (name);	596	bindir = g_path_get_dirname (name);
597	installdir = g_path_get_dirname (bindir);	597	installdir = g_path_get_dirname (bindir);
598	root = g_build_path (G_DIR_SEPARATOR_S, installdir, "lib", NULL);	598	root = g_build_path (G_DIR_SEPARATOR_S, installdir, "@MONOLIBDIR@", NULL);
599		599
600	config = g_build_filename (root, "..", "etc", NULL);	600	config = g_build_filename (root, "..", "etc", NULL);
601	#ifdef HOST_WIN32	601	#ifdef HOST_WIN32
Lines 2066-2072 Link Here
2066	if (extra_gac_paths) {	2066	if (extra_gac_paths) {
2067	paths = extra_gac_paths;	2067	paths = extra_gac_paths;
2068	while (!res && *paths) {	2068	while (!res && *paths) {
2069	gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);	2069	gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", aname->name, NULL);
2070	res = probe_for_partial_name (gacpath, fullname, aname, status);	2070	res = probe_for_partial_name (gacpath, fullname, aname, status);
2071	g_free (gacpath);	2071	g_free (gacpath);
2072	paths++;	2072	paths++;
Lines 2117-2123 Link Here
2117	if (*gp != G_DIR_SEPARATOR)	2117	if (*gp != G_DIR_SEPARATOR)
2118	continue;	2118	continue;
2119	gp++;	2119	gp++;
2120	if (strncmp (gp, "lib", 3))	2120	if (strncmp (gp, "@MONOLIBDIR@", 3))
2121	continue;	2121	continue;
2122	gp += 3;	2122	gp += 3;
2123	if (*gp != G_DIR_SEPARATOR)	2123	if (*gp != G_DIR_SEPARATOR)
Lines 2196-2202 Link Here
2196	paths = extra_gac_paths;	2196	paths = extra_gac_paths;
2197	while (!image && *paths) {	2197	while (!image && *paths) {
2198	fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,	2198	fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
2199	"lib", "mono", "gac", subpath, NULL);	2199	"@MONOLIBDIR@", "mono", "gac", subpath, NULL);
2200	image = mono_image_open (fullpath, NULL);	2200	image = mono_image_open (fullpath, NULL);
2201	g_free (fullpath);	2201	g_free (fullpath);
2202	paths++;	2202	paths++;
Lines 2488-2494 Link Here
2488	if (extra_gac_paths) {	2488	if (extra_gac_paths) {
2489	paths = extra_gac_paths;	2489	paths = extra_gac_paths;
2490	while (!result && *paths) {	2490	while (!result && *paths) {
2491	fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);	2491	fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", subpath, NULL);
2492	result = mono_assembly_open_full (fullpath, status, refonly);	2492	result = mono_assembly_open_full (fullpath, status, refonly);
2493	g_free (fullpath);	2493	g_free (fullpath);
2494	paths++;	2494	paths++;