X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelocate.cc;h=fd6cf85c458f2fbac7dd76ae8c3bae1f8c8b3714;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=7ae2374e4581bf51945e330e69a5c97179ebc779;hpb=56fa0a3bf9e81a69660591acc6803db4f5b985c9;p=lilypond.git

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 7ae2374e45..fd6cf85c45 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -3,249 +3,406 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
 #include "relocate.hh"
 
-#include "string.hh"
-#include "file-name.hh"
-#include "file-path.hh"
-#include "main.hh"
-#include "warn.hh"
 #include "config.hh"
-#include "version.hh"
 
+
+/* TODO: autoconf support */
+
+#include <sys/types.h>
+#include <dirent.h>
+
+#if HAVE_GETTEXT
+#include <libintl.h>
+#endif
+
+#include "file-name.hh"
+#include "file-path.hh"
+#include "international.hh"
 #include "lily-guile.hh"
 #include "lily-version.hh"
+#include "main.hh"
+#include "version.hh"
+#include "warn.hh"
 
-#include <unistd.h>
-#include <sys/stat.h>
+#define FRAMEWORKDIR ".."
 
 int
-sane_putenv (char const *key, String value, bool overwrite)
+sane_putenv (char const *key, string value, bool overwrite)
 {
   if (overwrite || !getenv (key))
     {
-      String combine = String (key) + "=" + value;
-      char *s = strdup (combine.to_str0 ());
-      return putenv (s);
+      string combine = string (key) + "=" + value;
+      char *s = strdup (combine.c_str ());
+
+      if (be_verbose_global)
+	progress_indication (_f ("Setting %s to %s" , key, value.c_str ())
+			     + "\n");
+			     
+      int retval =  putenv (s);
+      /*
+	unfortunately, we can't portably free S here,
+	due to various bugs in glibc prior to 2.1.1
+      */ 
+      return retval;
     }
   
   return -1;
 }
 
 static int
-set_env_file (char const *key, String value)
+set_env_file (char const *key, string value, bool overwrite = false)
 {
   if (is_file (value))
+    return sane_putenv (key, value, overwrite);
+  else if (be_verbose_global)
+    warning (_f ("no such file: %s for %s", value, key));
+  return -1;
+}
+
+static int
+set_env_dir (char const *key, string value)
+{
+  if (is_dir (value))
     return sane_putenv (key, value, false);
   else if (be_verbose_global)
-    warning (_f ("no such file: %s", value));
+    warning (_f ("no such directory: %s for %s", value, key));
   return -1;
 }
 
 static int
-prepend_env_path (char const *key, String value)
+prepend_env_path (char const *key, string value)
 {
   if (is_dir (value))
     {
       if (be_verbose_global)
-	progress_indication (_f ("%s=%s\n", key, value.to_str0 ())); 
+	progress_indication (_f ("%s=%s (prepend)\n", key, value.c_str ())); 
 
       if (char const *cur = getenv (key))
 	value += to_string (PATHSEP) + cur;
 
-      return sane_putenv (key, value.to_str0 (), true);
+      return sane_putenv (key, value.c_str (), true);
     }
   else if (be_verbose_global)
     warning (_f ("no such directory: %s for %s", value, key));
   return -1;
 }
 
-String
-dir_name (String const file_name)
-{
-  String s = file_name;
-  s.substitute ('\\', '/');
-  s = s.left_string (s.index_last ('/'));
-  return s;
-}
-
 #ifdef __MINGW32__
 #include <winbase.h>
 #endif
 
-void
-set_relocation (String bindir, String prefix)
+static void
+prefix_relocation (string prefix)
 {
-  if (be_verbose_global)
-    warning (_f ("Relocation: compile prefix=%s, new prefix=%s",
-		 prefix_directory,
-		 prefix.to_str0 ()));
+  string bindir = prefix + "/bin";
+  string datadir = prefix + "/share";
+  string localedir = datadir + "/locale";
+  string package_datadir = datadir + "/lilypond/";
+  string old_lilypond_datadir = lilypond_datadir;
+
+  if (is_dir (package_datadir + "/" + TOPLEVEL_VERSION))
+    lilypond_datadir = package_datadir + "/" + TOPLEVEL_VERSION;
+  else if (is_dir (package_datadir + "/current"))
+    lilypond_datadir = package_datadir + "/current";
+  else
+    warning (_f ("not relocating, no %s/ or current/ found under %s",
+		 TOPLEVEL_VERSION, package_datadir.c_str ()));
   
-  String datadir = prefix + "/share";
-  String libdir = prefix + "/lib";
-  String localedir = datadir + "/locale";
-  String sysconfdir = prefix + "/etc";
-  String lilypond_datadir = datadir + "/lilypond/" TOPLEVEL_VERSION;
-
-  if (is_dir (lilypond_datadir))
-    prefix_directory = lilypond_datadir;
-
 #if HAVE_GETTEXT
   if (is_dir (localedir))
-    bindtextdomain ("lilypond", localedir.to_str0 ());
+    bindtextdomain ("lilypond", localedir.c_str ());
 #endif
 
-  set_env_file ("FONTCONFIG_FILE", sysconfdir + "/fonts/fonts.conf");
-#ifdef __MINGW32__
-  char font_dir[PATH_MAX];
-  ExpandEnvironmentStrings ("%windir%/fonts", font_dir, sizeof (font_dir));
-  prepend_env_path ("GS_FONTPATH", font_dir);
-#endif
-
-  /* FIXME: *cough* 8.15 *cough* */
-  prepend_env_path ("GS_FONTPATH", datadir + "/ghostscript/8.15/fonts");
-  prepend_env_path ("GS_LIB", datadir + "/ghostscript/8.15/Resource");
-  prepend_env_path ("GS_LIB", datadir + "/ghostscript/8.15/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");
-
-  /* need otherwise dynamic .so's aren't found.   */
-  prepend_env_path ("DYLD_LIBRARY_PATH", libdir);
-  
-  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");
   prepend_env_path ("PATH", bindir);
+
+  if (be_verbose_global)
+    warning (_f ("Relocation: compile datadir=%s, new datadir=%s",
+		 old_lilypond_datadir.c_str (),
+		 lilypond_datadir.c_str ()));
 }
 
-String
-get_working_directory ()
+/*
+  UGH : this is a complete mess.
+*/
+
+static void
+framework_relocation (string prefix)
 {
-  char cwd[PATH_MAX];
-  getcwd (cwd, PATH_MAX);
+  if (be_verbose_global)
+    warning (_f ("Relocation: framework_prefix=%s", prefix));
 
-  return String (cwd);
+  sane_putenv ("INSTALLER_PREFIX", prefix, true);
+	       
+  read_relocation_dir (prefix + "/etc/relocate/");
+
+  string bindir = prefix + "/bin";
+  
+  prepend_env_path ("PATH", bindir);
 }
 
+/*
+  UGH : this is a complete mess.
+*/
 void
-setup_paths (char const *argv0)
+setup_paths (char const *argv0_ptr)
 {
-  prefix_directory = LILYPOND_DATADIR;
+  File_name argv0_filename (argv0_ptr);
   
-  if (relocate_binary
-      && getenv ("LILYPOND_RELOCATE_PREFIX"))
+  if (relocate_binary)
     {
-      String prefix = getenv ("LILYPOND_RELOCATE_PREFIX");
-      /*
-	fixme: need different sep for mingw? 
-      */
-      set_relocation (prefix + "/bin", prefix);
-    }
-  else if (relocate_binary)
-    {
-#if defined (__CYGWIN__) || defined (__MINGW32__)
-      String s = argv0;
-      s.substitute ('\\', '/');
-      argv0 = s.to_str0 ();
-#endif /* __CYGWIN__ || __MINGW32__ */
-
-
-      /* if name contains slashes, we should not look in $PATH */
-      String argv0_abs;
-      if (argv0[0] == '/')
-	argv0_abs = argv0_abs;
-      else if (String (argv0).index ('/') > 0)
-	argv0_abs = get_working_directory () + "/" + String (argv0);
-      else
+      string prefix_directory;
+      if (getenv ("LILYPOND_RELOCATE_PREFIX"))
 	{
-	  /* Find absolute ARGV0 name, using PATH.  */
-	  File_path path;
-	  path.parse_path (getenv ("PATH"));
-
+	  prefix_directory = getenv ("LILYPOND_RELOCATE_PREFIX");
+#ifdef __MINGW32__
+	  /* Normalize file name.  */
+	  prefix_directory = File_name (prefix_directory).to_string ();
+#endif /* __MINGW32__ */
       
+	  prefix_relocation (prefix_directory);
+	  string bindir = prefix_directory + "/bin";
+	  framework_relocation (bindir);
+	}
+      else if (relocate_binary)
+	{
+	  string argv0_abs;
+	  if (argv0_filename.is_absolute ())
+	    {
+	      argv0_abs = argv0_filename.to_string ();
+	      if (be_verbose_global)
+		warning (_f ("Relocation: is absolute: argv0=%s", argv0_ptr));
+	    }
+	  else if (argv0_filename.dir_.length ())
+	    {
+	      argv0_abs = get_working_directory ()
+		+ "/" + string (argv0_filename.to_string ());
+	      if (be_verbose_global)
+		warning (_f ("Relocation: from cwd: argv0=%s", argv0_ptr));
+	    }
+	  else
+	    {
+	      /* Find absolute ARGV0 name, using PATH.  */
+	      File_path path;
+	      path.parse_path (getenv ("PATH"));
+
+	      if (be_verbose_global)
+		warning (_f ("Relocation: from PATH=%s\nargv0=%s",
+			     path.to_string ().c_str (), argv0_ptr));
+
 #ifndef __MINGW32__
-	  String argv0_abs = path.find (argv0);
+	      argv0_abs = path.find (argv0_filename.to_string ());
 #else /* __MINGW32__ */
-	  char const *ext[] = {"exe", "", 0 };
-	  String argv0_abs = path.find (argv0, ext);
+	      char const *ext[] = {"exe", "", 0 };
+	      argv0_abs = path.find (argv0_filename.to_string (), ext);
 #endif /* __MINGW32__ */
 
-	  if (argv0_abs.is_empty ())
+	      if (argv0_abs.empty ())
+		programming_error ("cannot find absolute argv0");
+	    }
+
+	  string bindir = dir_name (argv0_abs);
+	  string argv0_prefix = dir_name (bindir);
+	  string compile_prefix = dir_name (dir_name (dir_name (lilypond_datadir)));
+	  if (argv0_prefix != compile_prefix)
 	    {
-	      File_name name (argv0);
-	      /* If NAME contains slashes and its DIR is not absolute, it can
-		 only be referenced from CWD.  */
-	      if (name.to_string ().index ('/') >= 0 && name.dir_[0] != '/')
-		{
-		  argv0_abs =  get_working_directory () + "/" + argv0;
-		}
-	      else
-		programming_error ("can't find absolute argv0");
+	      prefix_relocation (argv0_prefix);
+	      prefix_directory = argv0_prefix;
+	    }
+	  if (argv0_prefix != compile_prefix || string (FRAMEWORKDIR) != "..")
+	    {
+	      framework_relocation (bindir + "/" + FRAMEWORKDIR);
+	      prefix_directory = bindir + "/" + FRAMEWORKDIR;
 	    }
 	}
-      
-      String bindir = dir_name (argv0_abs);
-      String argv0_prefix = dir_name (bindir);
-      if (argv0_prefix != dir_name (dir_name (dir_name (prefix_directory))))
-	set_relocation (bindir, argv0_prefix);
+
+      lilypond_datadir = prefix_directory
+	+ "/share/lilypond/" TOPLEVEL_VERSION;
     }
-  else
-    (void) argv0;
 
-  /* FIXME: use LILYPOND_DATADIR.  */
-  if (char const *env = getenv ("LILYPONDPREFIX"))
+  if (getenv ("LILYPONDPREFIX"))
+    error (_ ("LILYPONDPREFIX is obsolete, use LILYPOND_DATADIR"));
+
+  if (char const *env = getenv ("LILYPOND_DATADIR"))
     {
-#ifdef __MINGW32__
       /* Normalize file name.  */
-      env = File_name (env).to_string ().get_copy_str0 ();
-#endif
-      prefix_directory = env;
+      lilypond_datadir = File_name (env).to_string ();
     }
 
+  /* When running from build dir, a full LILYPOND_DATADIR is set-up at
+     $(OUTBASE)/{share, lib}/lilypond/current.  Configure lily using
+     ./configure --prefix=$(pwd)/out */
+  string build_datadir_current = dir_name (lilypond_datadir) + "/current";
+  if (!is_dir (lilypond_datadir.c_str ())
+      && is_dir (build_datadir_current.c_str ()))
+    lilypond_datadir = build_datadir_current;
+
+
+  lilypond_datadir = File_name (lilypond_datadir).canonicalized().to_string();
+  
   global_path.append ("");
 
+  /* Adding mf/out make lilypond unchanged source directory, when setting
+     LILYPONDPREFIX to lilypond-x.y.z */
+  char const *suffixes[] = {"ly", "ps", "scm", 0 };
+  
+  vector<string> dirs;
+  for (char const **s = suffixes; *s; s++)
+    {
+      string path = lilypond_datadir + to_string ('/') + string (*s);
+      dirs.push_back (path);
+    }
+  
+  dirs.push_back (lilypond_datadir + "/fonts/otf/");
+  dirs.push_back (lilypond_datadir + "/fonts/type1/");
+  dirs.push_back (lilypond_datadir + "/fonts/svg/");
+  
+  for (vsize i = 0; i < dirs.size (); i++)
+    global_path.prepend (dirs[i]);
+}
+
+string
+expand_environment_variables (string orig)
+{
+  const char *start_ptr = orig.c_str ();
+  const char *ptr = orig.c_str ();
+  size_t len = orig.length ();
+
+  string out;
+  while (ptr < start_ptr + len)
+    {
+      char *dollar = strchr (ptr, '$');
+      
+      if (dollar != NULL)
+	{
+	  char *start_var = dollar + 1;
+	  char *end_var = start_var;
+	  char *start_next = end_var;
+	  
+	  out += string (ptr, dollar - ptr);
+	  ptr = dollar;
+
+	  if (*start_var == '{')
+	    {
+	      start_var ++;
+	      
+	      end_var = strchr (start_var, '}');
+	      
+	      if (end_var == NULL)
+		{
+		  end_var = start_var + len;
+		  start_next = end_var;
+		}
+	      else
+		{
+		  start_next = end_var + 1; 
+		}
+	    }
+	  else 
+	    {
+	      /*
+		Hmm. what to do for $1 , $~ etc.?
+	      */
+	      do
+		{
+		  end_var ++;
+		}
+	      while (isalnum (*end_var) || *end_var == '_');
+	      start_next = end_var;
+	    }
+
+	  if (start_var < end_var)
+	    {
+	      string var_name (start_var, end_var - start_var);
+	      const char *value = getenv (var_name.c_str ());
+	      if (value != NULL)
+		out += string (value);
 
-  /*
-    When running from build dir, a full LILYPOND_PREFIX is set-up at
+	      ptr = start_next;
+	    }
+	}
+      else
+	break;
 
-        $(OUTBASE)/share/lilypond/TOPLEVEL_VERSION
+    }
 
-     This historical hack will allow the shorthand
+  out += ptr;
 
-        LILYPONDPREFIX=out lily/out/lilypond ...
+  return out;
+}
 
-  */
+// Ugh - very inefficient, but safer than fgets.
+static string
+read_line (FILE *f)
+{
+  string out;
   
-  struct stat statbuf;
-  String build_prefix = prefix_directory + "/share/lilypond/" TOPLEVEL_VERSION;
-  if (stat (build_prefix.to_str0 (), &statbuf) == 0)
-    prefix_directory = build_prefix;
+  int c = 0;
+  while ((c = fgetc (f)) != EOF && c != '\n')
+    out += char(c);
 
-  
-  /* Adding mf/out make lilypond unchanged source directory, when setting
-     LILYPONDPREFIX to lilypond-x.y.z */
-  char *suffixes[] = {"ly", "ps", "scm", 0 };
+  return out;
+}
 
-  
-  Array<String> dirs;
-  for (char **s = suffixes; *s; s++)
+void
+read_relocation_file (string filename)
+{
+  if (be_verbose_global)
+    progress_indication (_f ("Relocation file: %s", filename.c_str ())
+			 + "\n");
+      
+  char const *cname = filename.c_str ();
+  FILE *f = fopen (cname, "r");
+  if (!f)
+    error (_f ("cannot open file: `%s'", cname));
+
+  while (!feof (f))
     {
-      String path = prefix_directory + to_string ('/') + String (*s);
-      dirs.push (path);
+      string line = read_line (f);
+      size_t idx = line.find (' ');
+      if (idx == NPOS)
+	continue;
+      
+      string command = line.substr (0, idx);
+      line = line.substr (idx + 1);
+      
+      if (idx == NPOS)
+	continue;
+      idx = line.find ('=');
+
+      string variable = line.substr (0, idx);
+      string value = line.substr (idx + 1);
+
+      value = expand_environment_variables (value);
+
+      if (command == "set")
+	sane_putenv (variable.c_str (), value, true);
+      else if (command == "setdir")
+	set_env_dir (variable.c_str (), value);
+      else if (command == "setfile")
+	set_env_file (variable.c_str (), value);
+      else if (command == "prependdir")
+	prepend_env_path (variable.c_str (), value);
+      else
+	error (_f ("Unknown relocation command %s", command));
     }
 
+  fclose (f);
+}
 
-  dirs.push (prefix_directory + "/fonts/otf/");
-  dirs.push (prefix_directory + "/fonts/type1/");
-  dirs.push (prefix_directory + "/fonts/svg/");
-  
-  for (int i = 0; i < dirs.size (); i++)
-    global_path.prepend (dirs[i]);
+void
+read_relocation_dir (string dirname)
+{
+  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 ());
+      }
 }