Quickly

Merge lp:~serapophis/quickly/Fixes into lp:~shanepatrickfagan/quickly/Quickly-vala

  1. Fixes
  2. Merge into Quickly-vala
Proposed by Harald Wartig
Status: Merged
Merged at revision: 30
Proposed branch: lp:~serapophis/quickly/Fixes
Merge into: lp:~shanepatrickfagan/quickly/Quickly-vala
Diff against target: 78 lines (+14/-25)
4 files modified
design (+1/-1)
edit (+3/-3)
edit_run (+0/-19)
project_root/.run (+10/-2)
To merge this branch: bzr merge lp:~serapophis/quickly/Fixes

Commit message

 * edit and design don't block terminal
 * removed edit_run and modified edit to open .run file

Description of the change

 * edit and design don't block terminal
 * removed edit_run and modified edit to open .run file

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'design'
2--- design 2010-09-28 09:29:47 +0000
3+++ design 2010-09-29 17:55:54 +0000
4@@ -16,4 +16,4 @@
5 [[ $# -ne 0 ]] && usage
6
7 cd data/ui
8-glade *.ui
9+glade *.ui &
10
11=== modified file 'edit'
12--- edit 2010-09-28 09:29:47 +0000
13+++ edit 2010-09-29 17:55:54 +0000
14@@ -5,8 +5,8 @@
15 Usage:
16 quickly `basename $0`
17
18-A convenience command to open all of your vala files in your project
19-directory in your default editor, ready for editing.
20+A convenience command to open all of your vala files in your project
21+directory and the .run file in your default editor, ready for editing.
22
23 If you put yourself VISUAL or EDITOR environment variable, this latter will
24 be used.
25@@ -29,4 +29,4 @@
26 then
27 EDITOR="gedit"
28 fi
29-eval $EDITOR bin/*.vala
30+$EDITOR bin/*.vala .run &
31
32=== removed file 'edit_run'
33--- edit_run 2010-09-28 09:29:47 +0000
34+++ edit_run 1970-01-01 00:00:00 +0000
35@@ -1,19 +0,0 @@
36-#!/bin/bash
37-
38-usage(){
39- cat<<EOUSAGE
40-Usage:
41- quickly `basename $0`
42-
43-Opens your default text editor for the .run script. This script is uset to
44-build and run your application. In most cases you only want to edit it when
45-you have to change the build process. When you add a new source file or
46-pkg dependency for example.
47-EOUSAGE
48- exit 0
49-}
50-
51-# invoke usage
52-# call usage() function if any argument was supplied
53-[[ $# -ne 0 ]] && usage
54-xdg-open .run
55
56=== modified file 'project_root/.run'
57--- project_root/.run 2010-09-28 10:06:42 +0000
58+++ project_root/.run 2010-09-29 17:55:54 +0000
59@@ -1,9 +1,17 @@
60-#!/bin/sh
61+#!/bin/bash
62+# This script is uset to build and run your application. In most cases you
63+# only want to edit it when you have to change the build process. When you
64+# add a new source file or pkg dependency for example.
65+
66 cd bin
67 # Get the name of the project. We use that as name for the binary.
68 PRJNAME=$(basename $(dirname $PWD))
69
70+# remove old binary
71+[[ -e $PRJNAME ]] && rm $PRJNAME
72+
73 #feel free to change the next line to add bindings you are using and other classes you want to compile
74 valac -o $PRJNAME --pkg gtk+-2.0 --pkg gmodule-2.0 *.vala
75+
76 #dont change below here if you want it to run
77-./$PRJNAME $@
78+[[ -e $PRJNAME ]] && ./$PRJNAME $@

Subscribers

People subscribed via source and target branches

to all changes: