Skip to content

Commit

Permalink
HAVE_RULES support for build.bat
Browse files Browse the repository at this point in the history
Let the user's setting of the HAVE_RULES environment variable
affect build.bat's calls to qmake.
  • Loading branch information
rpavlik committed Aug 18, 2011
1 parent 4373f0a commit ef0ca2b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
3 changes: 1 addition & 2 deletions build-pcre.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ If you're using qmake to generate makefiles, the following behavior applies:
by passing HAVE_RULES=yes to qmake.

- Note: This includes using build.bat since it calls qmake - to use PCRE and
build.bat, you need to edit build.bat to add HAVE_RULES=yes to the
qmake call.
build.bat, you need to run set HAVE_RULES=yes before each run of build.bat


Some temporary build instructions. This is work in progress.
Expand Down
9 changes: 6 additions & 3 deletions build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ REM where <target> is any of cppcheck/gui/tests/all
REM release or debug is the configuration
REM all-target builds both cppcheck and gui.
REM
REM Run the command before build.bat to enable rules using pcre:
REM set HAVE_RULES=yes
REM
REM TODO:
REM - run tests too

Expand All @@ -31,23 +34,23 @@ goto help

:cppcheck
cd cli
qmake -config %TARGET%
qmake -config %TARGET% HAVE_RULES=%HAVE_RULES%
%MAKE%
cd ..
if "%1" == "all" goto gui
goto end

:gui
cd gui
qmake -config %TARGET%
qmake -config %TARGET% HAVE_RULES=%HAVE_RULES%
%MAKE%
lrelease gui.pro
cd ..
goto end

:tests
cd test
qmake -config %TARGET%
qmake -config %TARGET% HAVE_RULES=%HAVE_RULES%
%MAKE%
cd ..
goto end
Expand Down

0 comments on commit ef0ca2b

Please sign in to comment.