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
=== modified file 'wscript'
--- wscript 2013-05-22 20:17:41 +0000
+++ wscript 2013-05-30 11:46:24 +0000
@@ -713,40 +713,3 @@
713 Utils.pprint ('RED', "Failed to generate po template.")713 Utils.pprint ('RED', "Failed to generate po template.")
714 Utils.pprint ('RED', "Make sure intltool is installed.")714 Utils.pprint ('RED', "Make sure intltool is installed.")
715 os.chdir ('..')715 os.chdir ('..')
716 elif Options.options.run:
717 folder = os.path.abspath (blddir + '/default')
718 try:
719 relfolder = folder
720 if not is_mingw (Build.bld.env):
721 relfolder = os.path.relpath (folder)
722 except:
723 pass
724 try:
725 nls = 'MIDORI_NLSPATH=' + relfolder + os.sep + 'po'
726 lang = os.environ['LANG']
727 try:
728 for lang in os.listdir (folder + os.sep + 'po'):
729 if lang[3:] == 'mo':
730 lang = lang[:-3]
731 else:
732 continue
733 Utils.check_dir (folder + os.sep + 'po' + os.sep + lang)
734 Utils.check_dir (folder + os.sep + 'po' + os.sep + lang + \
735 os.sep + 'LC_MESSAGES')
736 os.symlink (folder + os.sep + 'po' + os.sep + lang + '.mo',
737 folder + os.sep + 'po' + os.sep + lang + os.sep + \
738 'LC_MESSAGES' + os.sep + APPNAME + '.mo')
739 except:
740 pass
741 command = nls + ' '
742 if is_mingw (Build.bld.env):
743 # This works only if everything is installed to that prefix
744 os.chdir (Build.bld.env['PREFIX'] + os.sep + 'bin')
745 command += ' wine cmd /k "PATH=%PATH%;' + Build.bld.env['PREFIX'] + os.sep + 'bin' + ' && ' + APPNAME + '.exe"'
746 else:
747 command += ' ' + relfolder + os.sep + APPNAME + os.sep + APPNAME
748 print (command)
749 Utils.exec_command (command)
750 except Exception:
751 msg = sys.exc_info()[1] # Python 2/3 compatibility
752 Utils.pprint ('RED', "Failed to run application: " + str (msg))

Subscribers

People subscribed via source and target branches

to all changes: