Midori Web Browser

Merge lp:~tuxator/midori/win-script into lp:midori

  1. win-script
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: gue5t gue5t
Approved revision: 6599
Merged at revision: 6607
Proposed branch: lp:~tuxator/midori/win-script
Merge into: lp:midori
Diff against target: 28 lines (+3/-2)
1 file modified
win32/makedist/win32-release (+3/-2)
To merge this branch: bzr merge lp:~tuxator/midori/win-script
Reviewer Review Type Date Requested Status
gue5t gue5t Approve
Review via email: mp+211041@code.launchpad.net

Commit message

Use EXTRA_WARNINGS option when building for windows

To post a comment you must log in.
Revision history for this message
RabbitBot (rabbitbot-a) wrote :

Voting does not meet specified criteria. Required: Approve >= 1. Got: 1 Pending.

Revision history for this message
gue5t gue5t (gue5t) wrote :

This isn't a regression, but here CONFIGURE_OPTIONS is expected to expand to multiple options while MINGW_PREFIX and SRCDIR are not. In the interest of robustness we should use double-quotes when expanding variables like those which should be interpreted as a single path even if they contain spaces.

Revision history for this message
gue5t gue5t (gue5t) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'win32/makedist/win32-release'
2--- win32/makedist/win32-release 2013-10-31 19:53:53 +0000
3+++ win32/makedist/win32-release 2014-03-14 12:28:21 +0000
4@@ -12,6 +12,7 @@
5
6 dropbox_dir=$HOME/Dropbox/Public
7 SRCDIR=$PWD
8+CONFIGURE_OPTIONS="-DUSE_ZEITGEIST=0 -DUSE_GTK3=1 -DCMAKE_VERBOSE_MAKEFILE=0 -DEXTRA_WARNINGS=1"
9
10 # 32-bit build
11 #mingw32-env
12@@ -20,7 +21,7 @@
13
14 rm -fr _mingw32
15 mkdir _mingw32 && cd _mingw32
16-mingw32-cmake -DUSE_ZEITGEIST=0 -DUSE_GTK3=1 -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX -DCMAKE_VERBOSE_MAKEFILE=0 $SRCDIR
17+mingw32-cmake -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX ${CONFIGURE_OPTIONS} $SRCDIR
18 make
19 sudo make install || exit
20
21@@ -46,7 +47,7 @@
22
23 rm -fr _mingw64
24 mkdir _mingw64 && cd _mingw64
25- mingw64-cmake -DUSE_ZEITGEIST=0 -DUSE_GTK3=1 -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX -DCMAKE_VERBOSE_MAKEFILE=0 $SRCDIR
26+ mingw64-cmake -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX ${CONFIGURE_OPTIONS} $SRCDIR
27 make
28 sudo make install || exit
29

Subscribers

People subscribed via source and target branches

to all changes: