aboutsummaryrefslogtreecommitdiff
path: root/bindings
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-06-18 14:16:21 -0500
committerTed Gould <ted@gould.cx>2010-06-18 14:16:21 -0500
commit64a712f53a2395d216763bb85d89647e993a3c2d (patch)
tree07bc21974faac41713ed5820f4687cf6579c88d7 /bindings
parentc012b2a943a86ab70b961a69672c61f4ac6ef3e1 (diff)
downloadayatana-indicator-application-64a712f53a2395d216763bb85d89647e993a3c2d.tar.gz
ayatana-indicator-application-64a712f53a2395d216763bb85d89647e993a3c2d.tar.bz2
ayatana-indicator-application-64a712f53a2395d216763bb85d89647e993a3c2d.zip
Swithcing the version to be the assembly version.
Diffstat (limited to 'bindings')
-rw-r--r--bindings/mono/Makefile.am17
-rw-r--r--bindings/mono/policy.0.1.appindicator-sharp.config.in (renamed from bindings/mono/policy.2.0.appindicator-sharp.config.in)0
2 files changed, 9 insertions, 8 deletions
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.2.0.appindicator-sharp.config.in b/bindings/mono/policy.0.1.appindicator-sharp.config.in
index dd9e6e9..dd9e6e9 100644
--- a/bindings/mono/policy.2.0.appindicator-sharp.config.in
+++ b/bindings/mono/policy.0.1.appindicator-sharp.config.in