Merge lp:~kalikiana/midori/dontrun into lp:midori

Proposed by Cris Dywan
Status: Merged
Approved by: André Stösel
Approved revision: 6182
Merged at revision: 6182
Proposed branch: lp:~kalikiana/midori/dontrun
Merge into: lp:midori
Diff against target: 44 lines (+0/-37)
1 file modified
wscript (+0/-37)
To merge this branch: bzr merge lp:~kalikiana/midori/dontrun
Reviewer Review Type Date Requested Status
André Stösel Approve
Review via email: mp+166486@code.launchpad.net

Commit message

Remove the rather unnecessary ./waf --run feature

Description of the change

Remove the rather unnecessary ./waf --run feature

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Because it exists people tend to think it's necessary when in fact it is perfectly fine to simply run the binary executable from the build folder as _build/default/midori/midori and it just works.

The only use case it does allow that's not otherwise given is locally testing translations - which none of the translators actually use to my knowledge.

Revision history for this message
André Stösel (ivaldi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'wscript'
2--- wscript 2013-05-22 20:17:41 +0000
3+++ wscript 2013-05-30 11:46:24 +0000
4@@ -713,40 +713,3 @@
5 Utils.pprint ('RED', "Failed to generate po template.")
6 Utils.pprint ('RED', "Make sure intltool is installed.")
7 os.chdir ('..')
8- elif Options.options.run:
9- folder = os.path.abspath (blddir + '/default')
10- try:
11- relfolder = folder
12- if not is_mingw (Build.bld.env):
13- relfolder = os.path.relpath (folder)
14- except:
15- pass
16- try:
17- nls = 'MIDORI_NLSPATH=' + relfolder + os.sep + 'po'
18- lang = os.environ['LANG']
19- try:
20- for lang in os.listdir (folder + os.sep + 'po'):
21- if lang[3:] == 'mo':
22- lang = lang[:-3]
23- else:
24- continue
25- Utils.check_dir (folder + os.sep + 'po' + os.sep + lang)
26- Utils.check_dir (folder + os.sep + 'po' + os.sep + lang + \
27- os.sep + 'LC_MESSAGES')
28- os.symlink (folder + os.sep + 'po' + os.sep + lang + '.mo',
29- folder + os.sep + 'po' + os.sep + lang + os.sep + \
30- 'LC_MESSAGES' + os.sep + APPNAME + '.mo')
31- except:
32- pass
33- command = nls + ' '
34- if is_mingw (Build.bld.env):
35- # This works only if everything is installed to that prefix
36- os.chdir (Build.bld.env['PREFIX'] + os.sep + 'bin')
37- command += ' wine cmd /k "PATH=%PATH%;' + Build.bld.env['PREFIX'] + os.sep + 'bin' + ' && ' + APPNAME + '.exe"'
38- else:
39- command += ' ' + relfolder + os.sep + APPNAME + os.sep + APPNAME
40- print (command)
41- Utils.exec_command (command)
42- except Exception:
43- msg = sys.exc_info()[1] # Python 2/3 compatibility
44- Utils.pprint ('RED', "Failed to run application: " + str (msg))

Subscribers

People subscribed via source and target branches

to all changes: