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

Installer: Fix translations files dir. 

Translation files are build to gui source directory not gui build
directory.

Also remove non-existing French translation file from installer.
This commit is contained in:
Kimmo Varis 2010-09-05 14:15:24 +03:00
parent b40dc99bc2
commit c02d1bdce4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
win_installer/config.wxi
View File

@ -6,6 +6,7 @@
<?define CliBuildDir = "..\Build\release" ?> <?define CliBuildDir = "..\Build\release" ?>
<?define GuiBuildDir = "..\Build\gui" ?> <?define GuiBuildDir = "..\Build\gui" ?>
<?define TranslationsDir = "..\gui" ?>
<?define HelpDir = "..\gui\help" ?> <?define HelpDir = "..\gui\help" ?>
<?define QtDllDir = "..\..\runtimes" ?> <?define QtDllDir = "..\..\runtimes" ?>
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86.msm" ?> <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86.msm" ?>

15
win_installer/cppcheck.wxs
View File

@ -34,14 +34,13 @@
<File Id='qtxml4dll' Name='qtxml4.dll' Source='$(var.QtDllDir)\qtxml4.dll' /> <File Id='qtxml4dll' Name='qtxml4.dll' Source='$(var.QtDllDir)\qtxml4.dll' />
</Component> </Component>
<Component Id='GuiTranslations' Guid='$(var.guiTranslationsGUID)'> <Component Id='GuiTranslations' Guid='$(var.guiTranslationsGUID)'>
<File Id='cppcheck_de.qm' Name='cppcheck_de.qm' Source='$(var.GuiBuildDir)\cppcheck_de.qm' /> <File Id='cppcheck_de.qm' Name='cppcheck_de.qm' Source='$(var.TranslationsDir)\cppcheck_de.qm' />
<File Id='cppcheck_en.qm' Name='cppcheck_en.qm' Source='$(var.GuiBuildDir)\cppcheck_en.qm' /> <File Id='cppcheck_en.qm' Name='cppcheck_en.qm' Source='$(var.TranslationsDir)\cppcheck_en.qm' />
<File Id='cppcheck_fi.qm' Name='cppcheck_fi.qm' Source='$(var.GuiBuildDir)\cppcheck_fi.qm' /> <File Id='cppcheck_fi.qm' Name='cppcheck_fi.qm' Source='$(var.TranslationsDir)\cppcheck_fi.qm' />
<File Id='cppcheck_fr.qm' Name='cppcheck_fr.qm' Source='$(var.GuiBuildDir)\cppcheck_fr.qm' /> <File Id='cppcheck_nl.qm' Name='cppcheck_nl.qm' Source='$(var.TranslationsDir)\cppcheck_nl.qm' />
<File Id='cppcheck_nl.qm' Name='cppcheck_nl.qm' Source='$(var.GuiBuildDir)\cppcheck_nl.qm' /> <File Id='cppcheck_pl.qm' Name='cppcheck_pl.qm' Source='$(var.TranslationsDir)\cppcheck_pl.qm' />
<File Id='cppcheck_pl.qm' Name='cppcheck_pl.qm' Source='$(var.GuiBuildDir)\cppcheck_pl.qm' /> <File Id='cppcheck_ru.qm' Name='cppcheck_ru.qm' Source='$(var.TranslationsDir)\cppcheck_ru.qm' />
<File Id='cppcheck_ru.qm' Name='cppcheck_ru.qm' Source='$(var.GuiBuildDir)\cppcheck_ru.qm' /> <File Id='cppcheck_se.qm' Name='cppcheck_se.qm' Source='$(var.TranslationsDir)\cppcheck_se.qm' />
<File Id='cppcheck_se.qm' Name='cppcheck_se.qm' Source='$(var.GuiBuildDir)\cppcheck_se.qm' />
</Component> </Component>
<Component Id='BaseDocs' Guid='$(var.basedocsGUID)'> <Component Id='BaseDocs' Guid='$(var.basedocsGUID)'>
<File Id='authors.txt' Name='authors.txt' DiskId='1' Source='..\authors' /> <File Id='authors.txt' Name='authors.txt' DiskId='1' Source='..\authors' />