use new eina prefix finder.

SVN revision: 58850
devs/devilhorns/wayland_egl
Carsten Haitzler 12 years ago
parent d576cdc68a
commit 51b25f8c52
  1. 5
      legacy/edje/src/bin/Makefile.am
  2. 17
      legacy/edje/src/bin/edje_cc.c
  3. 2
      legacy/edje/src/bin/edje_cc.h
  4. 3
      legacy/edje/src/bin/edje_cc_out.c
  5. 4
      legacy/edje/src/bin/edje_cc_parse.c
  6. 1
      legacy/edje/src/bin/edje_convert.c
  7. 1
      legacy/edje/src/bin/edje_convert_main.c
  8. 448
      legacy/edje/src/bin/edje_prefix.c
  9. 7
      legacy/edje/src/bin/edje_prefix.h

@ -16,8 +16,7 @@ edje_cc_out.c \
edje_cc_parse.c \
edje_cc_mem.c \
edje_cc_handlers.c \
edje_cc_sources.c \
edje_prefix.c
edje_cc_sources.c
edje_cc_CPPFLAGS = \
-I$(top_srcdir)/src/bin \
@ -69,5 +68,5 @@ edje_external_inspector_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_EXTERNA
edje_external_inspector_LDFLAGS = @lt_enable_auto_import@
EXTRA_DIST = @EDJE_RECC_PRG@ edje_prefix.h edje_cc.h edje_convert.h edje_convert.c edje_convert_main.c edje_data_convert.c
EXTRA_DIST = @EDJE_RECC_PRG@ edje_cc.h edje_convert.h edje_convert.c edje_convert_main.c edje_data_convert.c
EXTRA_SCRIPTS = edje_recc

@ -8,10 +8,11 @@
#include <sys/stat.h>
#include "edje_cc.h"
#include "edje_prefix.h"
int _edje_cc_log_dom = -1;
static void main_help(void);
Eina_Prefix *pfx = NULL;
Eina_List *img_dirs = NULL;
Eina_List *fnt_dirs = NULL;
Eina_List *defines = NULL;
@ -147,7 +148,16 @@ main(int argc, char **argv)
exit(-1);
}
e_prefix_determine(argv[0]);
pfx = eina_prefix_new(argv[0], /* argv[0] value (optional) */
main, /* an optional symbol to check path of */
"EDJE", /* env var prefix to use (XXX_PREFIX, XXX_BIN_DIR etc. */
"edje", /* dir to add after "share" (PREFIX/share/DIRNAME) */
"include/edje.inc", /* a magic file to check for in PREFIX/share/DIRNAME for success */
PACKAGE_BIN_DIR, /* package bin dir @ compile time */
PACKAGE_LIB_DIR, /* package lib dir @ compile time */
PACKAGE_DATA_DIR, /* package data dir @ compile time */
PACKAGE_DATA_DIR /* if locale needed use LOCALE_DIR */
);
/* check whether file_in exists */
#ifdef HAVE_REALPATH
@ -216,6 +226,9 @@ main(int argc, char **argv)
data_process_script_lookups();
data_write();
eina_prefix_free(pfx);
pfx = NULL;
edje_shutdown();
eina_log_domain_unregister(_edje_cc_log_dom);
eina_shutdown();

@ -3,6 +3,8 @@
#include <edje_private.h>
extern Eina_Prefix *pfx;
/*
* On Windows, if the file is not opened in binary mode,
* read does not return the correct size, because of

@ -27,7 +27,6 @@ void *alloca (size_t);
#include <Ecore_Evas.h>
#include "edje_cc.h"
#include "edje_prefix.h"
#include "edje_convert.h"
#include <lua.h>
@ -796,7 +795,7 @@ compile_script_file(Eet_File *ef, const char *source, const char *output,
snprintf(buf, sizeof(buf),
"embryo_cc -i %s/include -o %s %s",
e_prefix_data_get(), output, source);
eina_prefix_data_get(pfx), output, source);
ret = system(buf);
/* accept warnings in the embryo code */

@ -30,7 +30,6 @@ void *alloca (size_t);
#include <math.h>
#include "edje_cc.h"
#include "edje_prefix.h"
#include <Ecore.h>
#include <Ecore_File.h>
@ -743,7 +742,8 @@ compile(void)
* Run the input through the C pre-processor.
*/
ret = -1;
snprintf(buf2, sizeof(buf2), "%s/edje/utils/epp"EPP_EXT, e_prefix_lib_get());
snprintf(buf2, sizeof(buf2), "%s/edje/utils/epp" EPP_EXT,
eina_prefix_lib_get(pfx));
if (ecore_file_exists(buf2))
{
snprintf(buf, sizeof(buf), "%s %s -I%s %s -o %s",

@ -1,7 +1,6 @@
#include "edje_private.h"
#include "edje_cc.h"
#include "edje_prefix.h"
#include "edje_convert.h"
static const Edje_File *_current_edje_file = NULL;

@ -8,7 +8,6 @@
#include <sys/stat.h>
#include "edje_cc.h"
#include "edje_prefix.h"
#include "edje_convert.h"
extern Eet_Data_Descriptor *_edje_edd_old_edje_file;

@ -1,448 +0,0 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <sys/types.h>
#include <dirent.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/param.h>
#include <math.h>
#include <limits.h>
#include <ctype.h>
#include <time.h>
#include <dirent.h>
#ifdef HAVE_EVIL
# include <Evil.h>
#endif
#include "edje_prefix.h"
#include "edje_cc.h"
#ifdef _WIN32
# define EDJE_DIR_SEPARATOR '\\'
# define EDJE_DIR_SEPARATOR_S "\\"
#else
# define EDJE_DIR_SEPARATOR '/'
# define EDJE_DIR_SEPARATOR_S "/"
#endif /* _WIN32 */
/* local subsystem functions */
static int _e_prefix_share_hunt(void);
static int _e_prefix_fallbacks(void);
static int _e_prefix_try_proc(void);
static int _e_prefix_try_argv(char *argv0);
/* local subsystem globals */
static char *_exe_path = NULL;
static char *_prefix_path = NULL;
static char *_prefix_path_bin = NULL;
static char *_prefix_path_data = NULL;
static char *_prefix_path_lib = NULL;
#define E_FREE(p) { if (p) {free(p); p = NULL;} }
/*#define PREFIX_CACHE_FILE 1*/
#define SHARE_D "share" EDJE_DIR_SEPARATOR_S "edje"
#define MAGIC_FILE "include" EDJE_DIR_SEPARATOR_S "edje.inc"
#define MAGIC_DAT SHARE_D EDJE_DIR_SEPARATOR_S MAGIC_FILE
/* externally accessible functions */
int
e_prefix_determine(char *argv0)
{
char *p, buf[4096];
struct stat st;
e_prefix_shutdown();
/* if user provides E_PREFIX - then use that or also more specific sub
* dirs for bin, lib, data and locale */
if (getenv("EDJE_PREFIX"))
{
_prefix_path = strdup(getenv("EDJE_PREFIX"));
if (getenv("EDJE_BIN_DIR"))
snprintf(buf, sizeof(buf), "%s", getenv("EDJE_BIN_DIR"));
else
snprintf(buf, sizeof(buf), "%s" EDJE_DIR_SEPARATOR_S "bin", _prefix_path);
_prefix_path_bin = strdup(buf);
if (getenv("EDJE_LIB_DIR"))
snprintf(buf, sizeof(buf), "%s", getenv("EDJE_LIB_DIR"));
else
snprintf(buf, sizeof(buf), "%s" EDJE_DIR_SEPARATOR_S "lib", _prefix_path);
_prefix_path_lib = strdup(buf);
if (getenv("EDJE_DATA_DIR"))
snprintf(buf, sizeof(buf), "%s", getenv("EDJE_DATA_DIR"));
else
snprintf(buf, sizeof(buf), "%s" EDJE_DIR_SEPARATOR_S SHARE_D, _prefix_path);
_prefix_path_data = strdup(buf);
return 1;
}
/* no env var - examine process and possible argv0 */
if (!_e_prefix_try_proc())
{
if (!_e_prefix_try_argv(argv0))
{
_e_prefix_fallbacks();
return 0;
}
}
/* _exe_path is now a full absolute path TO this exe - figure out rest */
/* if
* exe = /blah/whatever/bin/exe
* then
* prefix = /blah/whatever
* bin_dir = /blah/whatever/bin
* data_dir = /blah/whatever/share/enlightenment
* lib_dir = /blah/whatever/lib
*/
p = strrchr(_exe_path, EDJE_DIR_SEPARATOR);
if (p)
{
p--;
while (p >= _exe_path)
{
if (*p == EDJE_DIR_SEPARATOR)
{
_prefix_path = malloc(p - _exe_path + 1);
if (_prefix_path)
{
strncpy(_prefix_path, _exe_path, p - _exe_path);
_prefix_path[p - _exe_path] = 0;
/* bin and lib always together */
snprintf(buf, sizeof(buf), "%s" EDJE_DIR_SEPARATOR_S "bin", _prefix_path);
_prefix_path_bin = strdup(buf);
snprintf(buf, sizeof(buf), "%s" EDJE_DIR_SEPARATOR_S "lib", _prefix_path);
_prefix_path_lib = strdup(buf);
/* check if AUTHORS file is there - then our guess is right */
snprintf(buf, sizeof(buf), "%s" EDJE_DIR_SEPARATOR_S MAGIC_DAT, _prefix_path);
if (stat(buf, &st) == 0)
{
snprintf(buf, sizeof(buf), "%s" EDJE_DIR_SEPARATOR_S SHARE_D, _prefix_path);
_prefix_path_data = strdup(buf);
}
/* AUTHORS file not there. time to start hunting! */
else
{
if (_e_prefix_share_hunt())
{
return 1;
}
else
{
e_prefix_fallback();
return 0;
}
}
return 1;
}
else
{
e_prefix_fallback();
return 0;
}
}
p--;
}
}
e_prefix_fallback();
return 0;
}
void
e_prefix_shutdown(void)
{
E_FREE(_exe_path);
E_FREE(_prefix_path);
E_FREE(_prefix_path_bin);
E_FREE(_prefix_path_data);
E_FREE(_prefix_path_lib);
}
void
e_prefix_fallback(void)
{
e_prefix_shutdown();
_e_prefix_fallbacks();
}
const char *
e_prefix_get(void)
{
return _prefix_path;
}
const char *
e_prefix_bin_get(void)
{
return _prefix_path_bin;
}
const char *
e_prefix_data_get(void)
{
return _prefix_path_data;
}
const char *
e_prefix_lib_get(void)
{
return _prefix_path_lib;
}
/* local subsystem functions */
static int
_e_prefix_share_hunt(void)
{
char buf[4096], buf2[4096], *p;
struct stat st;
/* sometimes this isn't the case - so we need to do a more exhaustive search
* through more parent and subdirs. hre is an example i have seen:
*
* /blah/whatever/exec/bin/exe
* ->
* /blah/whatever/exec/bin
* /blah/whatever/common/share/enlightenment
* /blah/whatever/exec/lib
*/
/* this is pure black magic to try and find data shares */
/* 2. cache file doesn't exist or is invalid - we need to search - this is
* where the real black magic begins */
/* BLACK MAGIC 1:
* /blah/whatever/dir1/bin
* /blah/whatever/dir2/share/enlightenment
*/
if (!_prefix_path_data)
{
DIR *dirp;
struct dirent *dp;
snprintf(buf, sizeof(buf), "%s", _prefix_path);
p = strrchr(buf, '/');
if (p) *p = 0;
dirp = opendir(buf);
if (dirp)
{
char *file;
while ((dp = readdir(dirp)))
{
if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, "..")))
{
file = dp->d_name;
snprintf(buf2, sizeof(buf2), "%s/%s/"MAGIC_DAT, buf, file);
if (stat(buf2, &st) == 0)
{
snprintf(buf2, sizeof(buf2), "%s/%s/"SHARE_D, buf, file);
_prefix_path_data = strdup(buf2);
break;
}
}
}
closedir(dirp);
}
}
/* BLACK MAGIC 2:
* /blah/whatever/dir1/bin
* /blah/whatever/share/enlightenment
*/
if (!_prefix_path_data)
{
snprintf(buf, sizeof(buf), "%s", _prefix_path);
p = strrchr(buf, '/');
if (p) *p = 0;
snprintf(buf2, sizeof(buf2), "%s/"MAGIC_DAT, buf);
if (stat(buf, &st) == 0)
{
snprintf(buf2, sizeof(buf2), "%s/"SHARE_D, buf);
_prefix_path_data = strdup(buf2);
}
}
/* add more black magic as required as we discover weridnesss - remember
* this is to save users having to set environment variables to tell
* e where it lives, so e auto-adapts. so these code snippets are just
* logic to figure that out for the user
*/
/* done. we found it - write cache file */
if (_prefix_path_data)
{
return 1;
}
/* fail. everything failed */
return 0;
}
static int
_e_prefix_fallbacks(void)
{
char *p;
_prefix_path = strdup(PACKAGE_BIN_DIR);
p = strrchr(_prefix_path, '/');
if (p) *p = 0;
_prefix_path_bin = strdup(PACKAGE_BIN_DIR);
_prefix_path_data = strdup(PACKAGE_DATA_DIR);
_prefix_path_lib = strdup(PACKAGE_LIB_DIR);
WRN("WARNING: Edje could not determine its installed prefix\n"
" and is falling back on the compiled in default:\n"
" %s\n"
" You might like to try setting the following environment variables:\n"
" EDJE_PREFIX - points to the base prefix of install\n"
" EDJE_BIN_DIR - optional in addition to E_PREFIX to provide\n"
" a more specific binary directory\n"
" EDJE_LIB_DIR - optional in addition to E_PREFIX to provide\n"
" a more specific library dir\n"
" EDJE_DATA_DIR- optional in addition to E_PREFIX to provide\n"
" a more specific location for shared data",
_prefix_path);
return 1;
}
static int
_e_prefix_try_proc(void)
{
FILE *f;
char buf[4096];
void *func = NULL;
func = (void *)_e_prefix_try_proc;
f = fopen("/proc/self/maps", "rb");
if (!f) return 0;
while (fgets(buf, sizeof(buf), f))
{
int len;
char *p, mode[5] = "";
unsigned long ptr1 = 0, ptr2 = 0;
len = strlen(buf);
if (buf[len - 1] == '\n')
{
buf[len - 1] = 0;
len--;
}
if (sscanf(buf, "%lx-%lx %4s", &ptr1, &ptr2, mode) == 3)
{
if (!strcmp(mode, "r-xp"))
{
if (((void *)ptr1 <= func) && (func < (void *)ptr2))
{
p = strchr(buf, '/');
if (p)
{
if (len > 10)
{
if (!strcmp(buf + len - 10, " (deleted)"))
buf[len - 10] = 0;
}
_exe_path = strdup(p);
fclose(f);
return 1;
}
else
break;
}
}
}
}
fclose(f);
return 0;
}
static int
_e_prefix_try_argv(char *argv0)
{
char *path, *p, *cp, *s;
int len, lenexe;
char buf[4096], buf2[4096], buf3[4096];
/* 1. is argv0 abs path? */
#ifdef _WIN32
if (argv0[1] == ':')
#else
if (argv0[0] == '/')
#endif
{
_exe_path = strdup(argv0);
if (access(_exe_path, X_OK) == 0) return 1;
free(_exe_path);
_exe_path = NULL;
return 0;
}
/* 2. relative path */
if (strchr(argv0, '/'))
{
if (getcwd(buf3, sizeof(buf3)))
{
snprintf(buf2, sizeof(buf2), "%s/%s", buf3, argv0);
if (realpath(buf2, buf))
{
_exe_path = strdup(buf);
if (access(_exe_path, X_OK) == 0) return 1;
free(_exe_path);
_exe_path = NULL;
}
}
}
/* 3. argv0 no path - look in PATH */
path = getenv("PATH");
if (!path) return 0;
p = path;
cp = p;
lenexe = strlen(argv0);
while ((p = strchr(cp, ':')))
{
len = p - cp;
s = malloc(len + 1 + lenexe + 1);
if (s)
{
strncpy(s, cp, len);
s[len] = '/';
strcpy(s + len + 1, argv0);
if (realpath(s, buf))
{
if (access(buf, X_OK) == 0)
{
_exe_path = strdup(buf);
free(s);
return 1;
}
}
free(s);
}
cp = p + 1;
}
len = strlen(cp);
s = malloc(len + 1 + lenexe + 1);
if (s)
{
strncpy(s, cp, len);
s[len] = '/';
strcpy(s + len + 1, argv0);
if (realpath(s, buf))
{
if (access(buf, X_OK) == 0)
{
_exe_path = strdup(buf);
free(s);
return 1;
}
}
free(s);
}
/* 4. big problems. arg[0] != executable - weird execution */
return 0;
}

@ -1,7 +0,0 @@
int e_prefix_determine(char *argv0);
void e_prefix_shutdown(void);
void e_prefix_fallback(void);
const char *e_prefix_get(void);
const char *e_prefix_bin_get(void);
const char *e_prefix_data_get(void);
const char *e_prefix_lib_get(void);
Loading…
Cancel
Save