Merge lp:~hyperair/ewns-viewer/autotools into lp:ewns-viewer
- autotools
- Merge into trunk
Status: | Needs review |
---|---|
Proposed branch: | lp:~hyperair/ewns-viewer/autotools |
Merge into: | lp:ewns-viewer |
Diff against target: |
457 lines (+212/-148) 11 files modified
Makefile (+0/-96) Makefile.am (+112/-0) autogen.sh (+12/-0) config.vapi (+33/-0) configure.ac (+32/-0) ewns-viewer.desktop (+1/-3) install.sh (+0/-29) m4/expansions.m4 (+17/-0) parsers/Makefile (+0/-15) session_config.vala (+1/-1) utils_and_settings.vala (+4/-4) |
To merge this branch: | bzr merge lp:~hyperair/ewns-viewer/autotools |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Aleksandar Jovanov | Pending | ||
Review via email: mp+113899@code.launchpad.net |
Commit message
Description of the change
This branch replaces the Makefile present with an Autotools build system. This provides all of the Autotools features for free, including:-
- Install and run the program anywhere -- just configure with a different --prefix
- Install the program to a separate root (make install DESTDIR=/path), which makes packaging possible with make install.
- Easy cross-compilation (./configure --host=
However, it still does not compile as there appears to be a missing type called SplashScreen, introduced in revision 85. Perhaps you forgot to commit a file?
Chow Loong Jin (hyperair) wrote : | # |
On 10/07/2012 04:16, Aleksandar Jovanov wrote:
> I changed the build system completely today so you will need to change a lot
> of things. I am gracious that you made this build system. I have not seen
> your autotols files but there will be a need for a lot of changes because of
> the fact that parsers are now loaded from *.so files in
> ~/.config/
That shouldn't be an issue, really. Traditionally, the build system should not
touch $HOME, but only the configured installation prefix. Your method of
installation that installs half the things into $HOME, and the rest into a
global directory gets a little troublesome, because then other users on the same
system will not be able to access the files you installed into $HOME.
> Do you want to work more on ewns-viewer?
> I plan to submit this app to ubuntu software center for a price.
I know. I'm the one packaging it up on MyApps. :-)
> I am not very willing to share the money unless you do something really big.
> Hopefully you understand.
That's fine, I'm doing this on a whim.
> If you are still interested in helping me here is a short summary of things needed to get done :
> Localization support,
> Parsers test (many of them crash),
> Better UI for the ewns view (something like transmission's torrent view).
> That should be it.Have a nice day.
I can help regarding localization support, but that's about it.
--
Kind regards,
Loong Jin
Aleksandar Jovanov (ajovanov93) wrote : | # |
Actually only ewns-viewer.desktop is installed locally.
Everything else is copied during runtime.
Also I meant I am grateful not gracious (I wrote this late last night).
If you are interested you can work on localization then.
I will change the build system a bit more,so I will merge your commits later.
_______
From: Chow Loong Jin <email address hidden>
To: <email address hidden>
Sent: Monday, July 9, 2012 11:28 PM
Subject: Re: [Merge] lp:~hyperair/ewns-viewer/autotools into lp:ewns-viewer
On 10/07/2012 04:16, Aleksandar Jovanov wrote:
> I changed the build system completely today so you will need to change a lot
> of things. I am gracious that you made this build system. I have not seen
> your autotols files but there will be a need for a lot of changes because of
> the fact that parsers are now loaded from *.so files in
> ~/.config/
That shouldn't be an issue, really. Traditionally, the build system should not
touch $HOME, but only the configured installation prefix. Your method of
installation that installs half the things into $HOME, and the rest into a
global directory gets a little troublesome, because then other users on the same
system will not be able to access the files you installed into $HOME.
> Do you want to work more on ewns-viewer?
> I plan to submit this app to ubuntu software center for a price.
I know. I'm the one packaging it up on MyApps. :-)
> I am not very willing to share the money unless you do something really big.
> Hopefully you understand.
That's fine, I'm doing this on a whim.
> If you are still interested in helping me here is a short summary of things needed to get done :
> Localization support,
> Parsers test (many of them crash),
> Better UI for the ewns view (something like transmission's torrent view).
> That should be it.Have a nice day.
I can help regarding localization support, but that's about it.
--
Kind regards,
Loong Jin
https:/
You are requested to review the proposed merge of lp:~hyperair/ewns-viewer/autotools into lp:ewns-viewer.
- 90. By Chow Loong Jin
-
Merge from lp:ewns-viewer
- 91. By Chow Loong Jin
-
Update autotools build system
Aleksandar Jovanov (ajovanov93) wrote : | # |
Ok.I looked at the files.
Update everything to revision 100.
Then send me a message and I will accept this.
Thanks for helping.
Unmerged revisions
- 91. By Chow Loong Jin
-
Update autotools build system
- 90. By Chow Loong Jin
-
Merge from lp:ewns-viewer
- 89. By Chow Loong Jin
-
Autotoolize
- 88. By Chow Loong Jin
-
Drop executable permissions on desktop file
- 87. By Chow Loong Jin
-
Fix desktop-
file-validate complaints - Drop hashbang -- desktop files aren't supposed to be scripts.
- Add trailing ; to Categories
Preview Diff
1 | === removed file 'Makefile' |
2 | --- Makefile 2012-07-10 09:28:15 +0000 |
3 | +++ Makefile 1970-01-01 00:00:00 +0000 |
4 | @@ -1,96 +0,0 @@ |
5 | -# Ewns-viewer is a tool for programers helping them fix compile time errors quicker. |
6 | -# Copyright (C) 2012 Aleksandar Jovanov |
7 | - |
8 | -# This program is free software: you can redistribute it and/or modify |
9 | -# it under the terms of the GNU General Public License as published by |
10 | -# the Free Software Foundation, either version 3 of the License, or |
11 | -# (at your option) any later version. |
12 | - |
13 | -# This program is distributed in the hope that it will be useful, |
14 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | -# GNU General Public License for more details. |
17 | - |
18 | -# You should have received a copy of the GNU General Public License |
19 | -# along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | - |
21 | -# REMEMBER to add ewns_view.vala after this is released |
22 | - |
23 | -VALAC = valac-0.18 |
24 | -PKGS = --pkg gee-1.0 --pkg posix --pkg gtk+-3.0 --pkg gio-2.0 --pkg unity --pkg libnotify --pkg gmodule-2.0 |
25 | - |
26 | -SOURCES = ewns_viewer.vala utils_and_settings.vala \ |
27 | -widgets/debuging_extension.vala widgets/ewns_viewer_widget.vala \ |
28 | -widgets/session_widget.vala session_info.vala settings_window.vala \ |
29 | -application.vala session_config.vala parsers/java_script_parser.vala \ |
30 | -splash_screen.vala parser_loader.vala |
31 | - |
32 | -EXECUTABLE=ewns-viewer |
33 | - |
34 | -BUILD_PARSERS = false |
35 | - |
36 | -all: |
37 | - # vaskell |
38 | - valac --pkg gee-1.0 --library=vaskell --pkg gee-1.0 -H vaskell.h vaskell.vala -X -fPIC -X -shared -o libvaskell.so --gir vaskell-0.1.gir |
39 | - g-ir-compiler --shared-library=libvaskell.so --output=vaskell-0.1.typelib vaskell-0.1.gir |
40 | - cp vaskell.vapi vaskell.h parsers && clear |
41 | - |
42 | - # lib ewns viewer |
43 | - |
44 | - valac --pkg gee-1.0 --pkg gtk+-3.0 --library=lib_ewns_viewer --pkg gee-1.0 lib_ewns_viewer.vala -H lib_ewns_viewer.h -X -fPIC -X -shared -o libewnsviewer.so |
45 | - cp lib_ewns_viewer.vapi lib_ewns_viewer.h parsers && clear |
46 | - |
47 | - # ewns viewer executable |
48 | - |
49 | - $(VALAC) $(PKGS) vaskell.vapi lib_ewns_viewer.vapi --thread $(SOURCES) -X libvaskell.so -X libewnsviewer.so -X -I. -o $(EXECUTABLE) && clear |
50 | - |
51 | - # parsers |
52 | - |
53 | - cd parsers && make |
54 | -debug: |
55 | - $(VALAC) -g $(PKGS) vaskell.vapi lib_ewns_viewer.vapi --thread $(SOURCES) -X libvaskell.so -X libewnsviewer.so -X -I. -o $(EXECUTABLE) && clear |
56 | -install: |
57 | - # main |
58 | - sudo mkdir -p /opt/ewns-viewer |
59 | - sudo cp apps.ewns-viewer.gschema.xml /opt/ewns-viewer |
60 | - sudo glib-compile-schemas /opt/ewns-viewer |
61 | - |
62 | - sudo cp ewns-viewer /opt/ewns-viewer |
63 | - sudo cp ewns-viewer.desktop /opt/ewns-viewer |
64 | - cp ewns-viewer.desktop ~/.local/share/applications |
65 | - |
66 | - sudo cp ewns-viewer-logo.png /opt/ewns-viewer |
67 | - sudo cp run /opt/ewns-viewer |
68 | - |
69 | - # docs |
70 | - sudo mkdir -p /opt/ewns-viewer/doc |
71 | - sudo cp README /opt/ewns-viewer/doc |
72 | - sudo cp LICENSE /opt/ewns-viewer/doc |
73 | - sudo cp help.html /opt/ewns-viewer/doc |
74 | - |
75 | - # config |
76 | - sudo mkdir -p /opt/ewns-viewer/config |
77 | - sudo cp editors.cfg /opt/ewns-viewer/config |
78 | - sudo cp debuggers.cfg /opt/ewns-viewer/config |
79 | - sudo cp sessions.txt /opt/ewns-viewer/config |
80 | - sudo cp build_completions.txt /opt/ewns-viewer/config |
81 | - sudo cp search_providers.txt /opt/ewns-viewer/config |
82 | - sudo cp parsers.cfg /opt/ewns-viewer/config |
83 | - |
84 | - sudo cp theme.css /opt/ewns-viewer |
85 | - |
86 | - # libraries |
87 | - sudo cp libvaskell.so /opt/ewns-viewer |
88 | - sudo cp libewnsviewer.so /opt/ewns-viewer |
89 | - |
90 | - # parsers |
91 | - cd parsers && make install |
92 | -remove: |
93 | - sudo rm -f -R /opt/ewns-viewer |
94 | - rm -f -R ~/.config/ewns-viewer |
95 | - rm -f ~/.local/share/applications/ewns-viewer.desktop |
96 | -uninstall: remove |
97 | -deinstall: remove |
98 | -clean: |
99 | - rm -f $(EXECUTABLE) *.c *.h *.gir *.typelib *.so *.vapi |
100 | - cd parsers && make clean |
101 | \ No newline at end of file |
102 | |
103 | === added file 'Makefile.am' |
104 | --- Makefile.am 1970-01-01 00:00:00 +0000 |
105 | +++ Makefile.am 2012-07-10 12:24:30 +0000 |
106 | @@ -0,0 +1,112 @@ |
107 | +ACLOCAL_AMFLAGS = -Im4 |
108 | + |
109 | +# Common includes and flags |
110 | +AM_CFLAGS = $(EWNS_CFLAGS) -I$(top_srcdir) |
111 | +COMMONLIBS = $(EWNS_LIBS) |
112 | + |
113 | +AM_VALAFLAGS = \ |
114 | + --pkg gtk+-3.0 \ |
115 | + --pkg gee-1.0 \ |
116 | + --pkg posix \ |
117 | + --pkg gtk+-3.0 \ |
118 | + --pkg gio-2.0 \ |
119 | + --pkg unity \ |
120 | + --pkg libnotify \ |
121 | + --pkg gmodule-2.0 \ |
122 | + --vapidir=$(abs_srcdir) \ |
123 | + --pkg config |
124 | +AM_LDFLAGS = -avoid-version |
125 | + |
126 | +# Define libraries |
127 | +pkglib_LTLIBRARIES = libvaskell.la libewnsviewer.la |
128 | + |
129 | +# libvaskell.so |
130 | +libvaskell_la_SOURCES = vaskell.vala |
131 | +libvaskell_la_VALAFLAGS = \ |
132 | + $(AM_VALAFLAGS) \ |
133 | + --library vaskell \ |
134 | + -H vaskell.h |
135 | +libvaskell_la_LIBADD = $(COMMONLIBS) |
136 | +vaskell.vapi: vaskell.h |
137 | + |
138 | +# libewnsviewer.so |
139 | +libewnsviewer_la_SOURCES = lib_ewns_viewer.vala |
140 | +libewnsviewer_la_VALAFLAGS = \ |
141 | + $(AM_VALAFLAGS) \ |
142 | + --library lib_ewns_viewer \ |
143 | + -H lib_ewns_viewer.h |
144 | +libewnsviewer_la_LIBADD = $(COMMONLIBS) |
145 | +lib_ewns_viewer.vapi: lib_ewns_viewer.h |
146 | + |
147 | +# ewns-viewer executable |
148 | +bin_PROGRAMS = ewns-viewer |
149 | +ewns_viewer_SOURCES = ewns_viewer.vala utils_and_settings.vala \ |
150 | +widgets/debuging_extension.vala widgets/ewns_viewer_widget.vala \ |
151 | +widgets/session_widget.vala session_info.vala settings_window.vala \ |
152 | +application.vala session_config.vala splash_screen.vala parser_loader.vala \ |
153 | +lib_ewns_viewer.vapi vaskell.vapi |
154 | +ewns_viewer_LDADD = $(COMMONLIBS) libvaskell.la libewnsviewer.la |
155 | + |
156 | +# Parsers |
157 | +parsersdir = $(pkglibdir)/parsers |
158 | + |
159 | +parsers_LTLIBRARIES = \ |
160 | + libvala_parser.la \ |
161 | + libcpp_parser.la \ |
162 | + libcsharp_parser.la \ |
163 | + libd_parser.la \ |
164 | + libgo_parser.la \ |
165 | + libhaskell_parser.la \ |
166 | + libjava_parser.la \ |
167 | + libjava_script_parser.la \ |
168 | + libgenie_parser.la |
169 | + |
170 | +libvala_parser_la_SOURCES = parsers/vala_parser.vala vaskell.vapi lib_ewns_viewer.vapi |
171 | +libcpp_parser_la_SOURCES = parsers/cpp_parser.vala vaskell.vapi lib_ewns_viewer.vapi |
172 | +libcsharp_parser_la_SOURCES = parsers/csharp_parser.vala vaskell.vapi lib_ewns_viewer.vapi |
173 | +libd_parser_la_SOURCES = parsers/d_parser.vala vaskell.vapi lib_ewns_viewer.vapi |
174 | +libgo_parser_la_SOURCES = parsers/go_parser.vala vaskell.vapi lib_ewns_viewer.vapi |
175 | +libhaskell_parser_la_SOURCES = parsers/haskell_parser.vala vaskell.vapi lib_ewns_viewer.vapi |
176 | +libjava_parser_la_SOURCES = parsers/java_parser.vala vaskell.vapi lib_ewns_viewer.vapi |
177 | +libjava_script_parser_la_SOURCES = parsers/java_script_parser.vala vaskell.vapi lib_ewns_viewer.vapi |
178 | +libgenie_parser_la_SOURCES = parsers/genie_parser.vala vaskell.vapi lib_ewns_viewer.vapi |
179 | + |
180 | +libvala_parser_la_LIBADD = $(COMMONLIBS) libvaskell.la libewnsviewer.la |
181 | +libcpp_parser_la_LIBADD = $(COMMONLIBS) libvaskell.la libewnsviewer.la |
182 | +libcsharp_parser_la_LIBADD = $(COMMONLIBS) libvaskell.la libewnsviewer.la |
183 | +libd_parser_la_LIBADD = $(COMMONLIBS) libvaskell.la libewnsviewer.la |
184 | +libgo_parser_la_LIBADD = $(COMMONLIBS) libvaskell.la libewnsviewer.la |
185 | +libhaskell_parser_la_LIBADD = $(COMMONLIBS) libvaskell.la libewnsviewer.la |
186 | +libjava_parser_la_LIBADD = $(COMMONLIBS) libvaskell.la libewnsviewer.la |
187 | +libjava_script_parser_la_LIBADD = $(COMMONLIBS) libvaskell.la libewnsviewer.la |
188 | +libgenie_parser_la_LIBADD = $(COMMONLIBS) libvaskell.la libewnsviewer.la |
189 | + |
190 | +# Install config files |
191 | +configdir = $(pkgdatadir)/config |
192 | +dist_config_DATA = \ |
193 | + editors.cfg \ |
194 | + debuggers.cfg \ |
195 | + sessions.txt \ |
196 | + build_completions.txt \ |
197 | + search_providers.txt |
198 | + |
199 | +# Install desktop file |
200 | +desktopdir = $(datadir)/applications |
201 | +dist_desktop_DATA = ewns-viewer.desktop |
202 | + |
203 | +# Install doc files |
204 | +dist_pkgdoc_DATA = \ |
205 | + README \ |
206 | + LICENSE \ |
207 | + help.html |
208 | + |
209 | +# Install gsettings schemas |
210 | +@GSETTINGS_RULES@ |
211 | +gsettings_SCHEMAS = apps.ewns-viewer.gschema.xml |
212 | + |
213 | +# Install icon |
214 | +pixmapsdir = $(datadir)/pixmaps |
215 | +dist_pixmaps_DATA = ewns-viewer-logo.png |
216 | + |
217 | +# Distribute config.vapi |
218 | +EXTRA_DIST = config.vapi |
219 | |
220 | === added file 'autogen.sh' |
221 | --- autogen.sh 1970-01-01 00:00:00 +0000 |
222 | +++ autogen.sh 2012-07-10 12:24:30 +0000 |
223 | @@ -0,0 +1,12 @@ |
224 | +#!/bin/sh |
225 | + |
226 | +set -e |
227 | + |
228 | +builddir="$(pwd)" |
229 | +srcdir="$(dirname "$0")" |
230 | + |
231 | +cd "$srcdir" |
232 | +autoreconf -vfi |
233 | + |
234 | +cd "$builddir" |
235 | +[ -z "$NOCONFIGURE" ] && exec "$srcdir"/configure "$@" |
236 | |
237 | === added file 'config.vapi' |
238 | --- config.vapi 1970-01-01 00:00:00 +0000 |
239 | +++ config.vapi 2012-07-10 12:24:30 +0000 |
240 | @@ -0,0 +1,33 @@ |
241 | +[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")] |
242 | +namespace Config { |
243 | + /* Location of default config files */ |
244 | + public const string CONFIGDIR; |
245 | + |
246 | + /* Name of package */ |
247 | + public const string PACKAGE; |
248 | + |
249 | + /* Define to the address where bug reports for this package should be |
250 | + * sent. */ |
251 | + public const string PACKAGE_BUGREPORT; |
252 | + |
253 | + /* Define to the full name of this package. */ |
254 | + public const string PACKAGE_NAME; |
255 | + |
256 | + /* Define to the full name and version of this package. */ |
257 | + public const string PACKAGE_STRING; |
258 | + |
259 | + /* Define to the one symbol short name of this package. */ |
260 | + public const string PACKAGE_TARNAME; |
261 | + |
262 | + /* Define to the home page for this package. */ |
263 | + public const string PACKAGE_URL; |
264 | + |
265 | + /* Define to the version of this package. */ |
266 | + public const string PACKAGE_VERSION; |
267 | + |
268 | + /* Location of documentation files */ |
269 | + public const string PKGDOCDIR; |
270 | + |
271 | + /* Version number of package */ |
272 | + public const string VERSION; |
273 | +} |
274 | |
275 | === added file 'configure.ac' |
276 | --- configure.ac 1970-01-01 00:00:00 +0000 |
277 | +++ configure.ac 2012-07-10 12:24:30 +0000 |
278 | @@ -0,0 +1,32 @@ |
279 | +# -*- Autoconf -*- |
280 | +# Process this file with autoconf to produce a configure script. |
281 | + |
282 | +AC_PREREQ([2.68]) |
283 | +AC_INIT([ewns-viewer], [1.0], [https://bugs.launchpad.net/ewns-viewer]) |
284 | +AC_CONFIG_MACRO_DIR([m4]) |
285 | +AM_INIT_AUTOMAKE([foreign -Wall]) |
286 | +LT_INIT |
287 | + |
288 | +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
289 | + |
290 | +AC_CONFIG_HEADER([config.h]) |
291 | + |
292 | +AM_PROG_VALAC([0.16]) |
293 | +AC_PROG_CC |
294 | +AM_PROG_CC_C_O |
295 | +PKG_CHECK_MODULES(EWNS, [gee-1.0 gtk+-3.0 gio-2.0 unity libnotify gmodule-2.0]) |
296 | + |
297 | +configdir='${datadir}/${PACKAGE}/config' |
298 | +EXPAND_VARIABLE([configdir]) |
299 | +AC_SUBST([configdir]) |
300 | +AC_DEFINE_UNQUOTED([CONFIGDIR], ["$expanded_configdir"], [Location of default config files]) |
301 | + |
302 | +pkgdocdir='${docdir}/${PACKAGE}' |
303 | +EXPAND_VARIABLE([pkgdocdir]) |
304 | +AC_SUBST([pkgdocdir]) |
305 | +AC_DEFINE_UNQUOTED([PKGDOCDIR], ["$expanded_pkgdocdir"], [Location of documentation files]) |
306 | + |
307 | +GLIB_GSETTINGS |
308 | + |
309 | +AC_CONFIG_FILES([Makefile]) |
310 | +AC_OUTPUT |
311 | |
312 | === modified file 'ewns-viewer.desktop' (properties changed: +x to -x) |
313 | --- ewns-viewer.desktop 2012-07-06 14:35:14 +0000 |
314 | +++ ewns-viewer.desktop 2012-07-10 12:24:30 +0000 |
315 | @@ -1,5 +1,3 @@ |
316 | -#!/usr/bin/env xdg-open |
317 | - |
318 | # Ewns-viewer is a tool for programers helping them fix compile time errors quicker. |
319 | # Copyright (C) 2012 Aleksandar Jovanov |
320 | |
321 | @@ -25,4 +23,4 @@ |
322 | StartupNotify=true |
323 | Comment=Tool used to help programmers with building their apps. |
324 | Name=Errors, warnings and notes viewer |
325 | -Categories=Development;Building;Utility |
326 | \ No newline at end of file |
327 | +Categories=Development;Building;Utility; |
328 | |
329 | === removed file 'install.sh' |
330 | --- install.sh 2012-07-06 12:49:21 +0000 |
331 | +++ install.sh 1970-01-01 00:00:00 +0000 |
332 | @@ -1,29 +0,0 @@ |
333 | -# main |
334 | -sudo mkdir -p /opt/ewns-viewer |
335 | -sudo cp apps.ewns-viewer.gschema.xml /opt/ewns-viewer |
336 | -sudo glib-compile-schemas /opt/ewns-viewer |
337 | - |
338 | -sudo cp ewns-viewer /opt/ewns-viewer |
339 | -sudo cp ewns-viewer.desktop /opt/ewns-viewer |
340 | -cp ewns-viewer.desktop ~/.local/share/applications |
341 | - |
342 | -mkdir -p ~/.local/share/glib-2.0/schemas |
343 | -cp apps.ewns-viewer.gschema.xml ~/.local/share/glib-2.0/schemas |
344 | -glib-compile-schemas ~/.local/share/glib-2.0/schemas |
345 | - |
346 | -sudo cp ewns-viewer-logo.png /opt/ewns-viewer |
347 | -sudo cp run /opt/ewns-viewer |
348 | - |
349 | -# docs |
350 | -sudo mkdir -p /opt/ewns-viewer/doc |
351 | -sudo cp README /opt/ewns-viewer/doc |
352 | -sudo cp LICENSE /opt/ewns-viewer/doc |
353 | -sudo cp help.html /opt/ewns-viewer/doc |
354 | - |
355 | -# config |
356 | -sudo mkdir -p /opt/ewns-viewer/config |
357 | -sudo cp editors.cfg /opt/ewns-viewer/config |
358 | -sudo cp debuggers.cfg /opt/ewns-viewer/config |
359 | -sudo cp sessions.txt /opt/ewns-viewer/config |
360 | -sudo cp build_completions.txt /opt/ewns-viewer/config |
361 | -sudo cp search_providers.txt /opt/ewns-viewer/config |
362 | \ No newline at end of file |
363 | |
364 | === added directory 'm4' |
365 | === added file 'm4/expansions.m4' |
366 | --- m4/expansions.m4 1970-01-01 00:00:00 +0000 |
367 | +++ m4/expansions.m4 2012-07-10 12:24:30 +0000 |
368 | @@ -0,0 +1,17 @@ |
369 | +AC_DEFUN([EXPAND_VARIABLE], |
370 | +[ |
371 | + if test "$prefix" = NONE; then |
372 | + prefix="$ac_default_prefix" |
373 | + fi |
374 | + if test "$exec_prefix" = NONE; then |
375 | + exec_prefix="$prefix" |
376 | + fi |
377 | + |
378 | + expanded_$1="${$1}" |
379 | + while test "$prev_expanded_$1" != "$expanded_$1"; do |
380 | + prev_expanded_$1="$expanded_$1" |
381 | + expanded_$1=`(eval echo $expanded_$1)` |
382 | + done |
383 | + |
384 | + AC_SUBST(expanded_$1) |
385 | +]) |
386 | |
387 | === removed file 'parsers/Makefile' |
388 | --- parsers/Makefile 2012-07-10 08:52:00 +0000 |
389 | +++ parsers/Makefile 1970-01-01 00:00:00 +0000 |
390 | @@ -1,15 +0,0 @@ |
391 | -PKG_CONFIG := `pkg-config --cflags --libs gee-1.0 glib-2.0 gmodule-2.0 gtk+-3.0` |
392 | -FILES = vala_parser cpp_parser csharp_parser d_parser go_parser haskell_parser java_parser java_script_parser genie_parser |
393 | - |
394 | -all: |
395 | - for file in $(FILES) ; do \ |
396 | - valac vaskell.vapi --pkg gtk+-3.0 --pkg gee-1.0 lib_ewns_viewer.vapi --pkg gmodule-2.0 -C $$file.vala; \ |
397 | - gcc -shared -fPIC $(PKG_CONFIG) -o lib$$file.so $$file.c; \ |
398 | - done |
399 | -install: |
400 | - sudo mkdir -p /opt/ewns-viewer/parsers |
401 | - for file in $(FILES) ; do \ |
402 | - sudo cp lib$$file.so /opt/ewns-viewer/parsers; \ |
403 | - done |
404 | -clean: |
405 | - rm -f *.c *.h *.vapi *.so |
406 | \ No newline at end of file |
407 | |
408 | === modified file 'session_config.vala' |
409 | --- session_config.vala 2012-07-09 19:30:12 +0000 |
410 | +++ session_config.vala 2012-07-10 12:24:30 +0000 |
411 | @@ -25,7 +25,7 @@ |
412 | string load_config_file(string name) |
413 | { |
414 | var local_path = Environment.get_variable("HOME") + "/.config/ewns-viewer/" + name; |
415 | - var global_path = "/opt/ewns-viewer/config/" + name; |
416 | + var global_path = Path.build_filename(Config.CONFIGDIR, name); |
417 | bool copy = true; |
418 | |
419 | if(FileUtils.test(local_path,FileTest.EXISTS)) |
420 | |
421 | === modified file 'utils_and_settings.vala' |
422 | --- utils_and_settings.vala 2012-07-10 09:28:15 +0000 |
423 | +++ utils_and_settings.vala 2012-07-10 12:24:30 +0000 |
424 | @@ -42,7 +42,7 @@ |
425 | Unity.LauncherEntry _icon; |
426 | |
427 | const string WEB_SITE = "https://launchpad.net/ewns-viewer"; |
428 | -const string VERSION_STRING = "1.0"; |
429 | +const string VERSION_STRING = Config.PACKAGE_VERSION; |
430 | |
431 | string EDITOR_EXECUTABLE; |
432 | |
433 | @@ -238,7 +238,7 @@ |
434 | if(SHOW_NOTIFICATIONS == false) |
435 | return; |
436 | |
437 | - var notification = new Notify.Notification(title,body,"/opt/ewns-viewer/ewns-viewer-logo.png"); |
438 | + var notification = new Notify.Notification(title,body,"ewns-viewer-logo"); |
439 | |
440 | notification.show(); |
441 | } |
442 | @@ -276,7 +276,7 @@ |
443 | if(video) |
444 | Process.spawn_command_line_async("xdg-open https://vimeo.com/45350691"); |
445 | else |
446 | - Process.spawn_command_line_async("xdg-open /opt/ewns-viewer/doc/help.html"); |
447 | + Process.spawn_command_line_async("xdg-open " + Path.build_filename(Config.PKGDOCDIR,"help.html")); |
448 | } |
449 | |
450 | string read_line(Posix.FILE? stream) |
451 | @@ -374,4 +374,4 @@ |
452 | string convert_color_field(double d) |
453 | { |
454 | return ((int)(d * 255)).to_string(); |
455 | -} |
456 | \ No newline at end of file |
457 | +} |
I changed the build system completely today so you will need to change a lot of things. ewns-viewer/ parsers (and are compiled separately of course).
I am gracious that you made this build system.
I have not seen your autotols files but there will be a need for a lot of changes because of the fact that parsers are now loaded from *.so files in ~/.config/
Do you want to work more on ewns-viewer?
I plan to submit this app to ubuntu software center for a price.
I am not very willing to share the money unless you do something really big.
Hopefully you understand.
If you are still interested in helping me here is a short summary of things needed to get done :
Localization support,
Parsers test (many of them crash),
Better UI for the ewns view (something like transmission's torrent view).
That should be it.Have a nice day.
_______ _______ _______ _______ ____
From: Chow Loong Jin <email address hidden>
To: <email address hidden>
Sent: Monday, July 9, 2012 7:40 AM
Subject: [Merge] lp:~hyperair/ewns-viewer/autotools into lp:ewns-viewer
Chow Loong Jin has proposed merging lp:~hyperair/ewns-viewer/autotools into lp:ewns-viewer.
Requested reviews:
Aleksandar Jovanov (ajovanov93)
For more details, see: /code.launchpad .net/~hyperair/ ewns-viewer/ autotools/ +merge/ 113899
https:/
This branch replaces the Makefile present with an Autotools build system. This provides all of the Autotools features for free, including:- $arch_triplet)
- Install and run the program anywhere -- just configure with a different --prefix
- Install the program to a separate root (make install DESTDIR=/path), which makes packaging possible with make install.
- Easy cross-compilation (./configure --host=
However, it still does not compile as there appears to be a missing type called SplashScreen, introduced in revision 85. Perhaps you forgot to commit a file? /code.launchpad .net/~hyperair/ ewns-viewer/ autotools/ +merge/ 113899
--
https:/
You are requested to review the proposed merge of lp:~hyperair/ewns-viewer/autotools into lp:ewns-viewer.