Merge lp:~bratsche/indicator-application/assemblyinfo into lp:indicator-application/0.4

Proposed by Cody Russell on 2010-04-14
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bratsche/indicator-application/assemblyinfo
Merge into: lp:indicator-application/0.4
Diff against target: 47 lines (+31/-1)
2 files modified
bindings/mono/AssemblyInfo.cs (+30/-0)
bindings/mono/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~bratsche/indicator-application/assemblyinfo
Reviewer Review Type Date Requested Status
Ted Gould (community) 2010-04-14 Approve on 2010-04-14
Review via email: mp+23407@code.launchpad.net
To post a comment you must log in.
Ted Gould (ted) wrote :

Is there a way that we can use $VERSION for the version in here?
Something like a -DVERSION="$VERSION" in the C world.

Cody Russell (bratsche) wrote :

Yeah, but I don't think we should. VERSION is set to 0.0.18 (or whatever), so every time there is a release the assembly version would get bumped. It should be tracking a more stable version I think, otherwise I think each time we bump the version all apps that are using it would need to rebuild.

Ted Gould (ted) wrote :

On Wed, 2010-04-14 at 16:24 +0000, Cody Russell wrote:
> Yeah, but I don't think we should. VERSION is set to 0.0.18 (or
> whatever), so every time there is a release the assembly version
> would get bumped. It should be tracking a more stable version I
> think, otherwise I think each time we bump the version all apps
> that are using it would need to rebuild.

Ah, okay. We should probably introduce something like APIVERSION or
something for the pkgconfig files as well.

  review approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'bindings/mono/AssemblyInfo.cs'
2--- bindings/mono/AssemblyInfo.cs 1970-01-01 00:00:00 +0000
3+++ bindings/mono/AssemblyInfo.cs 2010-04-14 16:10:52 +0000
4@@ -0,0 +1,30 @@
5+/*
6+ * Copyright 2010 Canonical Ltd.
7+ *
8+ * This program is free software: you can redistribute it and/or modify it
9+ * under the terms of the GNU General Public License version 3, as published
10+ * by the Free Software Foundation.
11+ *
12+ * This program is distributed in the hope that it will be useful, but
13+ * WITHOUT ANY WARRANTY; without even the implied warranties of
14+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
15+ * PURPOSE. See the GNU General Public License for more details.
16+ *
17+ * You should have received a copy of the GNU General Public License along
18+ * with this program. If not, see <http://www.gnu.org/licenses/>.
19+ *
20+ * Authors:
21+ * Cody Russell <cody.russell@canonical.com>
22+ */
23+
24+using System.Reflection;
25+
26+[assembly: AssemblyTitle ("Application Indicators")]
27+[assembly: AssemblyDescription ("Ubuntu Application Indicators")]
28+[assembly: AssemblyConfiguration ("")]
29+[assembly: AssemblyCompany ("Canonical, Ltd.")]
30+[assembly: AssemblyProduct ("Ubuntu")]
31+[assembly: AssemblyCopyright ("© 2010 Canonical, Ltd.")]
32+[assembly: AssemblyTrademark ("")]
33+[assembly: AssemblyCulture ("")]
34+[assembly: AssemblyVersion ("0.1")]
35
36=== modified file 'bindings/mono/Makefile.am'
37--- bindings/mono/Makefile.am 2010-01-12 06:08:34 +0000
38+++ bindings/mono/Makefile.am 2010-04-14 16:10:52 +0000
39@@ -76,7 +76,7 @@
40
41 $(ASSEMBLY): generated-stamp
42 @rm -f $(ASSEMBLY).mdb
43- $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES)
44+ $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs
45
46 install-data-local:
47 echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \

Subscribers

People subscribed via source and target branches