Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
Makefile.am edje_cc.c edje_cc_out.c edje_cc_parse.c
edje_decc.c edje_main.h edje_prefix.c
Log Message:
evilize edje. Link against ecore_file only when needed. PATH_MAX and not
MAX_PATH. Minor other fixes.
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/Makefile.am,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- Makefile.am 31 May 2008 06:10:58 -0000 1.45
+++ Makefile.am 6 Jun 2008 18:31:48 -0000 1.46
@@ -8,7 +8,21 @@
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
+
+if BUILD_EDJE_CC
+EDJE_CC = edje_cc
+else
+EDJE_CC =
+endif
+
+if BUILD_EDJE_DECC
+EDJE_DECC = edje_decc
+else
+EDJE_DECC =
+endif
bin_SCRIPTS = \
@EDJE_RECC_PRG@
@@ -16,9 +30,7 @@
EXTRA_DIST = @EDJE_RECC_PRG@
EXTRA_SCRIPTS = edje_recc
-bin_PROGRAMS = \
-edje_cc \
-edje_decc
+bin_PROGRAMS = $(EDJE_CC) $(EDJE_DECC)
EXTRA_PROGRAMS = \
edje_cc \
@@ -37,7 +49,7 @@
edje_main.h
edje_cc_CFLAGS = @WIN32_CFLAGS@
-edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la $(EDJE_LIBS)
+edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la $(EDJE_LIBS) $(EVIL_LIBS)
edje_cc_LDFLAGS = @lt_enable_auto_import@
edje_cc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
@@ -49,6 +61,6 @@
edje_cc_sources.c
edje_decc_CFLAGS = @WIN32_CFLAGS@
-edje_decc_LDADD = $(top_builddir)/src/lib/libedje.la @edje_decc_lib@
$(EDJE_LIBS)
+edje_decc_LDADD = $(top_builddir)/src/lib/libedje.la $(EDJE_LIBS)
$(ECORE_FILE_LIBS) $(EVIL_LIBS)
edje_decc_LDFLAGS = @lt_enable_auto_import@
edje_decc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- edje_cc.c 27 Aug 2007 09:32:17 -0000 1.29
+++ edje_cc.c 6 Jun 2008 18:31:48 -0000 1.30
@@ -125,11 +125,7 @@
#ifdef HAVE_REALPATH
if (!realpath(file_in, rpath) || stat(rpath, &st) || !S_ISREG(st.st_mode))
#else
-# ifdef _WIN32
- if (!_fullpath(rpath, file_in, _MAX_PATH) || stat(rpath, &st) ||
!S_ISREG(st.st_mode))
-# else
if (stat(file_in, &st) || !S_ISREG(st.st_mode))
-# endif /* _WIN32 */
#endif
{
fprintf(stderr, "%s: Error: file not found: %s.\n", progname, file_in);
@@ -161,11 +157,7 @@
#ifdef HAVE_REALPATH
if (realpath(file_out, rpath2) && !strcmp (rpath, rpath2))
#else
-# ifdef _WIN32
- if (_fullpath(rpath2, file_out, _MAX_PATH) && !strcmp (rpath, rpath2))
-# else
if (!strcmp (file_in, file_out))
-# endif /* _WIN32 */
#endif
{
fprintf(stderr, "%s: Error: input file equals output file.\n",
progname);
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_out.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- edje_cc_out.c 11 Apr 2008 23:36:35 -0000 1.60
+++ edje_cc_out.c 6 Jun 2008 18:31:48 -0000 1.61
@@ -2,12 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#ifdef _WIN32
-# include <share.h>
-# include <sys/stat.h>
-#endif /* _WIN32 */
-
-
#include "edje_cc.h"
typedef struct _Part_Lookup Part_Lookup;
@@ -600,34 +594,16 @@
{
char tmpn[4096];
int fd;
-#ifdef _WIN32
char *tmpdir;
-#endif /* _WIN32 */
-#ifdef _WIN32
- tmpdir = getenv("TMP");
- if (!tmpdir) tmpdir = getenv("TEMP");
- if (!tmpdir) tmpdir = getenv("USERPROFILE");
- if (!tmpdir) tmpdir = getenv("WINDIR");
- if (tmpdir)
- {
- snprintf(tmpn, _MAX_PATH, "%s/edje_cc.sma-tmp-XXXXXX",
tmpdir);
-# ifdef __MINGW32__
- if (_mktemp(tmpn))
- fd = _sopen(tmpn, _O_RDWR | _O_BINARY | _O_CREAT,
_SH_DENYNO, _S_IREAD | _S_IWRITE);
-# else
- if (!_mktemp_s(tmpn, _MAX_PATH))
- _sopen_s(&fd, tmpn, _O_RDWR | _O_BINARY | _O_CREAT,
_SH_DENYNO, _S_IREAD | _S_IWRITE);
-# endif /* __MINGW32__ */
- else
- fd = -1;
- }
- else
- fd= -1;
+#ifdef HAVE_EVIL
+ tmpdir = evil_tmpdir_get();
#else
+ tmpdir = "/tmp";
+#endif
+ snprintf(tmpn, PATH_MAX, "%s/edje_cc.sma-tmp-XXXXXX", tmpdir);
strcpy(tmpn, "/tmp/edje_cc.sma-tmp-XXXXXX");
fd = mkstemp(tmpn);
-#endif /* _WIN32 */
if (fd >= 0)
{
FILE *f;
@@ -708,30 +684,9 @@
fclose(f);
}
close(fd);
-#ifdef _WIN32
- tmpdir = getenv("TMP");
- if (!tmpdir) tmpdir = getenv("TEMP");
- if (!tmpdir) tmpdir = getenv("USERPROFILE");
- if (!tmpdir) tmpdir = getenv("WINDIR");
- if (tmpdir)
- {
- snprintf(tmpo, _MAX_PATH, "%s/edje_cc.amx-tmp-XXXXXX",
tmpdir);
-# ifdef __MINGW32__
- if (_mktemp(tmpo))
- fd = _sopen(tmpo, _O_RDWR | _O_BINARY | _O_CREAT,
_SH_DENYNO, _S_IREAD | _S_IWRITE);
-# else
- if (!_mktemp_s(tmpo, _MAX_PATH))
- _sopen_s(&fd, tmpo, _O_RDWR | _O_BINARY | _O_CREAT,
_SH_DENYNO, _S_IREAD | _S_IWRITE);
-# endif /* __MINGW32__ */
- else
- fd = -1;
- }
- else
- fd= -1;
-#else
+ snprintf(tmpo, PATH_MAX, "%s/edje_cc.amx-tmp-XXXXXX",
tmpdir);
strcpy(tmpo, "/tmp/edje_cc.amx-tmp-XXXXXX");
fd = mkstemp(tmpo);
-#endif /* _WIN32 */
if (fd >= 0)
{
snprintf(buf, sizeof(buf),
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_parse.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- edje_cc_parse.c 1 Apr 2008 21:30:54 -0000 1.50
+++ edje_cc_parse.c 6 Jun 2008 18:31:48 -0000 1.51
@@ -2,10 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#ifdef _WIN32
-# include <windows.h>
-#endif /* _WIN32 */
-
#include "edje_cc.h"
static void new_object(void);
@@ -609,36 +605,27 @@
void
compile(void)
{
- int fd;
- off_t size;
- char *data, *p;
-#ifdef _WIN32
- int ret;
-#endif /* _WIN32 */
char buf[4096];
char inc[4096];
static char tmpn[4096];
+ int fd;
+ off_t size;
+ char *data, *p;
+ char *tmpdir;
+
+#ifdef HAVE_EVIL
+ tmpdir = evil_tmpdir_get();
+#else
+ tmpdir = "/tmp";
+#endif
strncpy(inc, file_in, 4000);
inc[4001] = 0;
p = strrchr(inc, '/');
if (!p) strcpy(inc, "./");
else *p = 0;
-#ifdef _WIN32
- ret = GetTempPath(4096, buf);
- if ((ret > 4096) || (ret == 0))
- fd = -1;
- else
- {
- if (!GetTempFileName(buf, "edj", 0, tmpn))
- fd = -1;
- else
- fd = open(tmpn, _O_RDWR | _O_BINARY | _O_CREAT, 0444);
- }
-#else
- strcpy(tmpn, "/tmp/edje_cc.edc-tmp-XXXXXX");
+ snprintf (tmpn, PATH_MAX, "%s/edje_cc.edc-tmp-XXXXXX", tmpdir);
fd = mkstemp(tmpn);
-#endif /* _WIN32 */
if (fd >= 0)
{
int ret;
@@ -706,11 +693,7 @@
free(def);
*/
}
-#ifdef _WIN32
- fd = open(file_in, _O_RDONLY | _O_BINARY);
-#else
fd = open(file_in, O_RDONLY);
-#endif /* _WIN32 */
if (fd < 0)
{
fprintf(stderr, "%s: Error. cannot open file \"%s\" for input. %s\n",
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_decc.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- edje_decc.c 24 Mar 2008 08:09:06 -0000 1.25
+++ edje_decc.c 6 Jun 2008 18:31:48 -0000 1.26
@@ -3,17 +3,14 @@
*/
/* ugly ugly. avert your eyes. */
-#include "edje_decc.h"
#include <sys/types.h>
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
+
#include <Ecore_File.h>
-#ifdef _WIN32
-# include <windows.h>
-# include <shlobj.h>
-# include <objidl.h>
-#endif /* _WIN32 */
+
+#include "edje_decc.h"
char *progname = NULL;
char *file_in = NULL;
@@ -40,49 +37,6 @@
,progname);
}
-#ifdef _WIN32
-int
-symlink (const char *oldpath, const char *newpath)
-{
- IShellLink *pISL;
- IPersistFile *pIPF;
-
- if (FAILED(CoInitialize(NULL)))
- return 0;
-
- if (FAILED(CoCreateInstance(&CLSID_ShellLink,
- NULL,
- CLSCTX_INPROC_SERVER,
- &IID_IShellLink,
- (PVOID *)&pISL)))
- goto no_instance;
-
- if (FAILED(pISL->lpVtbl->SetPath(pISL, oldpath)))
- goto no_setpath;
-
- if (FAILED(pISL->lpVtbl->QueryInterface(pISL, &IID_IPersistFile, (PVOID *)
&pIPF)))
- goto no_queryinterface;
-
- if (FAILED(pIPF->lpVtbl->Save(pIPF, newpath, FALSE)))
- goto no_save;
-
- pIPF->lpVtbl->Release(pIPF);
- pISL->lpVtbl->Release(pISL);
- CoUninitialize();
-
- return 1;
-
- no_save:
- pIPF->lpVtbl->Release(pIPF);
- no_queryinterface:
- no_setpath:
- pISL->lpVtbl->Release(pISL);
- no_instance:
- CoUninitialize();
- return 0;
-}
-#endif /* _WIN32 */
-
Eet_File *ef;
Eet_Dictionary *ed;
@@ -349,9 +303,7 @@
symlink(sf->name, out);
}
-#ifndef _WIN32
chmod(out, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP);
-#endif /* _WIN32 */
printf("\n*** CAUTION ***\n"
"Please check the build script for anything malicious "
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_main.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- edje_main.h 24 Mar 2008 08:09:06 -0000 1.10
+++ edje_main.h 6 Jun 2008 18:31:48 -0000 1.11
@@ -1,15 +1,7 @@
#ifndef EDJE_MAIN_H
#define EDJE_MAIN_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <Evas.h>
-#include <Ecore.h>
-#include <Ecore_Evas.h>
-#include <Eet.h>
-#include "Edje.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -21,6 +13,20 @@
#include <stdarg.h>
#include <locale.h>
#include <ctype.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef HAVE_EVIL
+# include <Evil.h>
+#endif
+
+#include <Evas.h>
+#include <Ecore.h>
+#include <Ecore_Evas.h>
+#include <Eet.h>
+#include "Edje.h"
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_prefix.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_prefix.c 13 Apr 2008 12:39:14 -0000 1.7
+++ edje_prefix.c 6 Jun 2008 18:31:48 -0000 1.8
@@ -1,7 +1,11 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -385,11 +389,7 @@
if (getcwd(buf3, sizeof(buf3)))
{
snprintf(buf2, sizeof(buf2), "%s/%s", buf3, argv0);
-#ifdef _WIN32
- if (_fullpath(buf, buf2, _MAX_PATH))
-#else
if (realpath(buf2, buf))
-#endif /* _WIN32 */
{
_exe_path = strdup(buf);
if (access(_exe_path, X_OK) == 0) return 1;
@@ -413,11 +413,7 @@
strncpy(s, cp, len);
s[len] = '/';
strcpy(s + len + 1, argv0);
-#ifdef _WIN32
- if (_fullpath(buf, s, _MAX_PATH))
-#else
if (realpath(s, buf))
-#endif /* _WIN32 */
{
if (access(buf, X_OK) == 0)
{
@@ -437,11 +433,7 @@
strncpy(s, cp, len);
s[len] = '/';
strcpy(s + len + 1, argv0);
-#ifdef _WIN32
- if (_fullpath(buf, s, _MAX_PATH))
-#else
if (realpath(s, buf))
-#endif /* _WIN32 */
{
if (access(buf, X_OK) == 0)
{
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
