#define FRAMEWORKDIR ".."
-
int
sane_putenv (char const *key, string value, bool overwrite)
{
{
string combine = string (key) + "=" + value;
char *s = strdup (combine.c_str ());
+
+ if (be_verbose_global)
+ progress_indication (_f ("Setting %s to %s\n" , key, value.c_str ()));
+
return putenv (s);
}
prepend_env_path ("PATH", bindir);
}
+/*
+ UGH : this is a complete mess.
+ */
+
void
framework_relocation (string prefix)
{
read_relocation_dir (prefix + "/etc/relocate/");
string bindir = prefix + "/bin";
-
-#ifdef OLD_RELOCATION
- string datadir = prefix + "/share";
- string libdir = prefix + "/lib";
- string sysconfdir = prefix + "/etc";
-
- /* need otherwise dynamic .so's aren't found. */
- prepend_env_path ("DYLD_LIBRARY_PATH", libdir);
-
- set_env_file ("FONTCONFIG_FILE", sysconfdir + "/fonts/fonts.conf", true);
- set_env_dir ("FONTCONFIG_PATH", sysconfdir + "/fonts");
-
-#ifdef __MINGW32__
- char font_dir[PATH_MAX];
- ExpandEnvironmentStrings ("%windir%/fonts", font_dir, sizeof (font_dir));
- prepend_env_path ("GS_FONTPATH", font_dir);
-#endif
-
- string gs_version =
-#ifdef GHOSTSCRIPT_VERSION
- GHOSTSCRIPT_VERSION
-#else
- "ghostscript-version-undefined"
-#endif
- ;
-
- if (char const *cur = getenv ("LILYPOND_GS_VERSION"))
- gs_version = cur;
-
- prepend_env_path ("GS_FONTPATH", datadir + "/ghostscript/" + gs_version + "/fonts");
- prepend_env_path ("GS_LIB", datadir + "/ghostscript/" + gs_version + "/Resource");
- prepend_env_path ("GS_LIB", datadir + "/ghostscript/" + gs_version + "/lib");
-
- prepend_env_path ("GS_FONTPATH", datadir + "/gs/fonts");
- prepend_env_path ("GS_LIB", datadir + "/gs/Resource");
- prepend_env_path ("GS_LIB", datadir + "/gs/lib");
-
- prepend_env_path ("GUILE_LOAD_PATH", datadir
- + to_string ("/guile/%d.%d",
- SCM_MAJOR_VERSION, SCM_MINOR_VERSION));
- set_env_file ("PANGO_RC_FILE", sysconfdir + "/pango/pangorc");
- set_env_dir ("PANGO_PREFIX", prefix);
-
-#endif
-
prepend_env_path ("PATH", bindir);
}
+/*
+ UGH : this is a complete mess.
+ */
void
setup_paths (char const *argv0_ptr)
{
if (relocate_binary
&& getenv ("LILYPOND_RELOCATE_PREFIX"))
{
- string prefix = getenv ("LILYPOND_RELOCATE_PREFIX");
+ prefix_directory = getenv ("LILYPOND_RELOCATE_PREFIX");
#ifdef __MINGW32__
/* Normalize file name. */
- prefix = File_name (prefix).to_string ();
+ prefix_directory = File_name (prefix_directory).to_string ();
#endif /* __MINGW32__ */
- prefix_relocation (prefix);
- string bindir = prefix + "/bin";
+
+ prefix_relocation (prefix_directory);
+ string bindir = prefix_directory + "/bin";
framework_relocation (bindir);
}
else if (relocate_binary)
string argv0_prefix = dir_name (bindir);
string compile_prefix = dir_name (dir_name (dir_name (prefix_directory)));
if (argv0_prefix != compile_prefix)
- prefix_relocation (argv0_prefix);
+ {
+ prefix_relocation (argv0_prefix);
+ prefix_directory = argv0_prefix;
+ }
if (argv0_prefix != compile_prefix || string (FRAMEWORKDIR) != "..")
- framework_relocation (bindir + "/" + FRAMEWORKDIR);
+ {
+ framework_relocation (bindir + "/" + FRAMEWORKDIR);
+ prefix_directory = bindir + "/" + FRAMEWORKDIR;
+ }
}
/* FIXME: use LILYPOND_DATADIR. */
if (char const *env = getenv ("LILYPONDPREFIX"))
{
-
#ifdef __MINGW32__
/* Normalize file name. */
prefix_directory = File_name (env).to_string ();
read_relocation_file (string filename)
{
if (be_verbose_global)
- progress_indication (_f ("Relocation file %s", filename.c_str ()));
+ progress_indication (_f ("Relocation file %s\n", filename.c_str ()));
char const *cname = filename.c_str ();
FILE *f = fopen (cname, "r");
else if (command == "prependdir")
prepend_env_path (variable.c_str (), value);
else
- error ( _f("Unknown relocation command %s", command));
+ error (_f ("Unknown relocation command %s", command));
}
fclose (f);
void
read_relocation_dir (string dirname)
{
- DIR *dir = opendir (dirname.c_str ());
-
- while (struct dirent *ent = readdir (dir))
- {
- File_name name (ent->d_name);
- if (name.ext_ == "reloc")
- {
- read_relocation_file (dirname + "/" + name.to_string ());
- }
- }
+ if (DIR *dir = opendir (dirname.c_str ()))
+ while (struct dirent *ent = readdir (dir))
+ {
+ File_name name (ent->d_name);
+ if (name.ext_ == "reloc")
+ read_relocation_file (dirname + "/" + name.to_string ());
+ }
}