From 6d3743ef998358604fc37a3e1759257cd1061523 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Fri, 11 Dec 2009 10:28:06 -0600 Subject: Build for Mono bindings --- configure.ac | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1b5e120..bf4aff8 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) PKG_PROG_PKG_CONFIG ########################### -# Dependencies +# Dependencies ########################### GTK_REQUIRED_VERSION=2.12 @@ -40,6 +40,55 @@ PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION AC_SUBST(INDICATOR_CFLAGS) AC_SUBST(INDICATOR_LIBS) +########################### +# Check for Mono support +########################### +MONO_REQUIRED_VERSION=1.0 +PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) + +AC_PATH_PROG(AL, al, no) +if test "x$AL" = "xno" ; then + AC_MSG_ERROR([No al tool found. You need to install Mono.]) +fi + +if test "x$has_mono" = "xtrue" ; then + GENERATED_SOURCES=generated/*.cs + AC_PATH_PROG(RUNTIME, mono, no) + + if test "x$RUNTIME" != "no" ; then + RUNTIME=mono + fi + + AC_PATH_PROG(CSC, gmcs, no) + LIB_PREFIX=.so + LIB_SUFFIX= +fi + +if test "x$CSC" = "xno" ; then + AC_MSG_ERROR([No Mono compiler found.]) +fi + +AC_SUBST(RUNTIME) +AC_SUBST(CSC) +AC_SUBST(LIB_PREFIX) +AC_SUBST(LIB_SUFFIX) +AC_SUBST(GENERATED_SOURCES) + +GLIB_SHARP_REQ_VERSION=2.12.1 +GTK_SHARP_REQ_VERSION=2.12 +PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION) +AC_SUBST(GTK_SHARP_LIBS) +AC_SUBST(GTK_SHARP_CFLAGS) + +PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION) +AC_PATH_PROG(GAPI_PARSER, gapi2-parser, no) +AC_SUBST(GAPI_PARSER) +AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no) +AC_SUBST(GAPI_CODEGEN) +AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) +AC_SUBST(GAPI_FIXUP) + + ########################### # Check to see if we're local ########################### @@ -79,6 +128,9 @@ AC_SUBST(DBUSSERVICEDIR) AC_OUTPUT([ Makefile src/Makefile +sources/Makefile +sources/appindicator-sharp.dll.config +sources/appindicator-sharp.pc data/Makefile tests/Makefile example/Makefile -- cgit v1.2.3 From 88a109e2f9513a4560419f0892971967636224b1 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Fri, 11 Dec 2009 10:31:49 -0600 Subject: Move to bindings/mono --- configure.ac | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index bf4aff8..8044d24 100644 --- a/configure.ac +++ b/configure.ac @@ -128,9 +128,10 @@ AC_SUBST(DBUSSERVICEDIR) AC_OUTPUT([ Makefile src/Makefile -sources/Makefile -sources/appindicator-sharp.dll.config -sources/appindicator-sharp.pc +bindings/Makefile +bindings/mono/Makefile +bindings/mono/appindicator-sharp.dll.config +bindings/mono/appindicator-sharp.pc data/Makefile tests/Makefile example/Makefile -- cgit v1.2.3 From 7783eb689c166151cec3ab3219d02587a3b0463f Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Fri, 11 Dec 2009 11:00:29 -0600 Subject: Move appindicator-sharp.pc to appindicator-sharp-0.1.pc --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 456ca87..fc1381c 100644 --- a/configure.ac +++ b/configure.ac @@ -140,7 +140,7 @@ src/libappindicator/appindicator-0.1.pc bindings/Makefile bindings/mono/Makefile bindings/mono/appindicator-sharp.dll.config -bindings/mono/appindicator-sharp.pc +bindings/mono/appindicator-sharp-0.1.pc data/Makefile tests/Makefile example/Makefile -- cgit v1.2.3 From a602f4287ef14e95cbaea78c8c676c247a6226fe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 11 Dec 2009 20:23:37 -0600 Subject: Adding the Python build system into the indicator-application one. --- configure.ac | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 33d296c..4fa8675 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,35 @@ else fi AC_SUBST(DBUSSERVICEDIR) +########################### +# Python +########################### + +PYGTK_REQUIRED=2.14.0 +APPAPPINDICATOR_REQUIRED=0.0.2 +PYGOBJECT_REQUIRED=0.22 + +AM_PATH_PYTHON(2.3.5) +AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) + +PKG_CHECK_MODULES(APPINDICATOR_PYTHON, + [ + pygtk-2.0 >= $PYGTK_REQUIRED + pygobject-2.0 >= $PYGOBJECT_REQUIRED + ]) +AC_SUBST(APPINDICATOR_PYTHON_CFLAGS) +AC_SUBST(APPINDICATOR_PYTHON_LIBS) + +AC_MSG_CHECKING(for pygtk defs) +PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` +AC_SUBST(PYGTK_DEFSDIR) +AC_MSG_RESULT($PYGTK_DEFSDIR) + +AC_MSG_CHECKING(for pygtk codegen) +PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" +AC_SUBST(PYGTK_CODEGEN) +AC_MSG_RESULT($PYGTK_CODEGEN) + ########################### # Files ########################### @@ -87,6 +116,7 @@ AC_OUTPUT([ Makefile src/Makefile src/libappindicator/appindicator-0.1.pc +python/Makefile data/Makefile tests/Makefile example/Makefile -- cgit v1.2.3 From a3a42b9358ebb5c005ecd5b375340ff8daba1f3d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 11 Dec 2009 20:29:28 -0600 Subject: Fixing the build system to link everything all happy like. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 4fa8675..ad85399 100644 --- a/configure.ac +++ b/configure.ac @@ -84,7 +84,6 @@ AC_SUBST(DBUSSERVICEDIR) ########################### PYGTK_REQUIRED=2.14.0 -APPAPPINDICATOR_REQUIRED=0.0.2 PYGOBJECT_REQUIRED=0.22 AM_PATH_PYTHON(2.3.5) @@ -92,8 +91,9 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) PKG_CHECK_MODULES(APPINDICATOR_PYTHON, [ - pygtk-2.0 >= $PYGTK_REQUIRED - pygobject-2.0 >= $PYGOBJECT_REQUIRED + pygtk-2.0 >= $PYGTK_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED_VERSION + pygobject-2.0 >= $PYGOBJECT_REQUIRED ]) AC_SUBST(APPINDICATOR_PYTHON_CFLAGS) AC_SUBST(APPINDICATOR_PYTHON_LIBS) -- cgit v1.2.3 From 59526b689303cde25721d0a1fdcafdb371fdddba Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Sat, 12 Dec 2009 12:20:52 -0600 Subject: Initial stab at setting up test/example fu --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index fc1381c..ca1793a 100644 --- a/configure.ac +++ b/configure.ac @@ -96,6 +96,8 @@ AC_SUBST(GAPI_CODEGEN) AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) AC_SUBST(GAPI_FIXUP) +PKG_CHECK_MODULES(NUNIT, nunit-2.4 >= 2.4.7) +AC_SUBST(NUNIT_LIBS) ########################### # Check to see if we're local @@ -141,6 +143,8 @@ bindings/Makefile bindings/mono/Makefile bindings/mono/appindicator-sharp.dll.config bindings/mono/appindicator-sharp-0.1.pc +bindings/mono/examples/Makefile +bindings/mono/examples/indicator-example data/Makefile tests/Makefile example/Makefile -- cgit v1.2.3