walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Restructuring: updated win_installer scripts

This commit is contained in:
Daniel Marjamäki 2009-10-27 20:22:11 +01:00
parent 0e695ea527
commit f2106f96ad
7 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/cli.pro
View File

@ -17,7 +17,7 @@ HEADERS += cppcheckexecutor.cpp \
win32 { win32 {
CONFIG += embed_manifest_exe console CONFIG += embed_manifest_exe console
RC_FILE = cppcheck.rc RC_FILE = cppcheck.rc
HEADERS += resource.h HEADERS += ../lib/resource.h
LIBS += -lshlwapi LIBS += -lshlwapi
} }

0
lib/cppcheck.rc → cli/cppcheck.rc
View File

2
gui/gui.pro
View File

@ -67,7 +67,7 @@ SOURCES += main.cpp \
win32 { win32 {
RC_FILE = cppcheck-gui.rc RC_FILE = cppcheck-gui.rc
HEADERS += ../src/resource.h HEADERS += ../lib/resource.h
LIBS += -lshlwapi LIBS += -lshlwapi
} }

10
win_installer/build.proj
View File

@ -1,10 +0,0 @@
<Project
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
DefaultTargets="build">
<!-- build windows installers -->
<Target Name="build">
<Exec Command="build1.bat"/>
<Exec Command="build2.bat"/>
</Target>
</Project>

2
win_installer/build1.bat
View File

@ -8,9 +8,7 @@ set QMAKESPEC=win32-g++
cd .. cd ..
del gui\Makefile del gui\Makefile
del src\Makefile
del /Q gui\temp\* del /Q gui\temp\*
del /Q src\temp\*
del gui\release\gui.exe del gui\release\gui.exe
cd gui cd gui
qmake -config release qmake -config release

32
win_installer/build2.bat
View File

@ -1,24 +1,16 @@
del *.wixobj
del *.wixpdb set QTDIR=c:\Qt\2009.01\qt
del cppcheck.exe set PATH=c:\Qt\2009.01\qt\bin
del gui.exe set PATH=%PATH%;c:\Qt\2009.01\bin;c:\Qt\2009.01\mingw\bin
set PATH=%PATH%;%SystemRoot%\System32
set QMAKESPEC=win32-g++
cd .. cd ..
del /Q release\*
del cppcheck.exe
del cppcheck.map
del cppcheck.tds
msbuild cppcheck.cbproj /target:clean del cli\Makefile
msbuild cppcheck.cbproj /target:build /property:"config=release" del /Q cli\temp\*
del cli\release\gui.exe
copy cppcheck.exe win_installer cd cli
copy gui\release\gui.exe win_installer qmake -config release
make
cd win_installer
candle cppcheck.wxs
light -ext WixUIExtension cppcheck.wixobj
rename cppcheck.msi cppcheck-light.msi
candle gui.wxs
light -ext WixUIExtension gui.wixobj

12
win_installer/build3.bat Executable file
View File

@ -0,0 +1,12 @@
del *.wixobj
del *.wixpdb
del *.msi
del gui.exe
del cppcheck.exe
copy ..\gui\release\gui.exe .
copy ..\cli\release\cppcheck.exe .
candle gui.wxs
light -ext WixUIExtension gui.wixobj
move gui.msi cppcheck.msi