From 259c51992e02eb323742df1a678b1e5eddba0997 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 11 Jun 2010 10:58:47 -0500 Subject: Increasing timeout to hopefully make it work on Hudson with load. --- tests/test-libappindicator-fallback-watcher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-libappindicator-fallback-watcher.c b/tests/test-libappindicator-fallback-watcher.c index 70e01d1..00841fd 100644 --- a/tests/test-libappindicator-fallback-watcher.c +++ b/tests/test-libappindicator-fallback-watcher.c @@ -97,7 +97,7 @@ main (int argv, char ** argc) dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_filter, NULL, NULL); /* After we've got the name, let it unfallback, and then we'll drop again */ - g_timeout_add(250, kill_func, NULL); + g_timeout_add(1000, kill_func, NULL); g_debug("Entering Mainloop"); -- cgit v1.2.3 From 6eedd6ecca2bc3ea84df10d3bebbcf0540cf142a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 11 Jun 2010 12:34:09 -0500 Subject: Increase the timeouts, but make it so that the watcher shutsdown when seen. --- tests/Makefile.am | 2 +- tests/test-libappindicator-fallback-item.c | 2 +- tests/test-libappindicator-fallback-watcher.c | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index d3b18d8..8d356bc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -142,7 +142,7 @@ XML_REPORT = libappindicator-check-results.xml HTML_REPORT = libappindicator-check-results.html libappindicator-tests: libappindicator-tests-gtester Makefile.am - @echo "#!/bin/sh" > $@ + @echo "#!/bin/bash" > $@ @echo . $(srcdir)/run-xvfb.sh >> $@ @echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@ @chmod +x $@ diff --git a/tests/test-libappindicator-fallback-item.c b/tests/test-libappindicator-fallback-item.c index 426b6a6..418b779 100644 --- a/tests/test-libappindicator-fallback-item.c +++ b/tests/test-libappindicator-fallback-item.c @@ -138,7 +138,7 @@ main (int argc, char ** argv) GtkWidget * menu = gtk_menu_new(); app_indicator_set_menu(APP_INDICATOR(item), GTK_MENU(menu)); - g_timeout_add_seconds(1, kill_func, NULL); + g_timeout_add_seconds(2, kill_func, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); diff --git a/tests/test-libappindicator-fallback-watcher.c b/tests/test-libappindicator-fallback-watcher.c index 00841fd..0a1b187 100644 --- a/tests/test-libappindicator-fallback-watcher.c +++ b/tests/test-libappindicator-fallback-watcher.c @@ -27,6 +27,8 @@ with this program. If not, see . #include "../src/dbus-shared.h" +gboolean kill_func (gpointer userdata); + static GMainLoop * mainloop = NULL; static DBusHandlerResult @@ -36,6 +38,10 @@ dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_dat DBusMessage * reply = dbus_message_new_method_return(message); dbus_connection_send(connection, reply, NULL); dbus_message_unref(reply); + + /* Let the messages get out, but we're done at this point */ + g_timeout_add(50, kill_func, NULL); + return DBUS_HANDLER_RESULT_HANDLED; } @@ -96,8 +102,9 @@ main (int argv, char ** argc) dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_filter, NULL, NULL); - /* After we've got the name, let it unfallback, and then we'll drop again */ - g_timeout_add(1000, kill_func, NULL); + /* This is the final kill function. It really shouldn't happen + unless we get an error. */ + g_timeout_add(2000, kill_func, NULL); g_debug("Entering Mainloop"); -- cgit v1.2.3 From cdb0efc773c4dacf3062cf6bdcb7ee70c7417983 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 11 Jun 2010 12:35:21 -0500 Subject: More time for initial fallback. --- tests/test-libappindicator-fallback-watcher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-libappindicator-fallback-watcher.c b/tests/test-libappindicator-fallback-watcher.c index 0a1b187..5494082 100644 --- a/tests/test-libappindicator-fallback-watcher.c +++ b/tests/test-libappindicator-fallback-watcher.c @@ -84,7 +84,7 @@ main (int argv, char ** argc) return 1; } - g_usleep(250000); + g_usleep(500000); g_debug("Initing"); -- cgit v1.2.3 From 750406ec99c96dd6b829b258fe4169ff97f37ef6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Jun 2010 12:43:06 -0500 Subject: Only work with specific files instead of the whole directory. --- bindings/mono/app-indicator.sources.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bindings/mono/app-indicator.sources.xml b/bindings/mono/app-indicator.sources.xml index 0d82430..2649eb4 100644 --- a/bindings/mono/app-indicator.sources.xml +++ b/bindings/mono/app-indicator.sources.xml @@ -2,10 +2,10 @@ - - app-indicator-enum-types.h.in - app-indicator-enum-types.c.in - + ../../src/app-indicator.c + ../../src/app-indicator-enum-types.c + ../../src/app-indicator-enum-types.h + ../../src/app-indicator.h -- cgit v1.2.3 -- cgit v1.2.3 From fc6b18bde0af75bff3710306a45fdf907e248c20 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Jun 2010 13:21:59 -0500 Subject: Icon name shouldn't be construct only. --- src/app-indicator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 6c2a8d9..bc43e58 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -229,7 +229,7 @@ app_indicator_class_init (AppIndicatorClass *klass) "An icon for the indicator", "The default icon that is shown for the indicator.", NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** AppIndicator:attention-icon-name: -- cgit v1.2.3 From e589ecaddf4d14e9aeea5aed9f4076b1447cc926 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Jun 2010 17:04:14 -0500 Subject: Reworking to make more clear and use the GEnumValue structure correctly. --- src/application-service-appstore.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 66943b5..c18ebe2 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -243,7 +243,13 @@ get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * err static AppIndicatorStatus string_to_status(const gchar * status_string) { - return (AppIndicatorStatus) g_enum_get_value_by_nick((GEnumClass *)g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), status_string); + GEnumClass * klass = G_ENUM_CLASS(g_type_class_peek_static(APP_INDICATOR_TYPE_INDICATOR_STATUS)); + g_return_val_if_fail(klass != NULL, APP_INDICATOR_STATUS_PASSIVE); + + GEnumValue * val = g_enum_get_value_by_nick(klass, status_string); + g_return_val_if_fail(val != NULL, APP_INDICATOR_STATUS_PASSIVE); + + return (AppIndicatorStatus)val->value; } /* A small helper function to get the position of an application -- cgit v1.2.3 From ce25d4c9ac44237bb1f38576e99de3533489bd74 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Jun 2010 22:16:01 -0500 Subject: Use class ref and unref to allocate it if need be. --- src/application-service-appstore.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index c18ebe2..66e3cf3 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -243,13 +243,17 @@ get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * err static AppIndicatorStatus string_to_status(const gchar * status_string) { - GEnumClass * klass = G_ENUM_CLASS(g_type_class_peek_static(APP_INDICATOR_TYPE_INDICATOR_STATUS)); + GEnumClass * klass = G_ENUM_CLASS(g_type_class_ref(APP_INDICATOR_TYPE_INDICATOR_STATUS)); g_return_val_if_fail(klass != NULL, APP_INDICATOR_STATUS_PASSIVE); GEnumValue * val = g_enum_get_value_by_nick(klass, status_string); g_return_val_if_fail(val != NULL, APP_INDICATOR_STATUS_PASSIVE); - return (AppIndicatorStatus)val->value; + AppIndicatorStatus retval = (AppIndicatorStatus)val->value; + + g_type_class_unref(klass); + + return retval; } /* A small helper function to get the position of an application -- cgit v1.2.3 From d4f5fa77e921df815bd67080167a461c51791a26 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 08:41:33 -0500 Subject: Remove the assert with checking if the value is NULL. --- src/application-service-appstore.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 66e3cf3..15abea3 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -246,10 +246,14 @@ string_to_status(const gchar * status_string) GEnumClass * klass = G_ENUM_CLASS(g_type_class_ref(APP_INDICATOR_TYPE_INDICATOR_STATUS)); g_return_val_if_fail(klass != NULL, APP_INDICATOR_STATUS_PASSIVE); - GEnumValue * val = g_enum_get_value_by_nick(klass, status_string); - g_return_val_if_fail(val != NULL, APP_INDICATOR_STATUS_PASSIVE); + AppIndicatorStatus retval = APP_INDICATOR_STATUS_PASSIVE; - AppIndicatorStatus retval = (AppIndicatorStatus)val->value; + GEnumValue * val = g_enum_get_value_by_nick(klass, status_string); + if (val == NULL) { + g_warning("Unrecognized status '%s' assuming passive.", status_string); + } else { + retval = (AppIndicatorStatus)val->value; + } g_type_class_unref(klass); -- cgit v1.2.3 From f399d897c0367ebde3acbe2da2b819116f4a739f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 10:33:02 -0500 Subject: Generating a policy dll --- .bzrignore | 1 + bindings/mono/Makefile.am | 8 +++++++- bindings/mono/policy.2.0.appindicator-sharp.config | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 bindings/mono/policy.2.0.appindicator-sharp.config diff --git a/.bzrignore b/.bzrignore index df407b6..c044203 100644 --- a/.bzrignore +++ b/.bzrignore @@ -106,3 +106,4 @@ src/AppIndicator-0.1.typelib docs/reference/libappindicator-decl.txt.bak docs/reference/libappindicator-decl-list.txt.bak src/AppIndicator-0.1.vapi +bindings/mono/policy.appindicator-sharp.dll diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 4d2d8b4..cd2d229 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -11,7 +11,8 @@ RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp ASSEMBLY = appindicator-sharp.dll -TARGET = $(ASSEMBLY) $(ASSEMBLY).config +DLLPOLICY = policy.$(ASSEMBLY) +TARGET = $(ASSEMBLY) $(ASSEMBLY).config $(DLLPOLICY) assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(MIDDLE_API) $(RAW_API) $(TEST) @@ -26,6 +27,7 @@ EXTRA_DIST = \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ + policy.2.0.$(ASSMEBLY_NAME).config \ $(customs) \ $(TEST_SOURCES) @@ -83,3 +85,7 @@ $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) all: $(TEST) + +$(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk + $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(ASSEMBLY_NAME).snk + diff --git a/bindings/mono/policy.2.0.appindicator-sharp.config b/bindings/mono/policy.2.0.appindicator-sharp.config new file mode 100644 index 0000000..dd9e6e9 --- /dev/null +++ b/bindings/mono/policy.2.0.appindicator-sharp.config @@ -0,0 +1,10 @@ + + + + + + + + + + -- cgit v1.2.3 From 814bed13f090ffd76c493b708b68e3eb9b4851a3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 10:35:27 -0500 Subject: Typo --- bindings/mono/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index cd2d229..85249ff 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ - policy.2.0.$(ASSMEBLY_NAME).config \ + policy.2.0.$(ASSEMBLY_NAME).config \ $(customs) \ $(TEST_SOURCES) -- cgit v1.2.3 From 5ea2df7ffe6c3f84353a696caa3e34e9ad97c09f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 10:52:53 -0500 Subject: Fixing directories --- bindings/mono/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 85249ff..97b4f26 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -86,6 +86,6 @@ $(TEST): $(ASSEMBLY) $(TEST_SOURCES) all: $(TEST) -$(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk - $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(ASSEMBLY_NAME).snk +$(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile + (cd $(srcdir) ; $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(abs_builddir)/$(DLLPOLICY) -keyfile:$(ASSEMBLY_NAME).snk) -- cgit v1.2.3 From c0f64171958d491764b961278e0947b7a19d570c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 10:57:02 -0500 Subject: Readjusting so that the policy file is in the same directory as the DLL --- bindings/mono/Makefile.am | 7 +++++-- bindings/mono/policy.2.0.appindicator-sharp.config | 10 ---------- bindings/mono/policy.2.0.appindicator-sharp.config.in | 10 ++++++++++ 3 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 bindings/mono/policy.2.0.appindicator-sharp.config create mode 100644 bindings/mono/policy.2.0.appindicator-sharp.config.in diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 97b4f26..41eea3f 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ - policy.2.0.$(ASSEMBLY_NAME).config \ + policy.2.0.$(ASSEMBLY_NAME).config.in \ $(customs) \ $(TEST_SOURCES) @@ -86,6 +86,9 @@ $(TEST): $(ASSEMBLY) $(TEST_SOURCES) all: $(TEST) +policy.2.0.$(ASSEMBLY_NAME).config: policy.2.0.$(ASSEMBLY_NAME).config.in Makefile + cp $< $@ + $(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile - (cd $(srcdir) ; $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(abs_builddir)/$(DLLPOLICY) -keyfile:$(ASSEMBLY_NAME).snk) + $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk diff --git a/bindings/mono/policy.2.0.appindicator-sharp.config b/bindings/mono/policy.2.0.appindicator-sharp.config deleted file mode 100644 index dd9e6e9..0000000 --- a/bindings/mono/policy.2.0.appindicator-sharp.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/bindings/mono/policy.2.0.appindicator-sharp.config.in b/bindings/mono/policy.2.0.appindicator-sharp.config.in new file mode 100644 index 0000000..dd9e6e9 --- /dev/null +++ b/bindings/mono/policy.2.0.appindicator-sharp.config.in @@ -0,0 +1,10 @@ + + + + + + + + + + -- cgit v1.2.3 From e434b937dac91258f080bcb3832ee9fe6fe8814e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 11:01:26 -0500 Subject: Fixing the distcheck by cleaning up --- bindings/mono/Makefile.am | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 41eea3f..607325f 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -15,7 +15,19 @@ DLLPOLICY = policy.$(ASSEMBLY) TARGET = $(ASSEMBLY) $(ASSEMBLY).config $(DLLPOLICY) assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) -CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(MIDDLE_API) $(RAW_API) $(TEST) + +CLEANFILES = \ + $(ASSEMBLY) \ + $(ASSEMBLY).mdb \ + generated-stamp \ + generated/*.cs \ + $(API) \ + $(MIDDLE_API) \ + $(RAW_API) \ + $(TEST) \ + $(DLLPOLICY) \ + policy.2.0.$(ASSEMBLY_NAME).config + DISTCLEANFILES = $(ASSEMBLY).config TEST_SOURCES = TestIndicator.cs customs = ApplicationIndicator.custom -- cgit v1.2.3 From 35915da208febe200fe3b29acdea9c329e70b163 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 11:55:22 -0500 Subject: Replacing the macros with the proper data --- bindings/mono/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 607325f..b366b6f 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -99,7 +99,9 @@ $(TEST): $(ASSEMBLY) $(TEST_SOURCES) all: $(TEST) policy.2.0.$(ASSEMBLY_NAME).config: policy.2.0.$(ASSEMBLY_NAME).config.in Makefile - cp $< $@ + sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \ + -e "s|@ASSEMBLY_VERSION@|0.1|g" \ + $< > $@ $(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -- cgit v1.2.3 From f8f18e9f7a1c1ca281fab5c87c2379f8ab59b721 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 12:16:47 -0500 Subject: Fixing policy name --- bindings/mono/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index b366b6f..b052d86 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -11,7 +11,7 @@ RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp ASSEMBLY = appindicator-sharp.dll -DLLPOLICY = policy.$(ASSEMBLY) +DLLPOLICY = policy.2.0.$(ASSEMBLY) TARGET = $(ASSEMBLY) $(ASSEMBLY).config $(DLLPOLICY) assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) -- cgit v1.2.3 From c012b2a943a86ab70b961a69672c61f4ac6ef3e1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 13:01:53 -0500 Subject: Fixup the gacutil stuff. Still doesn't ununinstall. --- bindings/mono/Makefile.am | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index b052d86..3fb724f 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -43,7 +43,7 @@ EXTRA_DIST = \ $(customs) \ $(TEST_SOURCES) -GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib" +GACUTIL_FLAGS=-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib references = $(GTK_SHARP_LIBS) test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY) @@ -86,12 +86,16 @@ $(ASSEMBLY): generated-stamp $(srcdir)/AssemblyInfo.cs $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) $(srcdir)/AssemblyInfo.cs install-data-local: - echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \ - $(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1; + echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -i $(ASSEMBLY_NAME).dll $(GACUTIL_FLAGS) || exit 1; + echo "$(GACUTIL) -i $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -i $(DLLPOLICY) $(GACUTIL_FLAGS) || exit 1; uninstall-local: - echo "$(GACUTIL) -u $(ASSEMBLY_NAME) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \ - $(GACUTIL) -u $(ASSEMBLY_NAME) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1; + echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; + echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -u $(DLLPOLICY),version=0.0.0.0,Culture=en,PublicKeyToken=bcae265d1c7ab4c2 $(GACUTIL_FLAGS) || exit 1; $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) -- cgit v1.2.3 From 64a712f53a2395d216763bb85d89647e993a3c2d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 14:16:21 -0500 Subject: Swithcing the version to be the assembly version. --- bindings/mono/Makefile.am | 17 +++++++++-------- bindings/mono/policy.0.1.appindicator-sharp.config.in | 10 ++++++++++ bindings/mono/policy.2.0.appindicator-sharp.config.in | 10 ---------- 3 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 bindings/mono/policy.0.1.appindicator-sharp.config.in delete mode 100644 bindings/mono/policy.2.0.appindicator-sharp.config.in diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 3fb724f..cb494dd 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -10,8 +10,9 @@ MIDDLE_API = libappindicator-api.middle RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp +ASSEMBLY_VERSION = 0.1 ASSEMBLY = appindicator-sharp.dll -DLLPOLICY = policy.2.0.$(ASSEMBLY) +DLLPOLICY = policy.$(ASSEMBLY_VERSION).$(ASSEMBLY) TARGET = $(ASSEMBLY) $(ASSEMBLY).config $(DLLPOLICY) assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) @@ -26,7 +27,7 @@ CLEANFILES = \ $(RAW_API) \ $(TEST) \ $(DLLPOLICY) \ - policy.2.0.$(ASSEMBLY_NAME).config + policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config DISTCLEANFILES = $(ASSEMBLY).config TEST_SOURCES = TestIndicator.cs @@ -39,7 +40,7 @@ EXTRA_DIST = \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ - policy.2.0.$(ASSEMBLY_NAME).config.in \ + policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config.in \ $(customs) \ $(TEST_SOURCES) @@ -95,18 +96,18 @@ uninstall-local: echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) -u $(DLLPOLICY),version=0.0.0.0,Culture=en,PublicKeyToken=bcae265d1c7ab4c2 $(GACUTIL_FLAGS) || exit 1; + $(GACUTIL) -u $(ASSEMBLY_NAME),version=0.0.0.0,Culture=en,PublicKeyToken=bcae265d1c7ab4c2 $(GACUTIL_FLAGS) || exit 1; $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) all: $(TEST) -policy.2.0.$(ASSEMBLY_NAME).config: policy.2.0.$(ASSEMBLY_NAME).config.in Makefile +policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config: policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config.in Makefile sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \ - -e "s|@ASSEMBLY_VERSION@|0.1|g" \ + -e "s|@ASSEMBLY_VERSION@|$(ASSEMBLY_VERSION)|g" \ $< > $@ -$(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile - $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk +$(DLLPOLICY): policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile + $(AL) -link:policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk diff --git a/bindings/mono/policy.0.1.appindicator-sharp.config.in b/bindings/mono/policy.0.1.appindicator-sharp.config.in new file mode 100644 index 0000000..dd9e6e9 --- /dev/null +++ b/bindings/mono/policy.0.1.appindicator-sharp.config.in @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/bindings/mono/policy.2.0.appindicator-sharp.config.in b/bindings/mono/policy.2.0.appindicator-sharp.config.in deleted file mode 100644 index dd9e6e9..0000000 --- a/bindings/mono/policy.2.0.appindicator-sharp.config.in +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - -- cgit v1.2.3 From c5c267021dc458fd67059250e26e07523179cdff Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 14:19:59 -0500 Subject: Switching to the policy name. --- bindings/mono/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index cb494dd..a7fb526 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -96,7 +96,7 @@ uninstall-local: echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) -u $(ASSEMBLY_NAME),version=0.0.0.0,Culture=en,PublicKeyToken=bcae265d1c7ab4c2 $(GACUTIL_FLAGS) || exit 1; + $(GACUTIL) -u policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) -- cgit v1.2.3 From f23786efebe604d7fee644db58a62f348974e593 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 14:40:12 -0500 Subject: Adding the policy config to the installed files. --- bindings/mono/Makefile.am | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index a7fb526..3bd29d4 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -13,7 +13,13 @@ ASSEMBLY_NAME = appindicator-sharp ASSEMBLY_VERSION = 0.1 ASSEMBLY = appindicator-sharp.dll DLLPOLICY = policy.$(ASSEMBLY_VERSION).$(ASSEMBLY) -TARGET = $(ASSEMBLY) $(ASSEMBLY).config $(DLLPOLICY) + +TARGET = \ + $(ASSEMBLY) \ + $(ASSEMBLY).config \ + $(DLLPOLICY) \ + policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config + assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) -- cgit v1.2.3 From 787b92013713b9294750e6a8d7e36b63bcfddba9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 14:45:16 -0500 Subject: Cleaning up file name definitions --- bindings/mono/Makefile.am | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 3bd29d4..2cd4486 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -11,14 +11,15 @@ RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp ASSEMBLY_VERSION = 0.1 -ASSEMBLY = appindicator-sharp.dll -DLLPOLICY = policy.$(ASSEMBLY_VERSION).$(ASSEMBLY) +ASSEMBLY = $(ASSEMBLY_NAME).dll +POLICY = policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME) +DLLPOLICY = $(POLICY).dll TARGET = \ $(ASSEMBLY) \ $(ASSEMBLY).config \ $(DLLPOLICY) \ - policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config + $(POLICY).config assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) @@ -33,7 +34,7 @@ CLEANFILES = \ $(RAW_API) \ $(TEST) \ $(DLLPOLICY) \ - policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config + $(POLICY).config DISTCLEANFILES = $(ASSEMBLY).config TEST_SOURCES = TestIndicator.cs @@ -46,7 +47,7 @@ EXTRA_DIST = \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ - policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config.in \ + $(POLICY).config.in \ $(customs) \ $(TEST_SOURCES) @@ -102,18 +103,18 @@ uninstall-local: echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) -u policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; + $(GACUTIL) -u $(POLICY) $(GACUTIL_FLAGS) || exit 1; $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) all: $(TEST) -policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config: policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config.in Makefile +$(POLICY).config: $(POLICY).config.in Makefile sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \ -e "s|@ASSEMBLY_VERSION@|$(ASSEMBLY_VERSION)|g" \ $< > $@ -$(DLLPOLICY): policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile - $(AL) -link:policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk +$(DLLPOLICY): $(POLICY).config $(ASSEMBLY_NAME).snk Makefile + $(AL) -link:$(POLICY).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -- cgit v1.2.3 From ac400f73c9e32fcba721e42ec0ef905954fa696f Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 21 Jun 2010 14:50:40 -0400 Subject: Use full assembly version for the policy file --- bindings/mono/Makefile.am | 5 +++-- bindings/mono/policy.0.0.appindicator-sharp.config.in | 10 ++++++++++ bindings/mono/policy.0.1.appindicator-sharp.config.in | 10 ---------- 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 bindings/mono/policy.0.0.appindicator-sharp.config.in delete mode 100644 bindings/mono/policy.0.1.appindicator-sharp.config.in diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 2cd4486..98fe6f9 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -10,9 +10,10 @@ MIDDLE_API = libappindicator-api.middle RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp -ASSEMBLY_VERSION = 0.1 +ASSEMBLY_VERSION = 0.1.0.0 ASSEMBLY = $(ASSEMBLY_NAME).dll -POLICY = policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME) +POLICY = policy.$(POLICY_VERSION).$(ASSEMBLY_NAME) +POLICY_VERSION = 0.0 DLLPOLICY = $(POLICY).dll TARGET = \ diff --git a/bindings/mono/policy.0.0.appindicator-sharp.config.in b/bindings/mono/policy.0.0.appindicator-sharp.config.in new file mode 100644 index 0000000..95c21ed --- /dev/null +++ b/bindings/mono/policy.0.0.appindicator-sharp.config.in @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/bindings/mono/policy.0.1.appindicator-sharp.config.in b/bindings/mono/policy.0.1.appindicator-sharp.config.in deleted file mode 100644 index dd9e6e9..0000000 --- a/bindings/mono/policy.0.1.appindicator-sharp.config.in +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - -- cgit v1.2.3 From 20f0c1d8e534fc1b1d0824baa2aa5464d2b0f998 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 21 Jun 2010 14:06:07 -0500 Subject: 0.2.1 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9396c5c..bd3c6a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.2.0, ted@canonical.com) +AC_INIT(indicator-application, 0.2.1, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.2.0) +AM_INIT_AUTOMAKE(indicator-application, 0.2.1) AM_MAINTAINER_MODE -- cgit v1.2.3