diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-12-16 10:49:01 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-12-16 10:49:01 +0100 |
| commit | 9943308ce82567d1c1f6c22294b18dc56c00a660 (patch) | |
| tree | 984ef13394633cfc97fefdcdecd60ed6e60240b4 | |
| parent | 24749caa206f5efff0537cc89f9cf3cc6fada928 (diff) | |
| download | cornucopia-9943308ce82567d1c1f6c22294b18dc56c00a660.tar.gz cornucopia-9943308ce82567d1c1f6c22294b18dc56c00a660.tar.bz2 cornucopia-9943308ce82567d1c1f6c22294b18dc56c00a660.zip | |
fsonetworkd: pick up git version, if available
| -rw-r--r-- | fsonetworkd/configure.ac | 21 | ||||
| -rw-r--r-- | fsonetworkd/src/plugins/sharing/plugin.vala | 30 | ||||
| -rw-r--r-- | fsonetworkd/vapi/config.vapi | 7 |
3 files changed, 44 insertions, 14 deletions
diff --git a/fsonetworkd/configure.ac b/fsonetworkd/configure.ac index 2736f599..2e449c24 100644 --- a/fsonetworkd/configure.ac +++ b/fsonetworkd/configure.ac @@ -76,6 +76,10 @@ AC_SUBST(LIBNL_LIBS) PKG_CHECK_MODULES(FSO_GLIB, fso-glib-1.0 >= $FSO_GLIB_REQUIRED) +# git version +GITV=`cat ../.git/refs/heads/master || echo "unknown"` +AC_DEFINE_UNQUOTED([PACKAGE_GITV], ["${GITV}"], [git version]) + AC_CONFIG_FILES([ Makefile data/Makefile @@ -88,3 +92,20 @@ AC_CONFIG_FILES([ ]) AC_OUTPUT +# +# Info +# +echo +echo +echo +echo "------------------------------------------------------------------------" +echo "$PACKAGE_NAME $PACKAGE_VERSION-$GITV" +echo "------------------------------------------------------------------------" +echo +echo "Configuration Options:" +echo +echo " prefix..................: $prefix" +echo +echo "------------------------------------------------------------------------" +echo +echo "Now type 'make' to compile and 'make install' to install this package." diff --git a/fsonetworkd/src/plugins/sharing/plugin.vala b/fsonetworkd/src/plugins/sharing/plugin.vala index 159273b5..b8e5d4fe 100644 --- a/fsonetworkd/src/plugins/sharing/plugin.vala +++ b/fsonetworkd/src/plugins/sharing/plugin.vala @@ -1,5 +1,6 @@ /* * plugin.vala + * * Written by Sudharshan "Sup3rkiddo" S <sudharsh@gmail.com> * All Rights Reserved * @@ -24,8 +25,21 @@ using GLib; namespace Sharing { + public const string MODULE_NAME = "fsonetwork.sharing"; + + private const string UDHCPD_TEMPLATE = """# freesmartphone.org /etc/udhcpd.conf +start 192.168.0.20 # lease range +end 192.168.0.199 # lease range +interface %s # listen on interface +option dns %s # grab from resolv.conf +option subnet 255.255.255.0 +opt router %s # address of interface +option lease 864000 # 10 days of seconds"""; + +} + -public class ConnectionSharing : FreeSmartphone.Network, FsoFramework.AbstractObject +public class Sharing.ConnectionSharing : FreeSmartphone.Network, FsoFramework.AbstractObject { private FsoFramework.Subsystem subsystem; @@ -118,18 +132,6 @@ public class ConnectionSharing : FreeSmartphone.Network, FsoFramework.AbstractOb } -private const string UDHCPD_TEMPLATE = """# freesmartphone.org /etc/udhcpd.conf -start 192.168.0.20 # lease range -end 192.168.0.199 # lease range -interface %s # listen on interface -option dns %s # grab from resolv.conf -option subnet 255.255.255.0 -opt router %s # address of interface -option lease 864000 # 10 days of seconds"""; - -} /* end namespace */ - - static string sys_class_net; Sharing.ConnectionSharing instance; @@ -141,7 +143,7 @@ public static string fso_factory_function( FsoFramework.Subsystem subsystem ) th sys_class_net = "%s/class/net".printf( sysfs_root ); // create instance instance = new Sharing.ConnectionSharing( subsystem ); - return "fsonetwork.sharing"; + return Sharing.MODULE_NAME; } diff --git a/fsonetworkd/vapi/config.vapi b/fsonetworkd/vapi/config.vapi new file mode 100644 index 00000000..8ec2218f --- /dev/null +++ b/fsonetworkd/vapi/config.vapi @@ -0,0 +1,7 @@ +[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")] +namespace Config +{ + public const string PACKAGE_VERSION; + public const string PACKAGE_DATADIR; + public const string PACKAGE_GITV; +} |