Screenshot instructions:
Windows
Mac
Red Hat Linux
Ubuntu
Click URL instructions:
Right-click on ad, choose "Copy Link", then paste here →
(This may not be possible with some types of ads)
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(281) |
Sep
(604) |
Oct
(993) |
Nov
(511) |
Dec
(520) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(476) |
Feb
(432) |
Mar
(524) |
Apr
(653) |
May
(393) |
Jun
(356) |
Jul
(329) |
Aug
(584) |
Sep
(683) |
Oct
(559) |
Nov
(690) |
Dec
(762) |
| 2010 |
Jan
(924) |
Feb
(912) |
Mar
(964) |
Apr
(859) |
May
(867) |
Jun
(593) |
Jul
(769) |
Aug
(1067) |
Sep
(1142) |
Oct
(1134) |
Nov
(1030) |
Dec
(691) |
| 2011 |
Jan
(822) |
Feb
(828) |
Mar
(791) |
Apr
(824) |
May
(799) |
Jun
(1039) |
Jul
(1035) |
Aug
(1121) |
Sep
(687) |
Oct
(852) |
Nov
(1138) |
Dec
(979) |
| 2012 |
Jan
(957) |
Feb
(893) |
Mar
(1265) |
Apr
(737) |
May
(1051) |
Jun
(1464) |
Jul
(1618) |
Aug
(1202) |
Sep
(1304) |
Oct
(1504) |
Nov
(1219) |
Dec
(1981) |
| 2013 |
Jan
(1566) |
Feb
(858) |
Mar
(83) |
Apr
(66) |
May
(9) |
Jun
(14) |
Jul
(13) |
Aug
|
Sep
(5) |
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
1
(35) |
2
(21) |
3
(22) |
4
(20) |
|
5
(27) |
6
(16) |
7
(27) |
8
(45) |
9
(104) |
10
(39) |
11
(13) |
|
12
(12) |
13
(54) |
14
(51) |
15
(50) |
16
(25) |
17
(34) |
18
(43) |
|
19
(50) |
20
(43) |
21
(34) |
22
(54) |
23
(45) |
24
(51) |
25
(58) |
|
26
(26) |
27
(37) |
28
(41) |
29
(41) |
30
(24) |
|
|
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 20:51:51
|
Log:
connman: set also gateway when configuring manually
Author: lucas
Date: 2010-09-15 13:51:43 -0700 (Wed, 15 Sep 2010)
New Revision: 52329
Modified:
trunk/e_dbus/src/bin/e_dbus_connman_test.c trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/connman/e_connman_service.c
Modified: trunk/e_dbus/src/bin/e_dbus_connman_test.c
===================================================================
--- trunk/e_dbus/src/bin/e_dbus_connman_test.c 2010-09-15 20:51:37 UTC (rev 52328)
+++ trunk/e_dbus/src/bin/e_dbus_connman_test.c 2010-09-15 20:51:43 UTC (rev 52329)
@@ -2046,7 +2046,7 @@
static Eina_Bool
_on_cmd_service_ipv4_configure_manual(__UNUSED__ char *cmd, char *args)
{
- char *path, *next_args, *address, *netmask = NULL;
+ char *path, *next_args, *address, *netmask = NULL, *gateway = NULL;
E_Connman_Element *e;
if (!args)
@@ -2065,17 +2065,21 @@
address = next_args;
next_args = _tok(next_args);
if (next_args)
+ netmask = next_args;
+
+ next_args = _tok(next_args);
+ if (next_args)
{
- netmask = next_args;
+ gateway = next_args;
_tok(next_args);
}
e = e_connman_service_get(path);
if (e_connman_service_ipv4_configure_manual
- (e, address, netmask,
+ (e, address, netmask, gateway,
_method_success_check, "service_ipv4_configure_manual"))
- printf(":::Service %s IPv4 Configuration set to Manual (%s/%s)\n",
- path, address, netmask);
+ printf(":::Service %s IPv4 Configuration set to Manual (%s/%s) gw %s\n",
+ path, address, netmask, gateway);
else
fputs("ERROR: can't set service ipv4_configuration manual\n", stderr);
return ECORE_CALLBACK_RENEW;
Modified: trunk/e_dbus/src/lib/connman/E_Connman.h
===================================================================
--- trunk/e_dbus/src/lib/connman/E_Connman.h 2010-09-15 20:51:37 UTC (rev 52328)
+++ trunk/e_dbus/src/lib/connman/E_Connman.h 2010-09-15 20:51:43 UTC (rev 52329)
@@ -171,7 +171,7 @@
/* Methods to configure IPv4 service */
EAPI bool e_connman_service_ipv4_configure_dhcp(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
- EAPI bool e_connman_service_ipv4_configure_manual(E_Connman_Element *service, const char *address, const char *netmask, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
+ EAPI bool e_connman_service_ipv4_configure_manual(E_Connman_Element *service, const char *address, const char *netmask, const char *gateway, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
/* Technologies methods */
EAPI E_Connman_Element *e_connman_technology_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
Modified: trunk/e_dbus/src/lib/connman/e_connman_service.c
===================================================================
--- trunk/e_dbus/src/lib/connman/e_connman_service.c 2010-09-15 20:51:37 UTC (rev 52328)
+++ trunk/e_dbus/src/lib/connman/e_connman_service.c 2010-09-15 20:51:43 UTC (rev 52329)
@@ -1062,14 +1062,15 @@
*
* @param service path to set.
* @param address IPv4 address.
- * @param netmask IPv4 netmask, or @c NULL for "/32"
+ * @param netmask IPv4 netmask, or @c NULL for "/32".
+ * @param gateway IPv4 gateway address.
* @param cb function to call when server replies or some error happens.
* @param data data to give to cb when it is called.
*
* @return 1 on success, 0 otherwise.
*/
bool
-e_connman_service_ipv4_configure_manual(E_Connman_Element *service, const char *address, const char *netmask, E_DBus_Method_Return_Cb cb, const void *data)
+e_connman_service_ipv4_configure_manual(E_Connman_Element *service, const char *address, const char *netmask, const char *gateway, E_DBus_Method_Return_Cb cb, const void *data)
{
const char name[] = "SetProperty";
const char *method = "manual"; /* not method[] as gcc screws it with dbus */
@@ -1127,6 +1128,16 @@
dbus_message_iter_close_container(&dict, &entry);
}
+ if (gateway)
+ {
+ dbus_message_iter_open_container
+ (&dict, DBUS_TYPE_DICT_ENTRY, NULL, &entry);
+ dbus_message_iter_append_basic
+ (&entry, DBUS_TYPE_STRING, &e_connman_prop_gateway);
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &gateway);
+ dbus_message_iter_close_container(&dict, &entry);
+ }
+
dbus_message_iter_close_container(&variant, &dict);
dbus_message_iter_close_container(&itr, &variant);
|
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 20:51:44
|
Log:
Remove unneeded re-definition of EAPI
Windows doesn't have these submodules and the #else part is just a
re-define of what is made in eina_types.h
Author: lucas
Date: 2010-09-15 13:51:37 -0700 (Wed, 15 Sep 2010)
New Revision: 52328
Modified:
trunk/e_dbus/src/lib/bluez/E_Bluez.h trunk/e_dbus/src/lib/connman/E_Connman.h trunk/e_dbus/src/lib/hal/E_Hal.h trunk/e_dbus/src/lib/notification/E_Notify.h trunk/e_dbus/src/lib/ofono/E_Ofono.h trunk/e_dbus/src/lib/ukit/E_Ukit.h
Modified: trunk/e_dbus/src/lib/bluez/E_Bluez.h
===================================================================
--- trunk/e_dbus/src/lib/bluez/E_Bluez.h 2010-09-15 20:51:27 UTC (rev 52327)
+++ trunk/e_dbus/src/lib/bluez/E_Bluez.h 2010-09-15 20:51:37 UTC (rev 52328)
@@ -8,28 +8,6 @@
#include <Ecore.h>
#include <E_DBus.h>
-#ifdef EAPI
-# undef EAPI
-#endif
-
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-# define EAPI __declspec(dllexport)
-# else
-# define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-# if __GNUC__ >= 4
-# define EAPI __attribute__ ((visibility("default")))
-# else
-# define EAPI
-# endif
-# else
-# define EAPI
-# endif
-#endif
-
/**
* @defgroup EBluez_Group EBluez
*
Modified: trunk/e_dbus/src/lib/connman/E_Connman.h
===================================================================
--- trunk/e_dbus/src/lib/connman/E_Connman.h 2010-09-15 20:51:27 UTC (rev 52327)
+++ trunk/e_dbus/src/lib/connman/E_Connman.h 2010-09-15 20:51:37 UTC (rev 52328)
@@ -9,28 +9,6 @@
#include <Ecore.h>
#include <E_DBus.h>
-#ifdef EAPI
-# undef EAPI
-#endif
-
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-# define EAPI __declspec(dllexport)
-# else
-# define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-# if __GNUC__ >= 4
-# define EAPI __attribute__ ((visibility("default")))
-# else
-# define EAPI
-# endif
-# else
-# define EAPI
-# endif
-#endif
-
/**
* @defgroup EConnman_Group EConnman
*
Modified: trunk/e_dbus/src/lib/hal/E_Hal.h
===================================================================
--- trunk/e_dbus/src/lib/hal/E_Hal.h 2010-09-15 20:51:27 UTC (rev 52327)
+++ trunk/e_dbus/src/lib/hal/E_Hal.h 2010-09-15 20:51:37 UTC (rev 52328)
@@ -4,28 +4,6 @@
#include <Eina.h>
#include <E_DBus.h>
-#ifdef EAPI
-# undef EAPI
-#endif
-
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-# define EAPI __declspec(dllexport)
-# else
-# define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-# if __GNUC__ >= 4
-# define EAPI __attribute__ ((visibility("default")))
-# else
-# define EAPI
-# endif
-# else
-# define EAPI
-# endif
-#endif
-
/**
* @defgroup EHal_Group EHal
*
Modified: trunk/e_dbus/src/lib/notification/E_Notify.h
===================================================================
--- trunk/e_dbus/src/lib/notification/E_Notify.h 2010-09-15 20:51:27 UTC (rev 52327)
+++ trunk/e_dbus/src/lib/notification/E_Notify.h 2010-09-15 20:51:37 UTC (rev 52328)
@@ -5,28 +5,6 @@
#include <Evas.h>
#include <E_DBus.h>
-#ifdef EAPI
-# undef EAPI
-#endif
-
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-# define EAPI __declspec(dllexport)
-# else
-# define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-# if __GNUC__ >= 4
-# define EAPI __attribute__ ((visibility("default")))
-# else
-# define EAPI
-# endif
-# else
-# define EAPI
-# endif
-#endif
-
/**
* @defgroup ENotify_Group ENotify
*
Modified: trunk/e_dbus/src/lib/ofono/E_Ofono.h
===================================================================
--- trunk/e_dbus/src/lib/ofono/E_Ofono.h 2010-09-15 20:51:27 UTC (rev 52327)
+++ trunk/e_dbus/src/lib/ofono/E_Ofono.h 2010-09-15 20:51:37 UTC (rev 52328)
@@ -8,28 +8,6 @@
#include <Ecore.h>
#include <E_DBus.h>
-#ifdef EAPI
-# undef EAPI
-#endif
-
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-# define EAPI __declspec(dllexport)
-# else
-# define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-# if __GNUC__ >= 4
-# define EAPI __attribute__ ((visibility("default")))
-# else
-# define EAPI
-# endif
-# else
-# define EAPI
-# endif
-#endif
-
/**
* @defgroup EOfono_Group EOfono
*
Modified: trunk/e_dbus/src/lib/ukit/E_Ukit.h
===================================================================
--- trunk/e_dbus/src/lib/ukit/E_Ukit.h 2010-09-15 20:51:27 UTC (rev 52327)
+++ trunk/e_dbus/src/lib/ukit/E_Ukit.h 2010-09-15 20:51:37 UTC (rev 52328)
@@ -4,28 +4,6 @@
#include <Eina.h>
#include <E_DBus.h>
-#ifdef EAPI
-# undef EAPI
-#endif
-
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-# define EAPI __declspec(dllexport)
-# else
-# define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-# if __GNUC__ >= 4
-# define EAPI __attribute__ ((visibility("default")))
-# else
-# define EAPI
-# endif
-# else
-# define EAPI
-# endif
-#endif
-
/**
* @defgroup EUkit_Group EUkit
*
|
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 20:51:35
|
Log: Clear connman header file Remove lots of blank lines by grouping similar functions. Author: lucas Date: 2010-09-15 13:51:27 -0700 (Wed, 15 Sep 2010) New Revision: 52327 Modified: trunk/e_dbus/src/lib/connman/E_Connman.h Modified: trunk/e_dbus/src/lib/connman/E_Connman.h =================================================================== --- trunk/e_dbus/src/lib/connman/E_Connman.h 2010-09-15 20:40:51 UTC (rev 52326) +++ trunk/e_dbus/src/lib/connman/E_Connman.h 2010-09-15 20:51:27 UTC (rev 52327) @@ -138,75 +138,57 @@ /* Services Methods */ EAPI E_Connman_Element *e_connman_service_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_connect(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_disconnect(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; + EAPI bool e_connman_service_clear_property(E_Connman_Element *service, const char *property, E_DBus_Method_Return_Cb cb, const void *data); EAPI bool e_connman_service_remove(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_clear_property(E_Connman_Element *service, const char *property, E_DBus_Method_Return_Cb cb, const void *data); + EAPI bool e_connman_service_connect(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; + EAPI bool e_connman_service_disconnect(E_Connman_Element *service, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_move_before(E_Connman_Element *service, const char *object_path, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_move_after(E_Connman_Element *service, const char *object_path, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_state_get(const E_Connman_Element *service, const char **state) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_error_get(const E_Connman_Element *service, const char **error) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_name_get(const E_Connman_Element *service, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_type_get(const E_Connman_Element *service, const char **type) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_mode_get(const E_Connman_Element *service, const char **mode) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_security_get(const E_Connman_Element *service, const char **security) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_passphrase_get(const E_Connman_Element *service, const char **passphrase) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_passphrase_set(E_Connman_Element *service, const char *passphrase, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_passphrase_required_get(const E_Connman_Element *service, bool *passphrase_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_strength_get(const E_Connman_Element *service, unsigned char *strength) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_favorite_get(const E_Connman_Element *service, bool *favorite) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_immutable_get(const E_Connman_Element *service, bool *immutable) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_auto_connect_get(const E_Connman_Element *service, bool *auto_connect) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_auto_connect_set(E_Connman_Element *service, bool auto_connect, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_setup_required_get(const E_Connman_Element *service, bool *setup_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; + EAPI bool e_connman_service_passphrase_required_get(const E_Connman_Element *service, bool *passphrase_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_apn_get(const E_Connman_Element *service, const char **apn) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_apn_set(E_Connman_Element *service, const char *apn, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_mcc_get(const E_Connman_Element *service, const char **mcc) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_mnc_get(const E_Connman_Element *service, const char **mnc) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_roaming_get(const E_Connman_Element *service, bool *roaming) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_ipv4_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_gateway_get(const E_Connman_Element *service, const char **gateway) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_ipv4_configuration_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_configuration_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_configuration_gateway_get(const E_Connman_Element *service, const char **gateway) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ipv4_configuration_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_service_ethernet_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ethernet_address_get(const E_Connman_Element *service, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ethernet_mtu_get(const E_Connman_Element *service, unsigned short *mtu) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_service_ethernet_netmask_get(const E_Connman_Element *service, const char **netmask) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; /* Methods to configure IPv4 service */ @@ -243,16 +225,14 @@ EAPI void e_connman_element_print(FILE *fp, const E_Connman_Element *element) EINA_ARG_NONNULL(1, 2); - EAPI bool e_connman_element_properties_sync(E_Connman_Element *element) EINA_ARG_NONNULL(1); EAPI bool e_connman_element_properties_sync_full(E_Connman_Element *element, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1); + EAPI void e_connman_element_properties_list(const E_Connman_Element *element, bool (*cb)(void *data, const E_Connman_Element *element, const char *name, int type, const void *value), const void *data) EINA_ARG_NONNULL(1, 2); EAPI bool e_connman_element_property_set(E_Connman_Element *element, const char *prop, int type, const void *value) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_element_property_set_full(E_Connman_Element *element, const char *prop, int type, const void *value, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_element_property_dict_set_full(E_Connman_Element *element, const char *prop, const char *key, int type, const void *value, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - EAPI void e_connman_element_properties_list(const E_Connman_Element *element, bool (*cb)(void *data, const E_Connman_Element *element, const char *name, int type, const void *value), const void *data) EINA_ARG_NONNULL(1, 2); - EAPI bool e_connman_element_property_type_get_stringshared(const E_Connman_Element *element, const char *name, int *type) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_element_property_type_get(const E_Connman_Element *element, const char *name, int *type) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_element_property_dict_get_stringshared(const E_Connman_Element *element, const char *dict_name, const char *key_name, int *type, void *value) EINA_ARG_NONNULL(1, 2, 4) EINA_WARN_UNUSED_RESULT; @@ -276,11 +256,8 @@ EAPI bool e_connman_device_propose_scan(E_Connman_Element *device, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_device_address_get(const E_Connman_Element *device, const char **address); - EAPI bool e_connman_device_name_get(const E_Connman_Element *device, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_type_get(const E_Connman_Element *device, const char **type) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_device_interface_get(const E_Connman_Element *device, const char **interface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_device_powered_get(const E_Connman_Element *device, bool *powered) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; @@ -302,30 +279,19 @@ EAPI E_Connman_Element *e_connman_network_get(const char *path) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_network_address_get(const E_Connman_Element *network, const char **address) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_name_get(const E_Connman_Element *network, const char **name) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_connected_get(const E_Connman_Element *network, bool *connected) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_strength_get(const E_Connman_Element *network, unsigned char *strength) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_frequency_get(const E_Connman_Element *network, unsigned short *frequency) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_device_get(const E_Connman_Element *network, E_Connman_Element **element) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; EAPI bool e_connman_network_wifi_ssid_get(const E_Connman_Element *network, unsigned int *count, unsigned char **wifi_ssid) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_mode_get(const E_Connman_Element *network, const char **wifi_mode) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_security_get(const E_Connman_Element *network, const char **wifi_security) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_passphrase_get(const E_Connman_Element *network, const char **wifi_passphrase) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_channel_get(const E_Connman_Element *network, unsigned short *wifi_channel) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - EAPI bool e_connman_network_wifi_eap_get(const E_Connman_Element *network, const char **wifi_eap) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; - #ifdef __cplusplus } #endif |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 20:40:58
|
Log: trivial: spelling in documentation Some misspellings found in doxy. Author: lucas Date: 2010-09-15 13:40:51 -0700 (Wed, 15 Sep 2010) New Revision: 52326 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2010-09-15 20:31:33 UTC (rev 52325) +++ trunk/evas/src/lib/canvas/evas_map.c 2010-09-15 20:40:51 UTC (rev 52326) @@ -333,7 +333,7 @@ /** - * Set the map sourc eobject + * Set the map source object * * This sets the object from which the map is taken - can be any object that * has map enabled on it. @@ -352,7 +352,7 @@ } /** - * get the map source object + * Get the map source object * * See evas_object_map_source_set() * @@ -381,7 +381,7 @@ * image that is mapped to that map vertex/point. The u corresponds to the x * coordinate of this mapped point and v, the y coordinate. Note that these * coordinates describe a bounding region to sample. If you have a 200x100 - * source image and wannt to display it at 200x100 with proper pixel + * source image and want to display it at 200x100 with proper pixel * precision, then do: * * @code @@ -399,7 +399,7 @@ * @endcode * * Note that the map points a uv coordinates match the image geometry. If - * the @p map parameter is NULL, the sotred map will be freed and geometry + * the @p map parameter is NULL, the stored map will be freed and geometry * prior to enabling/setting a map will be restored. * * @param obj object to change transformation map |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 20:31:39
|
Log:
eve files at ~/.config/eve not ~/.config/ewebkit
Author: barbieri
Date: 2010-09-15 13:31:33 -0700 (Wed, 15 Sep 2010)
New Revision: 52325
Modified:
trunk/eve/src/bin/main.c
Modified: trunk/eve/src/bin/main.c
===================================================================
--- trunk/eve/src/bin/main.c 2010-09-15 20:01:17 UTC (rev 52324)
+++ trunk/eve/src/bin/main.c 2010-09-15 20:31:33 UTC (rev 52325)
@@ -446,7 +446,7 @@
int r = 0, args;
const char *home;
const char *url;
- char path[PATH_MAX];
+ char path[PATH_MAX], *basename;
Eina_Bool quit_option = EINA_FALSE;
Eina_Bool disable_plugins = 0xff;
Eina_Bool disable_mouse_cursor = 0xff;
@@ -454,6 +454,7 @@
char *user_agent_option = NULL;
const char *user_agent_str;
E_DBus_Connection *conn;
+ size_t dirlen;
Ecore_Getopt_Value values[] = {
ECORE_GETOPT_VALUE_BOOL(app.is_fullscreen),
@@ -540,7 +541,14 @@
goto end;
}
- snprintf(path, sizeof(path), "%s/.config/ewebkit", home);
+ dirlen = snprintf(path, sizeof(path), "%s/.config/eve", home);
+ if (dirlen >= sizeof(path))
+ {
+ ERR("Path is too long: %s/.config/eve", home);
+ r = -1;
+ goto end;
+ }
+
if (!ecore_file_mkpath(path))
{
ERR("Could not create %s", path);
@@ -555,7 +563,11 @@
goto end;
}
- snprintf(path, sizeof(path), "%s/.config/ewebkit/favorites.db", home);
+ basename = path + dirlen;
+ basename[0] = '/';
+ basename++;
+ dirlen++;
+ eina_strlcpy(basename, "favorites.db", sizeof(path) - dirlen);
fav = fav_load(path);
if (!fav)
{
@@ -563,7 +575,7 @@
fav_save(fav, path);
}
- snprintf(path, sizeof(path), "%s/.config/ewebkit/history.db", home);
+ eina_strlcpy(basename, "history.db", sizeof(path) - dirlen);
hist = hist_load(path);
if (!hist)
{
@@ -571,7 +583,7 @@
hist_save(hist, path);
}
- snprintf(path, sizeof(path), "%s/.config/ewebkit/prefs.db", home);
+ eina_strlcpy(basename, "prefs.db", sizeof(path) - dirlen);
prefs = prefs_load(path);
if (!prefs)
{
|
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 20:01:26
|
Log:
stupid error of mine using strcasecmp()
Author: barbieri
Date: 2010-09-15 13:01:17 -0700 (Wed, 15 Sep 2010)
New Revision: 52324
Modified:
trunk/eve/src/bin/main.c
Modified: trunk/eve/src/bin/main.c
===================================================================
--- trunk/eve/src/bin/main.c 2010-09-15 19:51:08 UTC (rev 52323)
+++ trunk/eve/src/bin/main.c 2010-09-15 20:01:17 UTC (rev 52324)
@@ -497,7 +497,7 @@
}
if (!user_agent_option ||
- (user_agent_option && strcasecmp(user_agent_option, "eve")))
+ (user_agent_option && (strcasecmp(user_agent_option, "eve") == 0)))
user_agent_str = "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3 " PACKAGE_NAME "/" PACKAGE_VERSION;
else
{
|
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 19:51:19
|
Log:
Check there are callbacks before trying to copy them.
Patch by Ot?\195?\161vio Pontes
Author: sachiel
Date: 2010-09-15 12:51:08 -0700 (Wed, 15 Sep 2010)
New Revision: 52323
Modified:
trunk/evas/src/lib/canvas/evas_smart.c
Modified: trunk/evas/src/lib/canvas/evas_smart.c
===================================================================
--- trunk/evas/src/lib/canvas/evas_smart.c 2010-09-15 18:57:18 UTC (rev 52322)
+++ trunk/evas/src/lib/canvas/evas_smart.c 2010-09-15 19:51:08 UTC (rev 52323)
@@ -328,7 +328,7 @@
for (n = 0, sc = s->smart_class; sc; sc = sc->parent)
{
const Evas_Smart_Cb_Description *d;
- for (d = sc->callbacks; d->name; d++)
+ for (d = sc->callbacks; d && d->name; d++)
s->callbacks.array[n++] = d;
}
evas_smart_cb_descriptions_fix(&s->callbacks);
|
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 18:57:39
|
Log: no need to EXTRA_DIST include bla.pc as it is generated by configure. thanks vtorri. Author: barbieri Date: 2010-09-15 11:57:18 -0700 (Wed, 15 Sep 2010) New Revision: 52322 Modified: trunk/BINDINGS/python/python-e_dbus/Makefile.am trunk/BINDINGS/python/python-ecore/Makefile.am trunk/BINDINGS/python/python-edje/Makefile.am trunk/BINDINGS/python/python-elementary/Makefile.am trunk/BINDINGS/python/python-emotion/Makefile.am trunk/BINDINGS/python/python-evas/Makefile.am Modified: trunk/BINDINGS/python/python-e_dbus/Makefile.am =================================================================== --- trunk/BINDINGS/python/python-e_dbus/Makefile.am 2010-09-15 18:44:47 UTC (rev 52321) +++ trunk/BINDINGS/python/python-e_dbus/Makefile.am 2010-09-15 18:57:18 UTC (rev 52322) @@ -33,7 +33,6 @@ COPYING \ README \ autogen.sh \ - python-edbus.pc \ python-edbus.pc.in \ $(tests_files) Modified: trunk/BINDINGS/python/python-ecore/Makefile.am =================================================================== --- trunk/BINDINGS/python/python-ecore/Makefile.am 2010-09-15 18:44:47 UTC (rev 52321) +++ trunk/BINDINGS/python/python-ecore/Makefile.am 2010-09-15 18:57:18 UTC (rev 52322) @@ -154,7 +154,6 @@ COPYING \ README \ autogen.sh \ - python-ecore.pc \ python-ecore.pc.in \ python-ecore-x.pc.in \ python-ecore-imf.pc.in \ Modified: trunk/BINDINGS/python/python-edje/Makefile.am =================================================================== --- trunk/BINDINGS/python/python-edje/Makefile.am 2010-09-15 18:44:47 UTC (rev 52321) +++ trunk/BINDINGS/python/python-edje/Makefile.am 2010-09-15 18:57:18 UTC (rev 52322) @@ -117,7 +117,6 @@ COPYING \ README \ autogen.sh \ - python-edje.pc \ python-edje.pc.in \ $(cython_ins) $(cython_outs) \ $(pyincedje_DATA) \ Modified: trunk/BINDINGS/python/python-elementary/Makefile.am =================================================================== --- trunk/BINDINGS/python/python-elementary/Makefile.am 2010-09-15 18:44:47 UTC (rev 52321) +++ trunk/BINDINGS/python/python-elementary/Makefile.am 2010-09-15 18:57:18 UTC (rev 52322) @@ -133,7 +133,6 @@ COPYING \ README \ autogen.sh \ - python-elementary.pc \ python-elementary.pc.in \ $(cython_ins) $(cython_outs) \ $(c_elementary_includes) \ Modified: trunk/BINDINGS/python/python-emotion/Makefile.am =================================================================== --- trunk/BINDINGS/python/python-emotion/Makefile.am 2010-09-15 18:44:47 UTC (rev 52321) +++ trunk/BINDINGS/python/python-emotion/Makefile.am 2010-09-15 18:57:18 UTC (rev 52322) @@ -39,7 +39,6 @@ COPYING \ README \ autogen.sh \ - python-emotion.pc \ python-emotion.pc.in \ $(cython_ins) $(cython_outs) \ $(c_emotion_includes) \ Modified: trunk/BINDINGS/python/python-evas/Makefile.am =================================================================== --- trunk/BINDINGS/python/python-evas/Makefile.am 2010-09-15 18:44:47 UTC (rev 52321) +++ trunk/BINDINGS/python/python-evas/Makefile.am 2010-09-15 18:57:18 UTC (rev 52322) @@ -74,7 +74,6 @@ COPYING \ README \ autogen.sh \ - python-evas.pc \ python-evas.pc.in \ $(cython_ins) $(cython_outs) \ $(pyincevas_DATA) \ |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 18:44:55
|
Log: distribute damn includes as well Author: barbieri Date: 2010-09-15 11:44:47 -0700 (Wed, 15 Sep 2010) New Revision: 52321 Modified: trunk/BINDINGS/python/python-emotion/Makefile.am Modified: trunk/BINDINGS/python/python-emotion/Makefile.am =================================================================== --- trunk/BINDINGS/python/python-emotion/Makefile.am 2010-09-15 18:43:42 UTC (rev 52320) +++ trunk/BINDINGS/python/python-emotion/Makefile.am 2010-09-15 18:44:47 UTC (rev 52321) @@ -6,6 +6,8 @@ CYTHON_EMOTION_FLAGS = -I@...@ EPYDOC = @EPYDOC@ +c_emotion_includes = include/emotion/c_emotion.pxd include/emotion/__init__.py + # emotion tests are not actual unit tests but a test AND a nice example examples_files = examples/emotion_test.py @@ -40,6 +42,7 @@ python-emotion.pc \ python-emotion.pc.in \ $(cython_ins) $(cython_outs) \ + $(c_emotion_includes) \ $(examples_files) \ $(tests_files) @@ -52,7 +55,7 @@ if HAVE_CYTHON BUILT_SOURCES = $(cython_outs) -$(top_builddir)/emotion/emotion.c_emotion.c: $(top_srcdir)/emotion/emotion.c_emotion.pyx Makefile +$(top_builddir)/emotion/emotion.c_emotion.c: $(top_srcdir)/emotion/emotion.c_emotion.pyx $(c_emotion_includes) Makefile @$(MKDIR_P) $(top_builddir)/emotion $(AM_V_GEN)cd $(top_builddir) && $(PYTHON) -m cython $(CYTHON_EMOTION_FLAGS) -I$(top_srcdir)/include $(CYTHONFLAGS) -o $@ $< else |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 18:43:49
|
Log: Ethumb is now autotoolized Author: barbieri Date: 2010-09-15 11:43:42 -0700 (Wed, 15 Sep 2010) New Revision: 52320 Added: trunk/BINDINGS/python/python-ethumb/ChangeLog trunk/BINDINGS/python/python-ethumb/INSTALL trunk/BINDINGS/python/python-ethumb/Makefile.am trunk/BINDINGS/python/python-ethumb/NEWS trunk/BINDINGS/python/python-ethumb/autogen.sh trunk/BINDINGS/python/python-ethumb/configure.ac trunk/BINDINGS/python/python-ethumb/m4/ trunk/BINDINGS/python/python-ethumb/m4/cython.m4 trunk/BINDINGS/python/python-ethumb/m4/python.m4 trunk/BINDINGS/python/python-ethumb/python-ethumb.pc.in trunk/BINDINGS/python/python-ethumb/python-ethumb_client.pc.in Removed: trunk/BINDINGS/python/python-ethumb/build.sh trunk/BINDINGS/python/python-ethumb/ez_setup.py trunk/BINDINGS/python/python-ethumb/setup.cfg trunk/BINDINGS/python/python-ethumb/setup.py Modified: trunk/BINDINGS/python/python-ethumb/ trunk/BINDINGS/python/python-ethumb/README Property changes on: trunk/BINDINGS/python/python-ethumb ___________________________________________________________________ Modified: svn:ignore - *~ *.pyc *.pyo build dist *.egg-info + configure Makefile.in config.log depcomp config.guess config.sub ltmain.sh .libs .deps Makefile python-ethumb*.pc config.status python-ethumb-*.tar.* autom4te.cache libtool missing aclocal.m4 install-sh py-compile Modified: trunk/BINDINGS/python/python-ethumb/README =================================================================== --- trunk/BINDINGS/python/python-ethumb/README 2010-09-15 18:41:32 UTC (rev 52319) +++ trunk/BINDINGS/python/python-ethumb/README 2010-09-15 18:43:42 UTC (rev 52320) @@ -7,34 +7,32 @@ * Evas >= 1.0.0 (indirect, Ethumb dependency) * Ecore >= 1.0.0 (indirect, Ethumb dependency) * E_Dbus >= 1.0.0 (indirect, Ethumb dependency if client is compiled) - * Cython >= 0.12.1 + * Cython >= 0.13 * Python-Evas * Python >= 2.4 - * Python-setuptools >= 0.6_rc9 BUILDING AND INSTALLING ======================= -This package uses setuptools, so execute: +This package uses automake, so execute: Build:: - python setup.py build + ./configure --prefix=/usr + make all Install:: - python setup.py install + make install -You can choose where to install by using command options, see output -of "python setup.py <command> --help", example: +If you wish to install at alternative locations, then make sure to +configure your PYTHONPATH to be able to access this location! - python setup.py install --help +If you have Cython dependencies that are installed in alternative +locations and want Cython to find them, please specify CYTHONFLAGS +variable to ./configure. -Options can also be set in file "setup.cfg". - -Ethumb is both a library to generate thumbnails and a client-server -pair to make this process non-blocking and easy to use. In order to -disable client use the following environment variable: - - * ETHUMB_BUILD_CLIENT=0 +The discovery of dependencies is done with pkg-config, thus all your +packages must be properly accessible with such tool. Ensure your +PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR (cross-compiles) are configured! Property changes on: trunk/BINDINGS/python/python-ethumb/autogen.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:eol-style + native Property changes on: trunk/BINDINGS/python/python-ethumb/m4 ___________________________________________________________________ Added: svn:ignore + ltsugar.m4 libtool.m4 ltversion.m4 lt~obsolete.m4 ltoptions.m4 |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 18:41:38
|
Log: Finally fixed make distcheck for windows (actually any that was --disable-XYZ) automake is not smart enough and cython_ins was just getting what you allowed it to (makes sense, no? ;-P) and thus the source files were not being distributed. now have cython_dist to make sure things work properly. redundancy++... maybe someone will add automake support for Cython, like xyz_CYTHON = bla.pyx? Author: barbieri Date: 2010-09-15 11:41:32 -0700 (Wed, 15 Sep 2010) New Revision: 52319 Modified: trunk/BINDINGS/python/python-ecore/Makefile.am Modified: trunk/BINDINGS/python/python-ecore/Makefile.am =================================================================== --- trunk/BINDINGS/python/python-ecore/Makefile.am 2010-09-15 18:38:09 UTC (rev 52318) +++ trunk/BINDINGS/python/python-ecore/Makefile.am 2010-09-15 18:41:32 UTC (rev 52319) @@ -1,5 +1,13 @@ ACLOCAL_AMFLAGS = -I m4 +cython_dist = \ + ecore/ecore.c_ecore.pyx \ + ecore/x/ecore.x.c_ecore_x.pyx \ + ecore/x/ecore.x.screensaver.pyx \ + ecore/imf/ecore.imf.c_ecore_imf.pyx \ + ecore/win32/ecore.win32.c_ecore_win32.pyx \ + ecore/evas/ecore.evas.c_ecore_evas.pyx + cython_ins = ecore/ecore.c_ecore.pyx cython_outs = ecore/ecore.c_ecore.c ecore/ecore.c_ecore.h doc_modules = c_ecore @@ -152,7 +160,7 @@ python-ecore-imf.pc.in \ python-ecore-win32.pc.in \ python-ecore-evas.pc.in \ - $(cython_ins) $(cython_outs) \ + $(cython_dist) $(cython_outs) \ $(pyincecore_DATA) \ $(c_ecore_x_includes) \ $(c_ecore_imf_includes) \ @@ -277,9 +285,7 @@ c_ecore_win32_la_LIBADD = @ECORE_WIN32_LIBS@ c_ecore_win32_la_LDFLAGS = -module -avoid-version c_ecore_win32_la_LIBTOOLFLAGS = --tag=disable-static -#c_ecore_win32_la_SOURCES = $(top_builddir)/ecore/win32/ecore.win32.c_ecore_win32.c -# NOTE: how to provide generated sources if I can't generate them on linux? -nodist_c_ecore_win32_la_SOURCES = $(top_builddir)/ecore/win32/ecore.win32.c_ecore_win32.c +c_ecore_win32_la_SOURCES = $(top_builddir)/ecore/win32/ecore.win32.c_ecore_win32.c pyecorewin32dir = $(pythondir)/ecore/win32 pyecorewin32_PYTHON = ecore/win32/__init__.py |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 18:38:16
|
Log:
Export python elm.ScrolledEntry and adding test.
Add ScrolledEntry in __init__.py to be exported in module.
And modified the entry scrolled tests to use it.
Author: tiago
Date: 2010-09-15 11:38:09 -0700 (Wed, 15 Sep 2010)
New Revision: 52318
Modified:
trunk/BINDINGS/python/python-elementary/elementary/__init__.py trunk/BINDINGS/python/python-elementary/tests/test_entry.py
Modified: trunk/BINDINGS/python/python-elementary/elementary/__init__.py
===================================================================
--- trunk/BINDINGS/python/python-elementary/elementary/__init__.py 2010-09-15 18:29:15 UTC (rev 52317)
+++ trunk/BINDINGS/python/python-elementary/elementary/__init__.py 2010-09-15 18:38:09 UTC (rev 52318)
@@ -22,7 +22,7 @@
Photo, Hoversel, Toolbar, ToolbarItem, List, ListItem, Slider, \
Radio, Check, Pager, InnerWindow, Image, Spinner, Fileselector, Notify, \
Separator, Progressbar, Menu, MenuItem, MenuItemSeparator, Panel, \
- Genlist, GenlistItem, GenlistItemClass, WidgetItem, \
+ Genlist, GenlistItem, GenlistItemClass, WidgetItem, ScrolledEntry, \
init, shutdown, run, exit, scale_get, scale_set, \
finger_size_get, finger_size_set, coords_finger_size_adjust, \
theme_overlay_add, theme_extension_add, policy_set, policy_get, \
Modified: trunk/BINDINGS/python/python-elementary/tests/test_entry.py
===================================================================
--- trunk/BINDINGS/python/python-elementary/tests/test_entry.py 2010-09-15 18:29:15 UTC (rev 52317)
+++ trunk/BINDINGS/python/python-elementary/tests/test_entry.py 2010-09-15 18:38:09 UTC (rev 52318)
@@ -115,55 +115,26 @@
win.resize_object_add(bx)
bx.show()
- sc = elementary.Scroller(win)
- sc.content_min_limit(0, 1)
- sc.policy_set(elementary.ELM_SCROLLER_POLICY_OFF,
- elementary.ELM_SCROLLER_POLICY_OFF)
- sc.bounce_set(False, False)
- sc.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
- sc.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL)
- bx.pack_end(sc)
-
- en = elementary.Entry(win)
+ en = elementary.ScrolledEntry(win)
en.single_line_set(True)
en.entry_set("Disable entry")
en.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
en.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5)
en.disabled_set(True)
- sc.content_set(en)
+ bx.pack_end(en)
en.show()
- sc.show()
-
- sc = elementary.Scroller(win)
- sc.content_min_limit(0, 1)
- sc.policy_set(elementary.ELM_SCROLLER_POLICY_OFF,
- elementary.ELM_SCROLLER_POLICY_OFF)
- sc.bounce_set(False, False)
- sc.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
- sc.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL)
- bx.pack_end(sc)
-
- en = elementary.Entry(win)
+ en = elementary.ScrolledEntry(win)
en.password_set(True)
+ en.single_line_set(True)
en.entry_set("Access denied, give up!")
en.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
en.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5)
en.disabled_set(True)
- sc.content_set(en)
+ bx.pack_end(en)
en.show()
- sc.show()
-
- sc = elementary.Scroller(win)
- sc.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)
- sc.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL)
- sc.policy_set(elementary.ELM_SCROLLER_POLICY_ON,
- elementary.ELM_SCROLLER_POLICY_ON)
- sc.bounce_set(False, True)
- bx.pack_end(sc)
-
- en = elementary.Entry(win)
+ en = elementary.ScrolledEntry(win)
#TODO
#en.context_menu_item_add("Hello", None, elementary.ELM_ICON_NONE, None, None)
#en.context_menu_item_add("World", None, elementary.ELM_ICON_NONE, None, None)
@@ -175,64 +146,33 @@
en.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)
en.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL)
en.disabled_set(True)
- sc.content_set(en)
+ bx.pack_end(en)
en.show()
- sc.show()
-
sp = elementary.Separator(win)
sp.horizontal_set(True)
bx.pack_end(sp)
sp.show()
- sc = elementary.Scroller(win)
- sc.content_min_limit(0, 1)
- sc.policy_set(elementary.ELM_SCROLLER_POLICY_OFF,
- elementary.ELM_SCROLLER_POLICY_OFF)
- sc.bounce_set(False, False)
- sc.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
- sc.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL)
- bx.pack_end(sc)
-
- en = elementary.Entry(win)
+ en = elementary.ScrolledEntry(win)
en.single_line_set(True)
en.entry_set("This is a single line")
en.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
en.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5)
en.select_all()
- sc.content_set(en)
+ bx.pack_end(en)
en.show()
- sc.show()
-
- sc = elementary.Scroller(win)
- sc.content_min_limit(0, 1)
- sc.policy_set(elementary.ELM_SCROLLER_POLICY_OFF,
- elementary.ELM_SCROLLER_POLICY_OFF)
- sc.bounce_set(False, False)
- sc.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
- sc.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL)
- bx.pack_end(sc)
-
- en = elementary.Entry(win)
+ en = elementary.ScrolledEntry(win)
en.password_set(True)
+ en.single_line_set(True)
en.entry_set("Password here")
en.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
- en.size_hint_align_set(evas.EVAS_HINT_FILL, 0.0)
- sc.content_set(en)
+ en.size_hint_align_set(evas.EVAS_HINT_FILL, 0.5)
+ bx.pack_end(en)
en.show()
- sc.show()
-
- sc = elementary.Scroller(win)
- sc.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)
- sc.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL)
- sc.policy_set(elementary.ELM_SCROLLER_POLICY_ON,
- elementary.ELM_SCROLLER_POLICY_ON)
- sc.bounce_set(False, True)
- bx.pack_end(sc)
-
- en = elementary.Entry(win)
+ en = elementary.ScrolledEntry(win)
en.entry_set("This is an entry widget in this window that<br>"
"uses markup <b>like this</> for styling and<br>"
"formatting <em>like this</>, as well as<br>"
@@ -243,11 +183,9 @@
en.callback_anchor_clicked_add(my_entry_anchor_test, en)
en.size_hint_weight_set(evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)
en.size_hint_align_set(evas.EVAS_HINT_FILL, evas.EVAS_HINT_FILL)
- sc.content_set(en)
+ bx.pack_end(en)
en.show()
- sc.show()
-
bx2 = elementary.Box(win)
bx2.horizontal_set(True)
bx2.size_hint_weight_set(evas.EVAS_HINT_EXPAND, 0.0)
|
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 18:29:22
|
Log:
update to use autofoo with python
Author: discomfitor
Date: 2010-09-15 11:29:15 -0700 (Wed, 15 Sep 2010)
New Revision: 52317
Modified:
trunk/packaging/gentoo/eclass/efl.eclass
Modified: trunk/packaging/gentoo/eclass/efl.eclass
===================================================================
--- trunk/packaging/gentoo/eclass/efl.eclass 2010-09-15 18:17:11 UTC (rev 52316)
+++ trunk/packaging/gentoo/eclass/efl.eclass 2010-09-15 18:29:15 UTC (rev 52317)
@@ -97,15 +97,11 @@
fi
if [[ ! -z "${E_PYTHON}" ]]; then
- WANT_AUTOTOOLS="no"
- WANT_AUTOCONF="no"
- WANT_AUTOMAKE="no"
-
E_NO_VISIBILITY="1"
PYTHON_DEPEND="*:2.4"
- inherit python distutils
+ inherit python
fi
if [[ ${WANT_AUTOTOOLS} == "yes" ]] ; then
@@ -212,9 +208,7 @@
[[ -s gendoc ]] && chmod a+rx gendoc
- if [[ -z "${E_PYTHON}" ]]; then
- if [[ -e configure.ac ]] && \
- [[ "${WANT_AUTOTOOLS}" == "yes" ]]; then
+ if [[ -e configure.ac ]]; then
export SVN_REPO_PATH="$ESVN_WC_PATH"
@@ -254,7 +248,6 @@
epunt_cxx
# elibtoolize
- fi
}
# @FUNCTION: efl_src_configure
@@ -262,7 +255,6 @@
# @DESCRIPTION:
# efl's default src_configure
efl_src_configure() {
- if [[ -z "${E_PYTHON}" ]]; then
export SVN_REPO_PATH="$ESVN_WC_PATH"
if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
has nls "${IUSE}" && MY_ECONF="${MY_ECONF} $(use_enable nls)"
@@ -271,7 +263,6 @@
econf ${MY_ECONF} || efl_die "configure failed"
fi
- fi
}
# @FUNCTION: efl_src_compile
@@ -279,23 +270,11 @@
# @DESCRIPTION:
# efl's default src_compile
efl_src_compile() {
+ emake || efl_die "emake failed"
if [[ -z "${E_PYTHON}" ]]; then
- emake || efl_die "emake failed"
-
if has doc "${IUSE}" && use doc; then
- if [[ -x ./gendoc ]]; then
- ./gendoc || efl_die "gendoc failed"
- else
- emake doc
- fi
+ emake doc
fi
- else
- distutils_src_compile
- if has doc "${IUSE}" && use doc; then
- if [[ -x ./gendoc ]]; then
- ./gendoc || efl_die "gendoc failed"
- fi
- fi
fi
}
@@ -316,8 +295,6 @@
# @DESCRIPTION:
# efl's default src_install
efl_src_install() {
- if [[ -z "${E_PYTHON}" ]]; then
-
emake install DESTDIR="${D}" || efl_die
find "${D}" -name '*.la' -delete
@@ -325,9 +302,8 @@
for d in AUTHORS ChangeLog NEWS README TODO ${EDOCS}; do
[[ -f ${d} ]] && dodoc ${d}
done
- else
- distutils_src_install
+ if [[ -n ${E_PYTHON} ]];then
if has examples "${IUSE}" && use examples; then
insinto /usr/share/doc/${PF}
doins -r examples
|
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 18:17:18
|
Log: Always include pxd files, regardless of it was enabled before make dist. Author: barbieri Date: 2010-09-15 11:17:11 -0700 (Wed, 15 Sep 2010) New Revision: 52316 Modified: trunk/BINDINGS/python/python-ecore/Makefile.am Modified: trunk/BINDINGS/python/python-ecore/Makefile.am =================================================================== --- trunk/BINDINGS/python/python-ecore/Makefile.am 2010-09-15 17:57:39 UTC (rev 52315) +++ trunk/BINDINGS/python/python-ecore/Makefile.am 2010-09-15 18:17:11 UTC (rev 52316) @@ -11,48 +11,49 @@ pyincecore_DATA = $(c_ecore_includes) \ ecore/ecore.c_ecore.h +c_ecore_x_includes = \ + include/ecore/x/c_ecore_x.pxd \ + include/ecore/x/screensaver.pxd \ + include/ecore/x/__init__.py if WANT_ECORE_X cython_ins += ecore/x/ecore.x.c_ecore_x.pyx ecore/x/ecore.x.screensaver.pyx cython_outs += ecore/x/ecore.x.c_ecore_x.c ecore/x/ecore.x.screensaver.c doc_modules += c_ecore_x screensaver pyincecorexdir = $(includedir)/@PACKAGE@/ecore/x -pyincecorex_DATA = \ - include/ecore/x/c_ecore_x.pxd \ - include/ecore/x/screensaver.pxd \ - include/ecore/x/__init__.py +pyincecorex_DATA = $(c_ecore_x_includes) endif +c_ecore_imf_includes = \ + include/ecore/imf/c_ecore_imf.pxd \ + include/ecore/imf/__init__.py if WANT_ECORE_IMF cython_ins += ecore/imf/ecore.imf.c_ecore_imf.pyx cython_outs += ecore/imf/ecore.imf.c_ecore_imf.c doc_modules += c_ecore_imf - pyincecoreimfdir = $(includedir)/@PACKAGE@/ecore/imf -pyincecoreimf_DATA = \ - include/ecore/imf/c_ecore_imf.pxd \ - include/ecore/imf/__init__.py +pyincecoreimf_DATA = $(c_ecore_imf_includes) endif +c_ecore_win32_includes = \ + include/ecore/win32/c_ecore_win32.pxd \ + include/ecore/win32/__init__.py if WANT_ECORE_WIN32 cython_ins += ecore/win32/ecore.win32.c_ecore_win32.pyx cython_outs += ecore/win32/ecore.win32.c_ecore_win32.c doc_modules += c_ecore_win32 - pyincecorewin32dir = $(includedir)/@PACKAGE@/ecore/win32 -pyincecorewin32_DATA = \ - include/ecore/win32/c_ecore_win32.pxd \ - include/ecore/win32/__init__.py +pyincecorewin32_DATA = $(c_ecore_win32_includes) endif +c_ecore_evas_includes = \ + include/ecore/evas/c_ecore_evas.pxd \ + include/ecore/evas/__init__.py if WANT_ECORE_EVAS cython_ins += ecore/evas/ecore.evas.c_ecore_evas.pyx cython_outs += ecore/evas/ecore.evas.c_ecore_evas.c doc_modules += c_ecore_evas ecore.evas.utils - pyincecoreevasdir = $(includedir)/@PACKAGE@/ecore/evas -pyincecoreevas_DATA = \ - include/ecore/evas/c_ecore_evas.pxd \ - include/ecore/evas/__init__.py +pyincecoreevas_DATA = $(c_ecore_evas_includes) endif CYTHONFLAGS = @CYTHONFLAGS@ @@ -153,10 +154,10 @@ python-ecore-evas.pc.in \ $(cython_ins) $(cython_outs) \ $(pyincecore_DATA) \ - $(pyincecorex_DATA) \ - $(pyincecoreimf_DATA) \ - $(pyincecorewin32_DATA) \ - $(pyincecoreevas_DATA) \ + $(c_ecore_x_includes) \ + $(c_ecore_imf_includes) \ + $(c_ecore_win32_includes) \ + $(c_ecore_evas_includes) \ $(c_ecore_deps) \ $(c_ecore_x_deps) \ $(c_ecore_imf_deps) \ |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 17:57:46
|
Log: commented too much. Author: barbieri Date: 2010-09-15 10:57:39 -0700 (Wed, 15 Sep 2010) New Revision: 52315 Modified: trunk/BINDINGS/python/python-elementary/Makefile.am Modified: trunk/BINDINGS/python/python-elementary/Makefile.am =================================================================== --- trunk/BINDINGS/python/python-elementary/Makefile.am 2010-09-15 17:42:13 UTC (rev 52314) +++ trunk/BINDINGS/python/python-elementary/Makefile.am 2010-09-15 17:57:39 UTC (rev 52315) @@ -8,12 +8,12 @@ # python-elementary still does not export any public cpython/cython interfaces # pyincelementarydir = $(includedir)/@PACKAGE@/elementary -# c_elementary_includes = \ -# include/elementary/c_elementary.pxd \ -# include/elementary/__init__.py -# pyincelementary_DATA = $(c_elementary_includes) \ -# elementary/elementary.c_elementary.h +# pyincelementary_DATA = ... elementary/elementary.c_elementary.h ... +c_elementary_includes = \ + include/elementary/c_elementary.pxd \ + include/elementary/__init__.py + c_elementary_deps = \ elementary/elementary.c_elementary_anchorblock.pxi \ elementary/elementary.c_elementary_anchorview.pxi \ @@ -136,7 +136,7 @@ python-elementary.pc \ python-elementary.pc.in \ $(cython_ins) $(cython_outs) \ - $(pyincelementary_DATA) \ + $(c_elementary_includes) \ $(c_elementary_deps) \ $(examples_files) \ $(examples_images_files) \ |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 17:42:20
|
Log: god, can't I commit a single one without missing details?!?!?!?! Author: barbieri Date: 2010-09-15 10:42:13 -0700 (Wed, 15 Sep 2010) New Revision: 52314 Modified: trunk/BINDINGS/python/python-e_dbus/README Modified: trunk/BINDINGS/python/python-e_dbus/README =================================================================== --- trunk/BINDINGS/python/python-e_dbus/README 2010-09-15 17:38:15 UTC (rev 52313) +++ trunk/BINDINGS/python/python-e_dbus/README 2010-09-15 17:42:13 UTC (rev 52314) @@ -7,25 +7,29 @@ * Ecore >= 1.0.0 (indirect, E_DBus dependency) * D-Bus >= 0.62 (indirect, E_DBus dependency) * Python >= 2.4 - * Python-setuptools >= 0.6_rc9 BUILDING AND INSTALLING ======================= -This package uses setuptools, so execute: +This package uses automake, so execute: Build:: - python setup.py build + ./configure --prefix=/usr + make all Install:: - python setup.py install + make install -You can choose where to install by using command options, see output -of "python setup.py <command> --help", example: +If you wish to install at alternative locations, then make sure to +configure your PYTHONPATH to be able to access this location! - python setup.py install --help +If you have Cython dependencies that are installed in alternative +locations and want Cython to find them, please specify CYTHONFLAGS +variable to ./configure. -Options can also be set in file "setup.cfg". +The discovery of dependencies is done with pkg-config, thus all your +packages must be properly accessible with such tool. Ensure your +PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR (cross-compiles) are configured! |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 17:38:23
|
Log: Python E DBus is now using autotools Author: barbieri Date: 2010-09-15 10:38:15 -0700 (Wed, 15 Sep 2010) New Revision: 52313 Added: trunk/BINDINGS/python/python-e_dbus/ChangeLog trunk/BINDINGS/python/python-e_dbus/INSTALL trunk/BINDINGS/python/python-e_dbus/Makefile.am trunk/BINDINGS/python/python-e_dbus/NEWS trunk/BINDINGS/python/python-e_dbus/autogen.sh trunk/BINDINGS/python/python-e_dbus/configure.ac trunk/BINDINGS/python/python-e_dbus/m4/ trunk/BINDINGS/python/python-e_dbus/m4/python.m4 trunk/BINDINGS/python/python-e_dbus/python-edbus.pc.in Removed: trunk/BINDINGS/python/python-e_dbus/MANIFEST.in trunk/BINDINGS/python/python-e_dbus/build.sh trunk/BINDINGS/python/python-e_dbus/ez_setup.py trunk/BINDINGS/python/python-e_dbus/gen-doc-api.sh trunk/BINDINGS/python/python-e_dbus/setup.cfg trunk/BINDINGS/python/python-e_dbus/setup.py Modified: trunk/BINDINGS/python/python-e_dbus/ Property changes on: trunk/BINDINGS/python/python-e_dbus ___________________________________________________________________ Modified: svn:ignore - *.so *.o *.pyc *.pyo *.egg-info build dist + configure Makefile.in config.log depcomp config.guess config.sub ltmain.sh .libs .deps Makefile python-edbus.pc config.status python-e_dbus-*.tar.* autom4te.cache libtool missing aclocal.m4 install-sh py-compile Property changes on: trunk/BINDINGS/python/python-e_dbus/autogen.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:eol-style + native Property changes on: trunk/BINDINGS/python/python-e_dbus/m4 ___________________________________________________________________ Added: svn:ignore + ltsugar.m4 libtool.m4 ltversion.m4 lt~obsolete.m4 ltoptions.m4 |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 17:21:45
|
Log: remove now unused file... :-/ Author: barbieri Date: 2010-09-15 10:21:36 -0700 (Wed, 15 Sep 2010) New Revision: 52312 Removed: trunk/BINDINGS/python/python-emotion/setup.py |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 17:20:45
|
Log:
* evas: we don't need all the stuff from pthreads to do preload.
Author: cedric
Date: 2010-09-15 10:20:37 -0700 (Wed, 15 Sep 2010)
New Revision: 52311
Modified:
trunk/evas/configure.ac
Modified: trunk/evas/configure.ac
===================================================================
--- trunk/evas/configure.ac 2010-09-15 17:20:11 UTC (rev 52310)
+++ trunk/evas/configure.ac 2010-09-15 17:20:37 UTC (rev 52311)
@@ -1549,13 +1549,16 @@
echo " needs thread support."
exit 1
fi
- if test "x$build_async_preload" = "xyes" ; then
- echo "ERROR: PThreads off, but Async Preload on. Async Preload"
+ if test "x$build_pipe_render" = "xyes" ; then
+ echo "ERROR: PThreads off, but pipe rendering on. Pipe rendering"
echo " needs thread support."
exit 1
fi
- if test "x$build_pipe_render" = "xyes" ; then
- echo "ERROR: PThreads off, but pipe rendering on. Pipe rendering"
+fi
+
+if test "x${has_pthreads}" = "xno" ; then
+ if test "x$build_async_preload" = "xyes" ; then
+ echo "ERROR: PThreads off, but Async Preload on. Async Preload"
echo " needs thread support."
exit 1
fi
|
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 17:20:19
|
Log: Emotion is now using autotools. Author: barbieri Date: 2010-09-15 10:20:11 -0700 (Wed, 15 Sep 2010) New Revision: 52310 Added: trunk/BINDINGS/python/python-emotion/ChangeLog trunk/BINDINGS/python/python-emotion/INSTALL trunk/BINDINGS/python/python-emotion/Makefile.am trunk/BINDINGS/python/python-emotion/NEWS trunk/BINDINGS/python/python-emotion/autogen.sh trunk/BINDINGS/python/python-emotion/configure.ac trunk/BINDINGS/python/python-emotion/m4/ trunk/BINDINGS/python/python-emotion/m4/cython.m4 trunk/BINDINGS/python/python-emotion/m4/python.m4 trunk/BINDINGS/python/python-emotion/python-emotion.pc.in Removed: trunk/BINDINGS/python/python-emotion/MANIFEST.in trunk/BINDINGS/python/python-emotion/build.sh trunk/BINDINGS/python/python-emotion/ez_setup.py trunk/BINDINGS/python/python-emotion/gen-doc-api.sh trunk/BINDINGS/python/python-emotion/setup.cfg Modified: trunk/BINDINGS/python/python-emotion/ trunk/BINDINGS/python/python-emotion/README Property changes on: trunk/BINDINGS/python/python-emotion ___________________________________________________________________ Modified: svn:ignore - *.pyc *.pyo *.egg-info *.egg build dist + configure Makefile.in config.log depcomp config.guess config.sub ltmain.sh .libs .deps Makefile python-emotion.pc config.status python-emotion-*.tar.* autom4te.cache libtool missing aclocal.m4 install-sh py-compile Modified: trunk/BINDINGS/python/python-emotion/README =================================================================== --- trunk/BINDINGS/python/python-emotion/README 2010-09-15 16:42:44 UTC (rev 52309) +++ trunk/BINDINGS/python/python-emotion/README 2010-09-15 17:20:11 UTC (rev 52310) @@ -3,54 +3,36 @@ REQUIREMENTS ============ - * Emotion >= 0.2.0.51209 + * Emotion >= 0.2.0.52190 * Evas >= 1.0.0 (indirect, Emotion dependency) * Ecore >= 1.0.0 (indirect, Emotion dependency) - * Python-Evas >= 0.4.0 + * Eina >= 1.0.0 (indirect, Emotion dependency) + * Python-Evas >= 0.7.2 * Cython >= 0.12.1 * Python >= 2.4 - * Python-setuptools >= 0.6_rc9 BUILDING AND INSTALLING ======================= -This package uses setuptools, so execute: +This package uses automake, so execute: Build:: - python setup.py build + ./configure --prefix=/usr + make all Install:: - python setup.py install + make install -You can choose where to install by using command options, see output -of "python setup.py <command> --help", example: +If you wish to install at alternative locations, then make sure to +configure your PYTHONPATH to be able to access this location! - python setup.py install --help +If you have Cython dependencies that are installed in alternative +locations and want Cython to find them, please specify CYTHONFLAGS +variable to ./configure. -Options can also be set in file "setup.cfg". - - -TROUBLESHOOTING -=============== - -If you get the following error during build_ext: - - include/emotion/c_emotion.pxd:1:8: 'evas.c_evas.pxd' not found - -Means that either evas/c_evas.pxd was not installed or it is placed -at an non-standard place. - -If it's not installed at all, please do so by: - - # copy and extract python-evas to 'src/python-evas', then: - cd src/python-evas - # read README - python setup.py install_headers - -If it's installed at a non-standard place, you can specify the same path you -used to install python-evas to build_ext with "--include-dirs": - - python setup.py build_ext --include-dirs <path> +The discovery of dependencies is done with pkg-config, thus all your +packages must be properly accessible with such tool. Ensure your +PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR (cross-compiles) are configured! Property changes on: trunk/BINDINGS/python/python-emotion/autogen.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:eol-style + native Property changes on: trunk/BINDINGS/python/python-emotion/m4 ___________________________________________________________________ Added: svn:ignore + ltsugar.m4 libtool.m4 ltversion.m4 lt~obsolete.m4 ltoptions.m4 |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 16:42:50
|
Log: remove now unused file. Author: barbieri Date: 2010-09-15 09:42:44 -0700 (Wed, 15 Sep 2010) New Revision: 52309 Removed: trunk/BINDINGS/python/python-elementary/MANIFEST.in |
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 16:40:43
|
Log:
python-elementary now uses autotools.
Author: barbieri
Date: 2010-09-15 09:40:35 -0700 (Wed, 15 Sep 2010)
New Revision: 52308
Added:
trunk/BINDINGS/python/python-elementary/Makefile.am trunk/BINDINGS/python/python-elementary/NEWS trunk/BINDINGS/python/python-elementary/autogen.sh trunk/BINDINGS/python/python-elementary/configure.ac trunk/BINDINGS/python/python-elementary/m4/ trunk/BINDINGS/python/python-elementary/m4/cython.m4 trunk/BINDINGS/python/python-elementary/m4/python.m4 trunk/BINDINGS/python/python-elementary/python-elementary.pc.in
Removed:
trunk/BINDINGS/python/python-elementary/BUGS trunk/BINDINGS/python/python-elementary/Makefile trunk/BINDINGS/python/python-elementary/TODO trunk/BINDINGS/python/python-elementary/build.sh trunk/BINDINGS/python/python-elementary/ez_setup.py trunk/BINDINGS/python/python-elementary/setup.cfg trunk/BINDINGS/python/python-elementary/setup.py
Modified:
trunk/BINDINGS/python/python-elementary/ trunk/BINDINGS/python/python-elementary/INSTALL trunk/BINDINGS/python/python-elementary/README
Property changes on: trunk/BINDINGS/python/python-elementary
___________________________________________________________________
Modified: svn:ignore
- *.pyc
*.pyo
*.egg-info
*.egg
build
dist
+ configure
Makefile.in
config.log
depcomp
config.guess
config.sub
ltmain.sh
.libs
.deps
Makefile
python-elementary.pc
config.status
python-elementary-*.tar.*
autom4te.cache
libtool
missing
aclocal.m4
install-sh
py-compile
Modified: trunk/BINDINGS/python/python-elementary/INSTALL
===================================================================
--- trunk/BINDINGS/python/python-elementary/INSTALL 2010-09-15 16:31:42 UTC (rev 52307)
+++ trunk/BINDINGS/python/python-elementary/INSTALL 2010-09-15 16:40:35 UTC (rev 52308)
@@ -1,15 +1,365 @@
-Run:
+Installation Instructions
+*************************
-python setup.py build_ext
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-or
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
-make
+Basic Installation
+==================
-As root run:
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
-python setup.py install
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
-or
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
-make install
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+ The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS
+ KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
Modified: trunk/BINDINGS/python/python-elementary/README
===================================================================
--- trunk/BINDINGS/python/python-elementary/README 2010-09-15 16:31:42 UTC (rev 52307)
+++ trunk/BINDINGS/python/python-elementary/README 2010-09-15 16:40:35 UTC (rev 52308)
@@ -6,51 +6,32 @@
* Elementary >= 0.7.0.51191
* Evas >= 1.0.0 (indirect, Elementary dependency)
* Ecore >= 1.0.0 (indirect, Elementary dependency)
- * Python-Evas >= 0.7.1
+ * Python-Evas >= 0.7.2
* Cython >= 0.13
* Python >= 2.4
- * Python-setuptools >= 0.6_rc9
BUILDING AND INSTALLING
=======================
-This package uses setuptools, so execute:
+This package uses automake, so execute:
Build::
- python setup.py build
+ ./configure --prefix=/usr
+ make all
Install::
- python setup.py install
+ make install
-You can choose where to install by using command options, see output
-of "python setup.py <command> --help", example:
+If you wish to install at alternative locations, then make sure to
+configure your PYTHONPATH to be able to access this location!
- python setup.py install --help
+If you have Cython dependencies that are installed in alternative
+locations and want Cython to find them, please specify CYTHONFLAGS
+variable to ./configure.
-Options can also be set in file "setup.cfg".
-
-
-TROUBLESHOOTING
-===============
-
-If you get the following error during build_ext:
-
- include/elementary/c_elementary.pxd:19:8: 'evas.c_evas.pxd' not found
-
-Means that either evas/c_evas.pxd was not installed or it is placed
-at an non-standard place.
-
-If it's not installed at all, please do so by:
-
- # copy and extract python-evas to 'src/python-evas', then:
- cd src/python-evas
- # read README
- python setup.py install_headers
-
-If it's installed at a non-standard place, you can specify the same path you
-used to install python-evas to build_ext with "--include-dirs":
-
- python setup.py build_ext --include-dirs <path>
+The discovery of dependencies is done with pkg-config, thus all your
+packages must be properly accessible with such tool. Ensure your
+PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR (cross-compiles) are configured!
Property changes on: trunk/BINDINGS/python/python-elementary/autogen.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Property changes on: trunk/BINDINGS/python/python-elementary/m4
___________________________________________________________________
Added: svn:ignore
+ ltsugar.m4
libtool.m4
ltversion.m4
lt~obsolete.m4
ltoptions.m4
|
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 16:31:50
|
Log:
[Eve] Implement session saving/restoring.
Author: acidx
Date: 2010-09-15 09:31:42 -0700 (Wed, 15 Sep 2010)
New Revision: 52307
Modified:
trunk/eve/TODO trunk/eve/src/bin/chrome.c trunk/eve/src/bin/main.c trunk/eve/src/bin/prefs.c trunk/eve/src/bin/prefs.h
Modified: trunk/eve/TODO
===================================================================
--- trunk/eve/TODO 2010-09-15 16:25:21 UTC (rev 52306)
+++ trunk/eve/TODO 2010-09-15 16:31:42 UTC (rev 52307)
@@ -14,7 +14,6 @@
Preferences / State
-------------------
- * save state: opened pages, etc. restore on restart
* preferences (runtime, save at eet):
- toggle: use start page (otherwise home page)
- string: proxy
Modified: trunk/eve/src/bin/chrome.c
===================================================================
--- trunk/eve/src/bin/chrome.c 2010-09-15 16:25:21 UTC (rev 52306)
+++ trunk/eve/src/bin/chrome.c 2010-09-15 16:31:42 UTC (rev 52307)
@@ -75,6 +75,7 @@
EVE_PREF_AUTO_LOAD_IMAGES,
EVE_PREF_AUTO_SHRINK_IMAGES,
EVE_PREF_POPUP_ALLOW,
+ EVE_PREF_RESTORE_STATE,
EVE_PREF_LAST
} Eve_Preference;
@@ -155,6 +156,13 @@
.pref_get = prefs_enable_private_mode_get,
.pref_set = prefs_enable_private_mode_set,
}}, NULL, ITEM_FLAG_NONE },
+ { ITEM_TYPE_PREFERENCE, "Save and restore session",
+ (More_Menu_Preference[]) {{
+ .type = PREF_TYPE_CHECKBOX,
+ .pref = EVE_PREF_RESTORE_STATE,
+ .pref_get = prefs_restore_state_get,
+ .pref_set = prefs_restore_state_set,
+ }}, NULL, ITEM_FLAG_NONE },
{ ITEM_TYPE_SEPARATOR, NULL, NULL, NULL, ITEM_FLAG_NONE },
{ ITEM_TYPE_STATIC_FOLDER, "Home page",
(More_Menu_Item[]) {
Modified: trunk/eve/src/bin/main.c
===================================================================
--- trunk/eve/src/bin/main.c 2010-09-15 16:25:21 UTC (rev 52306)
+++ trunk/eve/src/bin/main.c 2010-09-15 16:31:42 UTC (rev 52307)
@@ -419,6 +419,27 @@
free(response);
}
+static void
+state_save(void)
+{
+ Browser_Window *win;
+ Eina_List *win_iter;
+
+ if (!prefs_restore_state_get(prefs)) return;
+ prefs_state_list_clear(prefs);
+
+ EINA_LIST_FOREACH(app.windows, win_iter, win)
+ {
+ Evas_Object *chrome;
+ Eina_List *chrome_iter;
+ EINA_LIST_FOREACH(win->chromes, chrome_iter, chrome)
+ {
+ Evas_Object *view = evas_object_data_get(chrome, "view");
+ prefs_state_add(prefs, prefs_opened_tab_new(ewk_view_uri_get(view)));
+ }
+ }
+}
+
EAPI int
elm_main(int argc, char **argv)
{
@@ -567,7 +588,7 @@
enable_plugins,
EINA_TRUE, user_agent_str, DEFAULT_URL, NULL,
EINA_FALSE, EINA_TRUE, EINA_FALSE,
- EINA_TRUE);
+ EINA_TRUE, EINA_FALSE, NULL);
prefs_save(prefs, path);
}
@@ -615,14 +636,33 @@
e_dbus_request_name(conn, "mobi.profusion.eve", 0, _cb_dbus_request_name, response);
}
- if (!add_win(&app, url))
+ if (prefs_restore_state_get(prefs) && prefs_state_count(prefs) > 0)
{
+ Eina_List *previous_state = prefs_state_list_get(prefs);
+ Eina_List *state_iter;
+ Prefs_Opened_Tab *tab = eina_list_data_get(previous_state);
+ Browser_Window *win;
+
+ if (!add_win(&app, prefs_opened_tab_address_get(tab)))
+ {
+ r = -1;
+ goto end;
+ }
+
+ win = eina_list_data_get(app.windows);
+ EINA_LIST_FOREACH(previous_state->next, state_iter, tab)
+ tab_add(win, prefs_opened_tab_address_get(tab));
+ }
+ else if (!add_win(&app, url))
+ {
r = -1;
goto end;
}
elm_run();
end:
+ state_save();
+
fav_save(fav, NULL);
fav_free(fav);
Modified: trunk/eve/src/bin/prefs.c
===================================================================
--- trunk/eve/src/bin/prefs.c 2010-09-15 16:25:21 UTC (rev 52306)
+++ trunk/eve/src/bin/prefs.c 2010-09-15 16:31:42 UTC (rev 52307)
@@ -9,6 +9,10 @@
#include "prefs.h"
+struct _Prefs_Opened_Tab {
+ const char * address;
+};
+
struct _Prefs {
char enable_mouse_cursor;
char enable_touch_interface;
@@ -21,14 +25,77 @@
char enable_auto_load_images;
char enable_auto_shrink_images;
char allow_popup;
+ char restore_state;
+ Eina_List * state;
const char *__eet_filename;
};
+static const char PREFS_OPENED_TAB_ENTRY[] = "prefs_opened_tab";
static const char PREFS_ENTRY[] = "prefs";
+static Eet_Data_Descriptor *_prefs_opened_tab_descriptor = NULL;
static Eet_Data_Descriptor *_prefs_descriptor = NULL;
static inline void
+_prefs_opened_tab_init(void)
+{
+ Eet_Data_Descriptor_Class eddc;
+
+ if (_prefs_opened_tab_descriptor) return;
+
+ EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Prefs_Opened_Tab);
+ _prefs_opened_tab_descriptor = eet_data_descriptor_stream_new(&eddc);
+
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_prefs_opened_tab_descriptor, Prefs_Opened_Tab, "address", address, EET_T_STRING);
+}
+
+static inline void
+_prefs_opened_tab_shutdown(void)
+{
+ if (!_prefs_opened_tab_descriptor) return;
+ eet_data_descriptor_free(_prefs_opened_tab_descriptor);
+ _prefs_opened_tab_descriptor = NULL;
+}
+
+Prefs_Opened_Tab *
+prefs_opened_tab_new(const char * address)
+{
+ Prefs_Opened_Tab *prefs_opened_tab = calloc(1, sizeof(Prefs_Opened_Tab));
+
+ if (!prefs_opened_tab)
+ {
+ fprintf(stderr, "ERROR: could not calloc Prefs_Opened_Tab\n");
+ return NULL;
+ }
+
+ prefs_opened_tab->address = eina_stringshare_add(address);
+
+ return prefs_opened_tab;
+}
+
+void
+prefs_opened_tab_free(Prefs_Opened_Tab *prefs_opened_tab)
+{
+ eina_stringshare_del(prefs_opened_tab->address);
+ free(prefs_opened_tab);
+}
+
+inline const char *
+prefs_opened_tab_address_get(const Prefs_Opened_Tab *prefs_opened_tab)
+{
+ return prefs_opened_tab->address;
+}
+
+inline void
+prefs_opened_tab_address_set(Prefs_Opened_Tab *prefs_opened_tab, const char *address)
+{
+ EINA_SAFETY_ON_NULL_RETURN(prefs_opened_tab);
+ eina_stringshare_del(prefs_opened_tab->address);
+ prefs_opened_tab->address = eina_stringshare_add(address);
+}
+
+
+static inline void
_prefs_init(void)
{
Eet_Data_Descriptor_Class eddc;
@@ -49,6 +116,8 @@
EET_DATA_DESCRIPTOR_ADD_BASIC(_prefs_descriptor, Prefs, "enable_auto_load_images", enable_auto_load_images, EET_T_CHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_prefs_descriptor, Prefs, "enable_auto_shrink_images", enable_auto_shrink_images, EET_T_CHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_prefs_descriptor, Prefs, "allow_popup", allow_popup, EET_T_CHAR);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_prefs_descriptor, Prefs, "restore_state", restore_state, EET_T_CHAR);
+ EET_DATA_DESCRIPTOR_ADD_LIST(_prefs_descriptor, Prefs, "state", state, _prefs_opened_tab_descriptor);
}
static inline void
@@ -60,7 +129,7 @@
}
Prefs *
-prefs_new(char enable_mouse_cursor, char enable_touch_interface, char enable_plugins, char enable_javascript, const char * user_agent, const char * home_page, const char * proxy, char enable_private_mode, char enable_auto_load_images, char enable_auto_shrink_images, char allow_popup)
+prefs_new(char enable_mouse_cursor, char enable_touch_interface, char enable_plugins, char enable_javascript, const char * user_agent, const char * home_page, const char * proxy, char enable_private_mode, char enable_auto_load_images, char enable_auto_shrink_images, char allow_popup, char restore_state, Eina_List * state)
{
Prefs *prefs = calloc(1, sizeof(Prefs));
@@ -81,6 +150,8 @@
prefs->enable_auto_load_images = enable_auto_load_images;
prefs->enable_auto_shrink_images = enable_auto_shrink_images;
prefs->allow_popup = allow_popup;
+ prefs->restore_state = restore_state;
+ prefs->state = state;
return prefs;
}
@@ -91,6 +162,12 @@
eina_stringshare_del(prefs->user_agent);
eina_stringshare_del(prefs->home_page);
eina_stringshare_del(prefs->proxy);
+ if (prefs->state)
+ {
+ Prefs_Opened_Tab *state_elem;
+ EINA_LIST_FREE(prefs->state, state_elem)
+ prefs_opened_tab_free(state_elem);
+ }
free(prefs);
}
@@ -240,6 +317,69 @@
prefs->allow_popup = allow_popup;
}
+inline char
+prefs_restore_state_get(const Prefs *prefs)
+{
+ return prefs->restore_state;
+}
+
+inline void
+prefs_restore_state_set(Prefs *prefs, char restore_state)
+{
+ EINA_SAFETY_ON_NULL_RETURN(prefs);
+ prefs->restore_state = restore_state;
+}
+
+inline void
+prefs_state_add(Prefs *prefs, Prefs_Opened_Tab *prefs_opened_tab)
+{
+ EINA_SAFETY_ON_NULL_RETURN(prefs);
+ prefs->state = eina_list_append(prefs->state, prefs_opened_tab);
+}
+
+inline void
+prefs_state_del(Prefs *prefs, Prefs_Opened_Tab *prefs_opened_tab)
+{
+ EINA_SAFETY_ON_NULL_RETURN(prefs);
+ prefs->state = eina_list_remove(prefs->state, prefs_opened_tab);
+}
+
+inline Prefs_Opened_Tab *
+prefs_state_get(const Prefs *prefs, unsigned int nth)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(prefs, NULL);
+ return eina_list_nth(prefs->state, nth);
+}
+
+inline unsigned int
+prefs_state_count(const Prefs *prefs)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(prefs, 0);
+ return eina_list_count(prefs->state);
+}
+
+void
+prefs_state_list_clear(Prefs *prefs)
+{
+ EINA_SAFETY_ON_NULL_RETURN(prefs);
+ Prefs_Opened_Tab *data;
+ EINA_LIST_FREE(prefs->state, data) prefs_opened_tab_free(data);
+}
+
+inline Eina_List *
+prefs_state_list_get(const Prefs *prefs)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(prefs, NULL);
+ return prefs->state;
+}
+
+inline void
+prefs_state_list_set(Prefs *prefs, Eina_List *list)
+{
+ EINA_SAFETY_ON_NULL_RETURN(prefs);
+ prefs->state = list;
+}
+
Prefs *
prefs_load(const char *filename)
{
@@ -308,12 +448,14 @@
void
preferences_init(void)
{
+ _prefs_opened_tab_init();
_prefs_init();
}
void
preferences_shutdown(void)
{
+ _prefs_opened_tab_shutdown();
_prefs_shutdown();
}
Modified: trunk/eve/src/bin/prefs.h
===================================================================
--- trunk/eve/src/bin/prefs.h 2010-09-15 16:25:21 UTC (rev 52306)
+++ trunk/eve/src/bin/prefs.h 2010-09-15 16:31:42 UTC (rev 52307)
@@ -7,10 +7,18 @@
#include <Eina.h>
#include <Eet.h>
+typedef struct _Prefs_Opened_Tab Prefs_Opened_Tab;
typedef struct _Prefs Prefs;
+/* Prefs_Opened_Tab */
+Prefs_Opened_Tab *prefs_opened_tab_new(const char * address);
+void prefs_opened_tab_free(Prefs_Opened_Tab *prefs_opened_tab);
+
+void prefs_opened_tab_address_set(Prefs_Opened_Tab *prefs_opened_tab, const char * address);
+const char * prefs_opened_tab_address_get(const Prefs_Opened_Tab *prefs_opened_tab);
+
/* Prefs */
-Prefs *prefs_new(char enable_mouse_cursor, char enable_touch_interface, char enable_plugins, char enable_javascript, const char * user_agent, const char * home_page, const char * proxy, char enable_private_mode, char enable_auto_load_images, char enable_auto_shrink_images, char allow_popup);
+Prefs *prefs_new(char enable_mouse_cursor, char enable_touch_interface, char enable_plugins, char enable_javascript, const char * user_agent, const char * home_page, const char * proxy, char enable_private_mode, char enable_auto_load_images, char enable_auto_shrink_images, char allow_popup, char restore_state, Eina_List * state);
void prefs_free(Prefs *prefs);
void prefs_enable_mouse_cursor_set(Prefs *prefs, char enable_mouse_cursor);
@@ -35,6 +43,15 @@
char prefs_enable_auto_shrink_images_get(const Prefs *prefs);
void prefs_allow_popup_set(Prefs *prefs, char allow_popup);
char prefs_allow_popup_get(const Prefs *prefs);
+void prefs_restore_state_set(Prefs *prefs, char restore_state);
+char prefs_restore_state_get(const Prefs *prefs);
+void prefs_state_add(Prefs *prefs, Prefs_Opened_Tab *prefs_opened_tab);
+void prefs_state_del(Prefs *prefs, Prefs_Opened_Tab *prefs_opened_tab);
+Prefs_Opened_Tab *prefs_state_get(const Prefs *prefs, unsigned int nth);
+unsigned int prefs_state_count(const Prefs *prefs);
+Eina_List *prefs_state_list_get(const Prefs *prefs);
+void prefs_state_list_clear(Prefs *prefs);
+void prefs_state_list_set(Prefs *prefs, Eina_List *list);
Prefs *prefs_load(const char *filename);
Eina_Bool prefs_save(Prefs *prefs, const char *filename);
|
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 16:25:28
|
Log:
Okay, last time: fix make distcheck on platforms without cython.
Weird to do make dist on a platform you don't have cython, but
nonetheless these are fixed now.
also fix a typo: CYHON -> CYTHON.
Author: barbieri
Date: 2010-09-15 09:25:21 -0700 (Wed, 15 Sep 2010)
New Revision: 52306
Modified:
trunk/BINDINGS/python/python-ecore/Makefile.am trunk/BINDINGS/python/python-ecore/configure.ac trunk/BINDINGS/python/python-edje/Makefile.am trunk/BINDINGS/python/python-edje/configure.ac trunk/BINDINGS/python/python-evas/Makefile.am trunk/BINDINGS/python/python-evas/configure.ac
Modified: trunk/BINDINGS/python/python-ecore/Makefile.am
===================================================================
--- trunk/BINDINGS/python/python-ecore/Makefile.am 2010-09-15 15:35:50 UTC (rev 52305)
+++ trunk/BINDINGS/python/python-ecore/Makefile.am 2010-09-15 16:25:21 UTC (rev 52306)
@@ -212,7 +212,7 @@
$(top_builddir)/ecore/ecore.c_ecore.c $(top_builddir)/ecore/ecore.c_ecore.h $(top_builddir)/ecore/x/ecore.x.c_ecore_x.c $(top_builddir)/ecore/x/ecore.x.screensaver.c $(top_builddir)/ecore/imf/ecore.imf.c_ecore_imf.c $(top_builddir)/ecore/evas/ecore.evas.c_ecore_evas.c: Makefile
@echo "NOTE: No cython, using pre-generated ecore.c_ecore.[ch]"
@$(MKDIR_P) $(top_builddir)/ecore
- $(AM_V_GEN)for f in $^; do if ! test -f $(top_srcdir)/$$f; then continue; elif ! cmp $(top_srcdir)/$$f $(top_srcdir)/$$f >/dev/null; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
+ $(AM_V_GEN)for f in ecore/ecore.c_ecore.c ecore/ecore.c_ecore.h ecore/x/ecore.x.c_ecore_x.c ecore/x/ecore.x.screensaver.c ecore/imf/ecore.imf.c_ecore_imf.c ecore/evas/ecore.evas.c_ecore_evas.c; do if ! test -f $(top_srcdir)/$$f; then continue; elif ! cmp $(top_srcdir)/$$f $(top_srcdir)/$$f >/dev/null; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
endif
AM_CPPFLAGS = \
Modified: trunk/BINDINGS/python/python-ecore/configure.ac
===================================================================
--- trunk/BINDINGS/python/python-ecore/configure.ac 2010-09-15 15:35:50 UTC (rev 52305)
+++ trunk/BINDINGS/python/python-ecore/configure.ac 2010-09-15 16:25:21 UTC (rev 52306)
@@ -65,7 +65,7 @@
pkgconfig_ecore_requires_libs="ecore >= 1.0.0"
AC_SUBST(pkgconfig_ecore_requires_libs)
PKG_CHECK_MODULES([ECORE], [$pkgconfig_ecore_requires_libs])
-wanted_cython_files="ecore/ecore.c_ecore.pyx"
+wanted_cython_files="${srcdir}/ecore/ecore.c_ecore.pyx"
have_ecore_x="no"
want_ecore_x="auto"
@@ -89,7 +89,7 @@
AC_MSG_ERROR([ecore-x support requested, but not found by pkg-config: $pkgconfig_ecore_x_requires_libs])
fi
if test "x$want_ecore_x" != "xno" -a "x${have_ecore_x}" = "xyes"; then
- wanted_cython_files="${wanted_cython_files} ecore/x/ecore.x.c_ecore_x.pyx ecore/x/ecore.x.screensaver.pyx"
+ wanted_cython_files="${wanted_cython_files} ${srcdir}/ecore/x/ecore.x.c_ecore_x.pyx ${srcdir}/ecore/x/ecore.x.screensaver.pyx"
fi
AM_CONDITIONAL(WANT_ECORE_X,
[test "x$want_ecore_x" != "xno" -a "x${have_ecore_x}" = "xyes"])
@@ -115,7 +115,7 @@
AC_MSG_ERROR([ecore-imf support requested, but not found by pkg-config: $pkgconfig_ecore_imf_requires_libs])
fi
if test "x$want_ecore_imf" != "xno" -a "x${have_ecore_imf}" = "xyes"; then
- wanted_cython_files="${wanted_cython_files} ecore/imf/ecore.imf.c_ecore_imf.pyx"
+ wanted_cython_files="${wanted_cython_files} ${srcdir}/ecore/imf/ecore.imf.c_ecore_imf.pyx"
fi
AM_CONDITIONAL(WANT_ECORE_IMF,
[test "x$want_ecore_imf" != "xno" -a "x${have_ecore_imf}" = "xyes"])
@@ -141,7 +141,7 @@
AC_MSG_ERROR([ecore-win32 support requested, but not found by pkg-config: $pkgconfig_ecore_win32_requires_libs])
fi
if test "x$want_ecore_win32" != "xno" -a "x${have_ecore_win32}" = "xyes"; then
- wanted_cython_files="${wanted_cython_files} ecore/win32/ecore.win32.c_ecore_win32.pyx"
+ wanted_cython_files="${wanted_cython_files} ${srcdir}/ecore/win32/ecore.win32.c_ecore_win32.pyx"
fi
AM_CONDITIONAL(WANT_ECORE_WIN32,
[test "x$want_ecore_win32" != "xno" -a "x${have_ecore_win32}" = "xyes"])
@@ -168,7 +168,7 @@
AC_MSG_ERROR([ecore-evas support requested, but not found by pkg-config: $pkgconfig_ecore_evas_requires_libs])
fi
if test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes"; then
- wanted_cython_files="${wanted_cython_files} ecore/evas/ecore.evas.c_ecore_evas.pyx"
+ wanted_cython_files="${wanted_cython_files} ${srcdir}/ecore/evas/ecore.evas.c_ecore_evas.pyx"
fi
AM_CONDITIONAL(WANT_ECORE_EVAS,
[test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes"])
@@ -187,7 +187,7 @@
if test "x$CYTHON_FOUND" != "xyes"; then
if test v_rev -ne 0; then
if test "x$have_cython_precompiled" = "xyes"; then
- AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYHON>=${cython_required_version}])
+ AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYTHON>=${cython_required_version}])
else
AC_MSG_ERROR([Cannot find Cython>=${cython_required_version}, and not a release build])
fi
Modified: trunk/BINDINGS/python/python-edje/Makefile.am
===================================================================
--- trunk/BINDINGS/python/python-edje/Makefile.am 2010-09-15 15:35:50 UTC (rev 52305)
+++ trunk/BINDINGS/python/python-edje/Makefile.am 2010-09-15 16:25:21 UTC (rev 52306)
@@ -155,7 +155,7 @@
$(top_builddir)/edje/edje.c_edje.c $(top_builddir)/edje/edje.c_edje.h $(top_builddir)/edje/edit/c_edit.c $(top_builddir)/edje/edit/c_edit.h: Makefile
@echo "NOTE: No cython, using pre-generated edje.c_edje.[ch]"
@$(MKDIR_P) $(top_builddir)/edje/edit
- $(AM_V_GEN)for f in $^; do if ! cmp $(top_srcdir)/$$f $(top_srcdir)/$$f > /dev/null; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
+ $(AM_V_GEN)for f in edje/edje.c_edje.c edje/edje.c_edje.h edje/edit/c_edit.c edje/edit/c_edit.h; do if ! cmp $(top_srcdir)/$$f $(top_srcdir)/$$f > /dev/null; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
endif
AM_CPPFLAGS = \
Modified: trunk/BINDINGS/python/python-edje/configure.ac
===================================================================
--- trunk/BINDINGS/python/python-edje/configure.ac 2010-09-15 15:35:50 UTC (rev 52305)
+++ trunk/BINDINGS/python/python-edje/configure.ac 2010-09-15 16:25:21 UTC (rev 52306)
@@ -68,7 +68,7 @@
PKG_CHECK_MODULES([EDJE], [$pkgconfig_edje_requires_libs])
CYTHON_EDJE_INCLUDEDIR=`pkg-config --variable=includedir "python-evas >= ${python_evas_version}"`
AC_SUBST(CYTHON_EDJE_INCLUDEDIR)
-wanted_cython_files="edje/edje.c_edje.pyx edje/edit/c_edit.pyx"
+wanted_cython_files="${srcdir}/edje/edje.c_edje.pyx ${srcdir}/edje/edit/c_edit.pyx"
AM_PATH_PYTHON(2.5)
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
@@ -82,7 +82,7 @@
if test "x$CYTHON_FOUND" != "xyes"; then
if test v_rev -ne 0; then
if test "x$have_cython_precompiled" = "xyes"; then
- AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYHON>=${cython_required_version}])
+ AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYTHON>=${cython_required_version}])
else
AC_MSG_ERROR([Cannot find Cython>=${cython_required_version}, and not a release build])
fi
Modified: trunk/BINDINGS/python/python-evas/Makefile.am
===================================================================
--- trunk/BINDINGS/python/python-evas/Makefile.am 2010-09-15 15:35:50 UTC (rev 52305)
+++ trunk/BINDINGS/python/python-evas/Makefile.am 2010-09-15 16:25:21 UTC (rev 52306)
@@ -100,7 +100,7 @@
$(top_builddir)/evas/evas.c_evas.c $(top_builddir)/evas/evas.c_evas.h: Makefile
@echo "NOTE: No cython, using pre-generated evas.c_evas.[ch]"
@$(MKDIR_P) $(top_builddir)/evas
- $(AM_V_GEN)for f in $^; do if ! cmp $(top_srcdir)/$$f $(top_builddir)/$$f >/dev/null; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
+ $(AM_V_GEN)for f in evas/evas.c_evas.c evas/evas.c_evas.h; do if ! cmp $(top_srcdir)/$$f $(top_builddir)/$$f >/dev/null; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
endif
AM_CPPFLAGS = \
Modified: trunk/BINDINGS/python/python-evas/configure.ac
===================================================================
--- trunk/BINDINGS/python/python-evas/configure.ac 2010-09-15 15:35:50 UTC (rev 52305)
+++ trunk/BINDINGS/python/python-evas/configure.ac 2010-09-15 16:25:21 UTC (rev 52306)
@@ -65,7 +65,7 @@
pkgconfig_evas_requires_libs="evas >= 1.0.0 eina >= 1.0.0"
AC_SUBST(pkgconfig_evas_requires_libs)
PKG_CHECK_MODULES([EVAS], [$pkgconfig_evas_requires_libs])
-wanted_cython_files="evas/evas.c_evas.pyx"
+wanted_cython_files="${srcdir}/evas/evas.c_evas.pyx"
AM_PATH_PYTHON(2.5)
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
@@ -79,7 +79,7 @@
if test "x$CYTHON_FOUND" != "xyes"; then
if test v_rev -ne 0; then
if test "x$have_cython_precompiled" = "xyes"; then
- AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYHON>=${cython_required_version}])
+ AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYTHON>=${cython_required_version}])
else
AC_MSG_ERROR([Cannot find Cython>=${cython_required_version}, and not a release build])
fi
|
|
From: Enlightenment SVN <no-reply@en...> - 2010-09-15 15:35:57
|
Log:
Add AM_CHECK_CYTHON_PRECOMPILED() and use it, fix !HAVE_CYTHON Makefile.am
* AM_CHECK_CYTHON_PRECOMPILED() macro will make our lives easier and
more uniform across bindings.
* Makefile.am was using nonexistent $(top_dstdir) and cmp was being
used incorrectly (bad me... bad!)
Author: barbieri
Date: 2010-09-15 08:35:50 -0700 (Wed, 15 Sep 2010)
New Revision: 52305
Modified:
trunk/BINDINGS/python/python-ecore/Makefile.am trunk/BINDINGS/python/python-ecore/configure.ac trunk/BINDINGS/python/python-ecore/m4/cython.m4 trunk/BINDINGS/python/python-edje/Makefile.am trunk/BINDINGS/python/python-edje/configure.ac trunk/BINDINGS/python/python-edje/m4/cython.m4 trunk/BINDINGS/python/python-evas/Makefile.am trunk/BINDINGS/python/python-evas/configure.ac trunk/BINDINGS/python/python-evas/m4/cython.m4
Modified: trunk/BINDINGS/python/python-ecore/Makefile.am
===================================================================
--- trunk/BINDINGS/python/python-ecore/Makefile.am 2010-09-15 14:15:23 UTC (rev 52304)
+++ trunk/BINDINGS/python/python-ecore/Makefile.am 2010-09-15 15:35:50 UTC (rev 52305)
@@ -212,7 +212,7 @@
$(top_builddir)/ecore/ecore.c_ecore.c $(top_builddir)/ecore/ecore.c_ecore.h $(top_builddir)/ecore/x/ecore.x.c_ecore_x.c $(top_builddir)/ecore/x/ecore.x.screensaver.c $(top_builddir)/ecore/imf/ecore.imf.c_ecore_imf.c $(top_builddir)/ecore/evas/ecore.evas.c_ecore_evas.c: Makefile
@echo "NOTE: No cython, using pre-generated ecore.c_ecore.[ch]"
@$(MKDIR_P) $(top_builddir)/ecore
- $(AM_V_GEN)for f in $^; do if ! test -f $(top_srcdir)/$$f; then continue; elif cmp $(top_srcdir)/$$f $(top_dstdir)/$$f; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
+ $(AM_V_GEN)for f in $^; do if ! test -f $(top_srcdir)/$$f; then continue; elif ! cmp $(top_srcdir)/$$f $(top_srcdir)/$$f >/dev/null; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
endif
AM_CPPFLAGS = \
Modified: trunk/BINDINGS/python/python-ecore/configure.ac
===================================================================
--- trunk/BINDINGS/python/python-ecore/configure.ac 2010-09-15 14:15:23 UTC (rev 52304)
+++ trunk/BINDINGS/python/python-ecore/configure.ac 2010-09-15 15:35:50 UTC (rev 52305)
@@ -65,6 +65,7 @@
pkgconfig_ecore_requires_libs="ecore >= 1.0.0"
AC_SUBST(pkgconfig_ecore_requires_libs)
PKG_CHECK_MODULES([ECORE], [$pkgconfig_ecore_requires_libs])
+wanted_cython_files="ecore/ecore.c_ecore.pyx"
have_ecore_x="no"
want_ecore_x="auto"
@@ -87,6 +88,9 @@
if test "x$want_ecore_x" = "xyes" -a "x$have_ecore_x" = "xno"; then
AC_MSG_ERROR([ecore-x support requested, but not found by pkg-config: $pkgconfig_ecore_x_requires_libs])
fi
+if test "x$want_ecore_x" != "xno" -a "x${have_ecore_x}" = "xyes"; then
+ wanted_cython_files="${wanted_cython_files} ecore/x/ecore.x.c_ecore_x.pyx ecore/x/ecore.x.screensaver.pyx"
+fi
AM_CONDITIONAL(WANT_ECORE_X,
[test "x$want_ecore_x" != "xno" -a "x${have_ecore_x}" = "xyes"])
@@ -110,6 +114,9 @@
if test "x$want_ecore_imf" = "xyes" -a "x$have_ecore_imf" = "xno"; then
AC_MSG_ERROR([ecore-imf support requested, but not found by pkg-config: $pkgconfig_ecore_imf_requires_libs])
fi
+if test "x$want_ecore_imf" != "xno" -a "x${have_ecore_imf}" = "xyes"; then
+ wanted_cython_files="${wanted_cython_files} ecore/imf/ecore.imf.c_ecore_imf.pyx"
+fi
AM_CONDITIONAL(WANT_ECORE_IMF,
[test "x$want_ecore_imf" != "xno" -a "x${have_ecore_imf}" = "xyes"])
@@ -133,6 +140,9 @@
if test "x$want_ecore_win32" = "xyes" -a "x$have_ecore_win32" = "xno"; then
AC_MSG_ERROR([ecore-win32 support requested, but not found by pkg-config: $pkgconfig_ecore_win32_requires_libs])
fi
+if test "x$want_ecore_win32" != "xno" -a "x${have_ecore_win32}" = "xyes"; then
+ wanted_cython_files="${wanted_cython_files} ecore/win32/ecore.win32.c_ecore_win32.pyx"
+fi
AM_CONDITIONAL(WANT_ECORE_WIN32,
[test "x$want_ecore_win32" != "xno" -a "x${have_ecore_win32}" = "xyes"])
@@ -157,6 +167,9 @@
if test "x$want_ecore_evas" = "xyes" -a "x$have_ecore_evas" = "xno"; then
AC_MSG_ERROR([ecore-evas support requested, but not found by pkg-config: $pkgconfig_ecore_evas_requires_libs])
fi
+if test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes"; then
+ wanted_cython_files="${wanted_cython_files} ecore/evas/ecore.evas.c_ecore_evas.pyx"
+fi
AM_CONDITIONAL(WANT_ECORE_EVAS,
[test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes"])
CYTHON_ECORE_EVAS_INCLUDEDIR=`pkg-config --variable=includedir "python-evas >= ${python_evas_version}"`
@@ -167,14 +180,24 @@
cython_required_version=0.13
AM_CHECK_CYTHON([$cython_required_version], [:], [:])
-if test v_rev -gt 0 -a "x$CYTHON_FOUND" != "xyes"; then
- if test -f "ecore/ecore.c_ecore.c"; then
- AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYHON>=${cython_required_version}])
+
+have_cython_precompiled=no
+AM_CHECK_CYTHON_PRECOMPILED([$wanted_cython_files],
+ [have_cython_precompiled=yes], [have_cython_precompiled=no])
+if test "x$CYTHON_FOUND" != "xyes"; then
+ if test v_rev -ne 0; then
+ if test "x$have_cython_precompiled" = "xyes"; then
+ AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYHON>=${cython_required_version}])
+ else
+ AC_MSG_ERROR([Cannot find Cython>=${cython_required_version}, and not a release build])
+ fi
else
- AC_MSG_ERROR([Cannot find Cython>=${cython_required_version}, and not a release build])
+ if test "x$have_cython_precompiled" = "xyes"; then
+ AC_MSG_NOTICE([Using pre-generated files from release tarball. Install Cython>=${cython_required_version} if you want to re-generate them.])
+ else
+ AC_MSG_ERROR([PACKAGING ERROR RELEASE BUILD WITHOUT PRE-GENERATED FILES])
+ fi
fi
-elif test v_rev -eq 0 -a "x$CYTHON_FOUND" != "xyes"; then
- AC_MSG_NOTICE([Using pre-generated files from release tarball. Install Cython>=${cython_required_version} if you want to re-generate them.])
fi
AM_CONDITIONAL(HAVE_CYTHON, [test "x$CYTHON_FOUND" = "xyes"])
Modified: trunk/BINDINGS/python/python-ecore/m4/cython.m4
===================================================================
--- trunk/BINDINGS/python/python-ecore/m4/cython.m4 2010-09-15 14:15:23 UTC (rev 52304)
+++ trunk/BINDINGS/python/python-ecore/m4/cython.m4 2010-09-15 15:35:50 UTC (rev 52305)
@@ -33,3 +33,45 @@
fi
])
+dnl AM_CHECK_CYTHON_PRECOMPILED(FILE-LIST [, ACTION-IF-ALL [, ACTION-IF-NOT-ALL]])
+dnl given a list of files ending in .pyx (FILE-LIST), check if their .c
+dnl counterpart exists and is not older than the source.
+dnl ACTION-IF-ALL is called only if no files failed the check and thus
+dnl all pre-generated files are usable.
+dnl ACTION-IF-NOT-ALL is called if some or all failed. If not provided,
+dnl an error will be issued.
+AC_DEFUN([AM_CHECK_CYTHON_PRECOMPILED],
+[
+_to_check_list="$1"
+_failed_list=""
+_exists_list=""
+
+for inf in $_to_check_list; do
+ outf=`echo "$inf" | sed -e 's/^\(.*\)[.]pyx$/\1.c/'`
+ if test "$outf" = "$inf"; then
+ AC_MSG_WARN([File to check must end in .pyx, but got: $inf -- Skip])
+ continue
+ fi
+
+ AC_MSG_CHECKING([for pre-generated $outf for $inf])
+ if ! test -f "$outf"; then
+ _res=no
+ _failed_list="${_failed_list} $outf"
+ elif ! test "$outf" -nt "$inf"; then
+ _res="no (older)"
+ _failed_list="${_failed_list} $outf"
+ else
+ _res=yes
+ _exists_list="${_exists_list} $outf"
+ fi
+ AC_MSG_RESULT($_res)
+done
+
+if test -z "$_failed_list" -a -n "$_exists_list"; then
+ ifelse([$2], [], [:], [$2])
+else
+ ifelse([$3], [],
+ [AC_MSG_ERROR([Missing pre-generated files: $_failed_list])],
+ [$3])
+fi
+])
Modified: trunk/BINDINGS/python/python-edje/Makefile.am
===================================================================
--- trunk/BINDINGS/python/python-edje/Makefile.am 2010-09-15 14:15:23 UTC (rev 52304)
+++ trunk/BINDINGS/python/python-edje/Makefile.am 2010-09-15 15:35:50 UTC (rev 52305)
@@ -155,7 +155,7 @@
$(top_builddir)/edje/edje.c_edje.c $(top_builddir)/edje/edje.c_edje.h $(top_builddir)/edje/edit/c_edit.c $(top_builddir)/edje/edit/c_edit.h: Makefile
@echo "NOTE: No cython, using pre-generated edje.c_edje.[ch]"
@$(MKDIR_P) $(top_builddir)/edje/edit
- $(AM_V_GEN)for f in $^; do if cmp $(top_srcdir)/$$f $(top_dstdir)/$$f; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
+ $(AM_V_GEN)for f in $^; do if ! cmp $(top_srcdir)/$$f $(top_srcdir)/$$f > /dev/null; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
endif
AM_CPPFLAGS = \
Modified: trunk/BINDINGS/python/python-edje/configure.ac
===================================================================
--- trunk/BINDINGS/python/python-edje/configure.ac 2010-09-15 14:15:23 UTC (rev 52304)
+++ trunk/BINDINGS/python/python-edje/configure.ac 2010-09-15 15:35:50 UTC (rev 52305)
@@ -68,20 +68,31 @@
PKG_CHECK_MODULES([EDJE], [$pkgconfig_edje_requires_libs])
CYTHON_EDJE_INCLUDEDIR=`pkg-config --variable=includedir "python-evas >= ${python_evas_version}"`
AC_SUBST(CYTHON_EDJE_INCLUDEDIR)
+wanted_cython_files="edje/edje.c_edje.pyx edje/edit/c_edit.pyx"
AM_PATH_PYTHON(2.5)
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
cython_required_version=0.13
AM_CHECK_CYTHON([$cython_required_version], [:], [:])
-if test v_rev -gt 0 -a "x$CYTHON_FOUND" != "xyes"; then
- if test -f "edje/edje.c_edje.c"; then
- AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYHON>=${cython_required_version}])
+
+have_cython_precompiled=no
+AM_CHECK_CYTHON_PRECOMPILED([$wanted_cython_files],
+ [have_cython_precompiled=yes], [have_cython_precompiled=no])
+if test "x$CYTHON_FOUND" != "xyes"; then
+ if test v_rev -ne 0; then
+ if test "x$have_cython_precompiled" = "xyes"; then
+ AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYHON>=${cython_required_version}])
+ else
+ AC_MSG_ERROR([Cannot find Cython>=${cython_required_version}, and not a release build])
+ fi
else
- AC_MSG_ERROR([Cannot find Cython>=${cython_required_version}, and not a release build])
+ if test "x$have_cython_precompiled" = "xyes"; then
+ AC_MSG_NOTICE([Using pre-generated files from release tarball. Install Cython>=${cython_required_version} if you want to re-generate them.])
+ else
+ AC_MSG_ERROR([PACKAGING ERROR RELEASE BUILD WITHOUT PRE-GENERATED FILES])
+ fi
fi
-elif test v_rev -eq 0 -a "x$CYTHON_FOUND" != "xyes"; then
- AC_MSG_NOTICE([Using pre-generated files from release tarball. Install Cython>=${cython_required_version} if you want to re-generate them.])
fi
AM_CONDITIONAL(HAVE_CYTHON, [test "x$CYTHON_FOUND" = "xyes"])
Modified: trunk/BINDINGS/python/python-edje/m4/cython.m4
===================================================================
--- trunk/BINDINGS/python/python-edje/m4/cython.m4 2010-09-15 14:15:23 UTC (rev 52304)
+++ trunk/BINDINGS/python/python-edje/m4/cython.m4 2010-09-15 15:35:50 UTC (rev 52305)
@@ -33,3 +33,45 @@
fi
])
+dnl AM_CHECK_CYTHON_PRECOMPILED(FILE-LIST [, ACTION-IF-ALL [, ACTION-IF-NOT-ALL]])
+dnl given a list of files ending in .pyx (FILE-LIST), check if their .c
+dnl counterpart exists and is not older than the source.
+dnl ACTION-IF-ALL is called only if no files failed the check and thus
+dnl all pre-generated files are usable.
+dnl ACTION-IF-NOT-ALL is called if some or all failed. If not provided,
+dnl an error will be issued.
+AC_DEFUN([AM_CHECK_CYTHON_PRECOMPILED],
+[
+_to_check_list="$1"
+_failed_list=""
+_exists_list=""
+
+for inf in $_to_check_list; do
+ outf=`echo "$inf" | sed -e 's/^\(.*\)[.]pyx$/\1.c/'`
+ if test "$outf" = "$inf"; then
+ AC_MSG_WARN([File to check must end in .pyx, but got: $inf -- Skip])
+ continue
+ fi
+
+ AC_MSG_CHECKING([for pre-generated $outf for $inf])
+ if ! test -f "$outf"; then
+ _res=no
+ _failed_list="${_failed_list} $outf"
+ elif ! test "$outf" -nt "$inf"; then
+ _res="no (older)"
+ _failed_list="${_failed_list} $outf"
+ else
+ _res=yes
+ _exists_list="${_exists_list} $outf"
+ fi
+ AC_MSG_RESULT($_res)
+done
+
+if test -z "$_failed_list" -a -n "$_exists_list"; then
+ ifelse([$2], [], [:], [$2])
+else
+ ifelse([$3], [],
+ [AC_MSG_ERROR([Missing pre-generated files: $_failed_list])],
+ [$3])
+fi
+])
Modified: trunk/BINDINGS/python/python-evas/Makefile.am
===================================================================
--- trunk/BINDINGS/python/python-evas/Makefile.am 2010-09-15 14:15:23 UTC (rev 52304)
+++ trunk/BINDINGS/python/python-evas/Makefile.am 2010-09-15 15:35:50 UTC (rev 52305)
@@ -100,7 +100,7 @@
$(top_builddir)/evas/evas.c_evas.c $(top_builddir)/evas/evas.c_evas.h: Makefile
@echo "NOTE: No cython, using pre-generated evas.c_evas.[ch]"
@$(MKDIR_P) $(top_builddir)/evas
- $(AM_V_GEN)for f in $^; do if cmp $(top_srcdir)/$$f $(top_dstdir)/$$f; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
+ $(AM_V_GEN)for f in $^; do if ! cmp $(top_srcdir)/$$f $(top_builddir)/$$f >/dev/null; then cp $(top_srcdir)/$$f $(top_builddir)/$$f; fi; done
endif
AM_CPPFLAGS = \
Modified: trunk/BINDINGS/python/python-evas/configure.ac
===================================================================
--- trunk/BINDINGS/python/python-evas/configure.ac 2010-09-15 14:15:23 UTC (rev 52304)
+++ trunk/BINDINGS/python/python-evas/configure.ac 2010-09-15 15:35:50 UTC (rev 52305)
@@ -65,20 +65,31 @@
pkgconfig_evas_requires_libs="evas >= 1.0.0 eina >= 1.0.0"
AC_SUBST(pkgconfig_evas_requires_libs)
PKG_CHECK_MODULES([EVAS], [$pkgconfig_evas_requires_libs])
+wanted_cython_files="evas/evas.c_evas.pyx"
AM_PATH_PYTHON(2.5)
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
cython_required_version=0.13
AM_CHECK_CYTHON([$cython_required_version], [:], [:])
-if test v_rev -gt 0 -a "x$CYTHON_FOUND" != "xyes"; then
- if test -f "evas/evas.c_evas.c"; then
- AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYHON>=${cython_required_version}])
+
+have_cython_precompiled=no
+AM_CHECK_CYTHON_PRECOMPILED([$wanted_cython_files],
+ [have_cython_precompiled=yes], [have_cython_precompiled=no])
+if test "x$CYTHON_FOUND" != "xyes"; then
+ if test v_rev -ne 0; then
+ if test "x$have_cython_precompiled" = "xyes"; then
+ AC_MSG_WARN([Cannot find Cython>=${cython_required_version}, however found a pre-generated file. YOU MAY FIND PROBLEMS, USE A RELEASE TARBALL OR INSTALL CYHON>=${cython_required_version}])
+ else
+ AC_MSG_ERROR([Cannot find Cython>=${cython_required_version}, and not a release build])
+ fi
else
- AC_MSG_ERROR([Cannot find Cython>=${cython_required_version}, and not a release build])
+ if test "x$have_cython_precompiled" = "xyes"; then
+ AC_MSG_NOTICE([Using pre-generated files from release tarball. Install Cython>=${cython_required_version} if you want to re-generate them.])
+ else
+ AC_MSG_ERROR([PACKAGING ERROR RELEASE BUILD WITHOUT PRE-GENERATED FILES])
+ fi
fi
-elif test v_rev -eq 0 -a "x$CYTHON_FOUND" != "xyes"; then
- AC_MSG_NOTICE([Using pre-generated files from release tarball. Install Cython>=${cython_required_version} if you want to re-generate them.])
fi
AM_CONDITIONAL(HAVE_CYTHON, [test "x$CYTHON_FOUND" = "xyes"])
Modified: trunk/BINDINGS/python/python-evas/m4/cython.m4
===================================================================
--- trunk/BINDINGS/python/python-evas/m4/cython.m4 2010-09-15 14:15:23 UTC (rev 52304)
+++ trunk/BINDINGS/python/python-evas/m4/cython.m4 2010-09-15 15:35:50 UTC (rev 52305)
@@ -33,3 +33,45 @@
fi
])
+dnl AM_CHECK_CYTHON_PRECOMPILED(FILE-LIST [, ACTION-IF-ALL [, ACTION-IF-NOT-ALL]])
+dnl given a list of files ending in .pyx (FILE-LIST), check if their .c
+dnl counterpart exists and is not older than the source.
+dnl ACTION-IF-ALL is called only if no files failed the check and thus
+dnl all pre-generated files are usable.
+dnl ACTION-IF-NOT-ALL is called if some or all failed. If not provided,
+dnl an error will be issued.
+AC_DEFUN([AM_CHECK_CYTHON_PRECOMPILED],
+[
+_to_check_list="$1"
+_failed_list=""
+_exists_list=""
+
+for inf in $_to_check_list; do
+ outf=`echo "$inf" | sed -e 's/^\(.*\)[.]pyx$/\1.c/'`
+ if test "$outf" = "$inf"; then
+ AC_MSG_WARN([File to check must end in .pyx, but got: $inf -- Skip])
+ continue
+ fi
+
+ AC_MSG_CHECKING([for pre-generated $outf for $inf])
+ if ! test -f "$outf"; then
+ _res=no
+ _failed_list="${_failed_list} $outf"
+ elif ! test "$outf" -nt "$inf"; then
+ _res="no (older)"
+ _failed_list="${_failed_list} $outf"
+ else
+ _res=yes
+ _exists_list="${_exists_list} $outf"
+ fi
+ AC_MSG_RESULT($_res)
+done
+
+if test -z "$_failed_list" -a -n "$_exists_list"; then
+ ifelse([$2], [], [:], [$2])
+else
+ ifelse([$3], [],
+ [AC_MSG_ERROR([Missing pre-generated files: $_failed_list])],
+ [$3])
+fi
+])
|