Skip to content

Commit

Permalink
Builds release in windows with msvc
Browse files Browse the repository at this point in the history
  • Loading branch information
@markummitchell-tu
markummitchell-tu committed Jul 8, 2016
1 parent 69a5dad commit 50eb84d
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 60 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ engauge.pkg
engauge.app.dSYM
fftw-3.3.4*
log4cpp-1.1.1*
log4cpp_null*
poppler-qt5*
transifex_downloads
1 change: 1 addition & 0 deletions dev/windows/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ digit*.wixpdb
engauge*.wixpdb
staging
Engauge Digitizer
Engauge Digitizer.7z
build_msi_and_zip~
engauge-build
engauge-build.7z
Expand Down
25 changes: 22 additions & 3 deletions dev/windows/build_msi_and_zip.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ set QTLIBEXT='.lib'
set LOG4CPPDLLINK='https://dl.dropboxusercontent.com/u/1147076/log4cpp-1.1.1.zip'

set SCRIPTDIR=%cd%
set RESULTDIR="%SCRIPTDIR%\engauge-build"

rem Double-double quotes are needed in next line if the directory has a space
set RESULTDIR=""%SCRIPTDIR%\Engauge Digitizer""

mkdir "%RESULTDIR%"

rem Directory containing engauge.pro
Expand Down Expand Up @@ -39,10 +42,10 @@ curl 'https://dl.dropboxusercontent.com/u/1147076/poppler-qt5.zip' -o poppler-qt
7z x poppler-qt5.zip -aoa

cd "%APPVEYOR_BUILD_FOLDER%"
set LOG4CPP_HOME="%APPVEYOR_BUILD_FOLDER%\log4cpp-1.1.1"
set FFTW_HOME="%APPVEYOR_BUILD_FOLDER%\fftw-3.3.4-dll32"
set POPPLER_INCLUDE="%APPVEYOR_BUILD_FOLDER%\poppler-qt5\include\poppler\qt5"
set POPPLER_LIB="%APPVEYOR_BUILD_FOLDER%\poppler-qt5"
lrelease engauge.pro
qmake engauge.pro "CONFIG+=%ENGAUGE_CONFIG%"
rem move Makefile Makefile.orig
rem ps: gc Makefile.orig | %{ $_ -replace '551.lib', %QTLIBEXT% } > Makefile
Expand All @@ -55,7 +58,9 @@ for %%I in (%QTDIRS%) do copy %QTDIR%\plugins\%%I\*.dll "%RESULTDIR%\%%I"
for %%I in (%QTLIBS%) do copy %QTDIR%\bin\%%I.dll "%RESULTDIR%"
del /S *d.dll
copy bin\engauge.exe "%RESULTDIR%"
copy log4cpp-1.1.1\lib\log4cpp.dll "%RESULTDIR%"

copy "%LOG4CPP_HOME%\lib\log4cpp.dll" "%RESULTDIR%"

copy fftw-3.3.4-dll32\lib\libfftw3-3.dll "%RESULTDIR%"
copy "%APPVEYOR_BUILD_FOLDER%"\poppler-qt5\*.dll "%RESULTDIR%"
copy LICENSE "%RESULTDIR%"
Expand All @@ -65,3 +70,17 @@ move engauge.qch "%RESULTDIR%"\documentation
move engauge.qhc "%RESULTDIR%"\documentation
cd ..
7z a "%RESULTDIR%.7z" "%RESULTDIR%"

echo ***creating msi
cd "%SCRIPTDIR%"
findStr "char *VERSION_NUMBER" ..\..\src\util\Version.cpp
findStr "Version=" engauge.wxs | findStr /v InstallerVersion
set /p VERSION_NUMBER_CODE="If the version numbers are correct, enter the version number seen above to continue and build releases> "

candle engauge.wxs
candle WixUI_InstallDir_NoLicense.wxs
light.exe -ext WixUIExtension -ext WixUtilExtension engauge.wixobj WixUI_InstallDir_NoLicense.wixobj -o digit-exe-windows-32-bit-installer-%VERSION_NUMBER_CODE%.msi

echo *** creating zip
rem "Engauge Digitizer" in next line is needed since zip crashes on %RESULTDIR% due to the space
zip -r "digit-exe-windows-32-bit-without-installer-file-%VERSION_NUMBER_CODE%.zip" "Engauge Digitizer"
110 changes: 53 additions & 57 deletions dev/windows/engauge.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Name='Engauge Digitizer'
Manufacturer='Engauge Open Source Developers'
Id='CC6A7063-A6B8-45BE-AC9B-8EDD614C43F8'
Id='C111CD75-C12E-45D2-AD60-F0DD78831DC0'
UpgradeCode='00A6792B-65ED-4894-A48B-B95D63C62CC6'
Language='1033' Codepage='1252'
Version='8.3'>
Expand All @@ -22,92 +22,88 @@
<File Id='engauge.exe' Name='engauge.exe' DiskId='1' Source='../../bin/engauge.exe' KeyPath='yes'>
<Shortcut Id='desktopshortcut' Directory='DesktopFolder' Name='Engauge Digitizer' WorkingDirectory='INSTALLDIR' Icon='engauge.ico' IconIndex='0' Advertise='yes' />
</File>
<File Id='d3dcompiler' Name='D3Dcompiler_47.dll' DiskId='1' Source='../../bin/D3Dcompiler_47.dll' />
<File Id='clucene' Name='Qt5CLucene.dll' DiskId='1' Source='../../bin/Qt5CLucene.dll' />
<File Id='core' Name='Qt5Core.dll' DiskId='1' Source='../../bin/Qt5Core.dll' />
<File Id='gui' Name='Qt5Gui.dll' DiskId='1' Source='../../bin/Qt5Gui.dll' />
<File Id='help' Name='Qt5Help.dll' DiskId='1' Source='../../bin/Qt5Help.dll' />
<File Id='network' Name='Qt5Network.dll' DiskId='1' Source='../../bin/Qt5Network.dll' />
<File Id='printsupport' Name='Qt5PrintSupport.dll' DiskId='1' Source='../../bin/Qt5PrintSupport.dll' />
<File Id='sql' Name='Qt5Sql.dll' DiskId='1' Source='../../bin/Qt5Sql.dll' />
<File Id='svg' Name='Qt5Svg.dll' DiskId='1' Source='../../bin/Qt5Svg.dll' />
<File Id='widgets' Name='Qt5Widgets.dll' DiskId='1' Source='../../bin/Qt5Widgets.dll' />
<File Id='xml' Name='Qt5Xml.dll' DiskId='1' Source='../../bin/Qt5Xml.dll' />
<File Id='egl' Name='libEGL.dll' DiskId='1' Source='../../bin/libEGL.dll' />
<File Id='gles' Name='libGLESV2.dll' DiskId='1' Source='../../bin/libGLESV2.dll' />
<File Id='gcc' Name='libgcc_s_dw2-1.dll' DiskId='1' Source='../../bin/libgcc_s_dw2-1.dll' />
<File Id='pthread' Name='libwinpthread-1.dll' DiskId='1' Source='../../bin/libwinpthread-1.dll' />
<File Id='stdc' Name='libstdc++-6.dll' DiskId='1' Source='../../bin/libstdc++-6.dll' />
<File Id='opengl' Name='opengl32sw.dll' DiskId='1' Source='../../bin/opengl32sw.dll' />
<File Id='freetype6' Name='freetype6.dll' DiskId='1' Source='Engauge Digitizer/freetype6.dll' />
<File Id='libfftw33' Name='libfftw3-3.dll' DiskId='1' Source='Engauge Digitizer/libfftw3-3.dll' />
<File Id='log4cpp' Name='log4cpp.dll' DiskId='1' Source='Engauge Digitizer/log4cpp.dll' />
<File Id='openjpeg' Name='openjpeg.dll' DiskId='1' Source='Engauge Digitizer/openjpeg.dll' />
<File Id='popplerqt5' Name='poppler-qt5.dll' DiskId='1' Source='Engauge Digitizer/poppler-qt5.dll' />
<File Id='clucene' Name='Qt5CLucene.dll' DiskId='1' Source='Engauge Digitizer/Qt5CLucene.dll' />
<File Id='core' Name='Qt5Core.dll' DiskId='1' Source='Engauge Digitizer/Qt5Core.dll' />
<File Id='gui' Name='Qt5Gui.dll' DiskId='1' Source='Engauge Digitizer/Qt5Gui.dll' />
<File Id='help' Name='Qt5Help.dll' DiskId='1' Source='Engauge Digitizer/Qt5Help.dll' />
<File Id='network' Name='Qt5Network.dll' DiskId='1' Source='Engauge Digitizer/Qt5Network.dll' />
<File Id='printsupport' Name='Qt5PrintSupport.dll' DiskId='1' Source='Engauge Digitizer/Qt5PrintSupport.dll' />
<File Id='sql' Name='Qt5Sql.dll' DiskId='1' Source='Engauge Digitizer/Qt5Sql.dll' />
<File Id='widgets' Name='Qt5Widgets.dll' DiskId='1' Source='Engauge Digitizer/Qt5Widgets.dll' />
<File Id='xml' Name='Qt5Xml.dll' DiskId='1' Source='Engauge Digitizer/Qt5Xml.dll' />
<File Id='zlib' Name='zlib1.dll' DiskId='1' Source='Engauge Digitizer/zlib1.dll' />
</Component>
<Directory Id='bearer' Name='bearer'>
<Component Id='bearer' Guid='C7385BF7-2EF9-499A-90FF-17C3F8D4C708'>
<File Id='generic' Name='qgenericbearer.dll' DiskId='1' Source='../../bin/bearer/qgenericbearer.dll' />
<File Id='native' Name='qnativewifibearer.dll' DiskId='1' Source='../../bin/bearer/qnativewifibearer.dll' />
<File Id='generic' Name='qgenericbearer.dll' DiskId='1' Source='Engauge Digitizer/bearer/qgenericbearer.dll' />
<File Id='native' Name='qnativewifibearer.dll' DiskId='1' Source='Engauge Digitizer/bearer/qnativewifibearer.dll' />
</Component>
</Directory>
<Directory Id='documentation' Name='documentation'>
<Component Id='documentation' Guid='34F27B58-56AC-4380-9B85-131DED5BA593'>
<File Id='qch' Name='engauge.qch' DiskId='1' Source='../../bin/documentation/engauge.qch' />
<File Id='qhc' Name='engauge.qhc' DiskId='1' Source='../../bin/documentation/engauge.qhc' />
<File Id='qch' Name='engauge.qch' DiskId='1' Source='Engauge Digitizer/documentation/engauge.qch' />
<File Id='qhc' Name='engauge.qhc' DiskId='1' Source='Engauge Digitizer/documentation/engauge.qhc' />
</Component>
</Directory>
<Directory Id='iconengines' Name='iconengines'>
<Component Id='iconengines' Guid='ADE56F32-F33D-4315-ADEA-244EAD400CC2'>
<File Id='svgicon' Name='qsvgicon.dll' DiskId='1' Source='../../bin/iconengines/qsvgicon.dll' KeyPath='yes' />
<File Id='svgicon' Name='qsvgicon.dll' DiskId='1' Source='Engauge Digitizer/iconengines/qsvgicon.dll' KeyPath='yes' />
</Component>
</Directory>
<Directory Id='imageformats' Name='imageformats'>
<Component Id='imageformats' Guid='94F1114F-216F-4409-AAC6-1B4ADCB3AC32'>
<File Id='qdds' Name='qdds.dll' DiskId='1' Source='../../bin/imageformats/qdds.dll' />
<File Id='qgif' Name='qgif.dll' DiskId='1' Source='../../bin/imageformats/qgif.dll' />
<File Id='qicns' Name='qicns.dll' DiskId='1' Source='../../bin/imageformats/qicns.dll' />
<File Id='qico' Name='qico.dll' DiskId='1' Source='../../bin/imageformats/qico.dll' />
<File Id='qjp2' Name='qjp2.dll' DiskId='1' Source='../../bin/imageformats/qjp2.dll' />
<File Id='qjpeg' Name='qjpeg.dll' DiskId='1' Source='../../bin/imageformats/qjpeg.dll' />
<File Id='qmng' Name='qmng.dll' DiskId='1' Source='../../bin/imageformats/qmng.dll' />
<File Id='qsvg' Name='qsvg.dll' DiskId='1' Source='../../bin/imageformats/qsvg.dll' />
<File Id='qtga' Name='qtga.dll' DiskId='1' Source='../../bin/imageformats/qtga.dll' />
<File Id='qtiff' Name='qtiff.dll' DiskId='1' Source='../../bin/imageformats/qtiff.dll' />
<File Id='qwbmp' Name='qwbmp.dll' DiskId='1' Source='../../bin/imageformats/qwbmp.dll' />
<File Id='qwebp' Name='qwebp.dll' DiskId='1' Source='../../bin/imageformats/qwebp.dll' />
<File Id='qdds' Name='qdds.dll' DiskId='1' Source='Engauge Digitizer/imageformats/qdds.dll' />
<File Id='qgif' Name='qgif.dll' DiskId='1' Source='Engauge Digitizer/imageformats/qgif.dll' />
<File Id='qicns' Name='qicns.dll' DiskId='1' Source='Engauge Digitizer/imageformats/qicns.dll' />
<File Id='qico' Name='qico.dll' DiskId='1' Source='Engauge Digitizer/imageformats/qico.dll' />
<File Id='qjpeg' Name='qjpeg.dll' DiskId='1' Source='Engauge Digitizer/imageformats/qjpeg.dll' />
<File Id='qsvg' Name='qsvg.dll' DiskId='1' Source='Engauge Digitizer/imageformats/qsvg.dll' />
<File Id='qtga' Name='qtga.dll' DiskId='1' Source='Engauge Digitizer/imageformats/qtga.dll' />
<File Id='qtiff' Name='qtiff.dll' DiskId='1' Source='Engauge Digitizer/imageformats/qtiff.dll' />
<File Id='qwbmp' Name='qwbmp.dll' DiskId='1' Source='Engauge Digitizer/imageformats/qwbmp.dll' />
<File Id='qwebp' Name='qwebp.dll' DiskId='1' Source='Engauge Digitizer/imageformats/qwebp.dll' />
</Component>
</Directory>
<Directory Id='platforms' Name='platforms'>
<Component Id='platforms' Guid='679FF2A9-FB70-47ED-BA76-7CDC68367777'>
<File Id='win' Name='qwindows.dll' DiskId='1' Source='../../bin/platforms/qwindows.dll' KeyPath='yes' />
<File Id='qminimal' Name='qminimal.dll' DiskId='1' Source='Engauge Digitizer/platforms/qminimal.dll' />
<File Id='qoffscreen' Name='qoffscreen.dll' DiskId='1' Source='Engauge Digitizer/platforms/qoffscreen.dll' />
<File Id='win' Name='qwindows.dll' DiskId='1' Source='Engauge Digitizer/platforms/qwindows.dll' />
</Component>
</Directory>
<Directory Id='printsupport' Name='printsupport'>
<Component Id='printsupport' Guid='39CBE62C-09FA-4D88-B3F0-1691B91DC5C3'>
<File Id='winprint' Name='windowsprintersupport.dll' DiskId='1' Source='../../bin/printsupport/windowsprintersupport.dll' KeyPath='yes' />
<File Id='winprint' Name='windowsprintersupport.dll' DiskId='1' Source='Engauge Digitizer/printsupport/windowsprintersupport.dll' KeyPath='yes' />
</Component>
</Directory>
<Directory Id='sqldrivers' Name='sqldrivers'>
<Component Id='sqldrivers' Guid='642778D3-ED5F-47CA-9978-671DF3B472D0'>
<File Id='qsqlite' Name='qsqlite.dll' DiskId='1' Source='../../bin/sqldrivers/qsqlite.dll' />
<File Id='qsqlmysql' Name='qsqlmysql.dll' DiskId='1' Source='../../bin/sqldrivers/qsqlmysql.dll' />
<File Id='qsqlodbc' Name='qsqlodbc.dll' DiskId='1' Source='../../bin/sqldrivers/qsqlodbc.dll' />
<File Id='qsqlpsql' Name='qsqlpsql.dll' DiskId='1' Source='../../bin/sqldrivers/qsqlpsql.dll' />
<File Id='qsqlite' Name='qsqlite.dll' DiskId='1' Source='Engauge Digitizer/sqldrivers/qsqlite.dll' />
<File Id='qsqlmysql' Name='qsqlmysql.dll' DiskId='1' Source='Engauge Digitizer/sqldrivers/qsqlmysql.dll' />
<File Id='qsqlodbc' Name='qsqlodbc.dll' DiskId='1' Source='Engauge Digitizer/sqldrivers/qsqlodbc.dll' />
<File Id='qsqlpsql' Name='qsqlpsql.dll' DiskId='1' Source='Engauge Digitizer/sqldrivers/qsqlpsql.dll' />
</Component>
</Directory>
<Directory Id='translations' Name='translations'>
<Component Id='translations' Guid='A9AD2B5C-8B4F-48E5-819A-D38C4EA11153'>
<File Id='qt_ca' Name='qt_ca.qm' DiskId='1' Source='../../bin/translations/qt_ca.qm' />
<File Id='qt_cs' Name='qt_cs.qm' DiskId='1' Source='../../bin/translations/qt_cs.qm' />
<File Id='qt_de' Name='qt_de.qm' DiskId='1' Source='../../bin/translations/qt_de.qm' />
<File Id='qt_en' Name='qt_en.qm' DiskId='1' Source='../../bin/translations/qt_en.qm' />
<File Id='qt_fi' Name='qt_fi.qm' DiskId='1' Source='../../bin/translations/qt_fi.qm' />
<File Id='qt_fr' Name='qt_fr.qm' DiskId='1' Source='../../bin/translations/qt_fr.qm' />
<File Id='qt_he' Name='qt_he.qm' DiskId='1' Source='../../bin/translations/qt_he.qm' />
<File Id='qt_hu' Name='qt_hu.qm' DiskId='1' Source='../../bin/translations/qt_hu.qm' />
<File Id='qt_it' Name='qt_it.qm' DiskId='1' Source='../../bin/translations/qt_it.qm' />
<File Id='qt_ja' Name='qt_ja.qm' DiskId='1' Source='../../bin/translations/qt_ja.qm' />
<File Id='qt_ko' Name='qt_ko.qm' DiskId='1' Source='../../bin/translations/qt_ko.qm' />
<File Id='qt_lv' Name='qt_lv.qm' DiskId='1' Source='../../bin/translations/qt_lv.qm' />
<File Id='qt_ru' Name='qt_ru.qm' DiskId='1' Source='../../bin/translations/qt_ru.qm' />
<File Id='qt_sk' Name='qt_sk.qm' DiskId='1' Source='../../bin/translations/qt_sk.qm' />
<File Id='qt_uk' Name='qt_uk.qm' DiskId='1' Source='../../bin/translations/qt_uk.qm' />
<File Id='qt_ar' Name='qt_ar.qm' DiskId='1' Source='../../translations/engauge_ar.qm' />
<File Id='qt_de' Name='qt_de.qm' DiskId='1' Source='../../translations/engauge_de.qm' />
<File Id='qt_en' Name='qt_en.qm' DiskId='1' Source='../../translations/engauge_en.qm' />
<File Id='qt_es' Name='qt_es.qm' DiskId='1' Source='../../translations/engauge_es.qm' />
<File Id='qt_fr' Name='qt_fr.qm' DiskId='1' Source='../../translations/engauge_fr.qm' />
<File Id='qt_hi' Name='qt_hi.qm' DiskId='1' Source='../../translations/engauge_hi.qm' />
<File Id='qt_it' Name='qt_it.qm' DiskId='1' Source='../../translations/engauge_it.qm' />
<File Id='qt_ja' Name='qt_ja.qm' DiskId='1' Source='../../translations/engauge_ja.qm' />
<File Id='qt_kk' Name='qt_kk.qm' DiskId='1' Source='../../translations/engauge_kk.qm' />
<File Id='qt_ko' Name='qt_ko.qm' DiskId='1' Source='../../translations/engauge_ko.qm' />
<File Id='qt_pt' Name='qt_pt.qm' DiskId='1' Source='../../translations/engauge_pt.qm' />
<File Id='qt_ru' Name='qt_ru.qm' DiskId='1' Source='../../translations/engauge_ru.qm' />
<File Id='qt_zh' Name='qt_zh.qm' DiskId='1' Source='../../translations/engauge_zh.qm' />
</Component>
</Directory>
</Directory>
Expand Down Expand Up @@ -142,7 +138,7 @@
<ComponentRef Id='sqldrivers' />
<ComponentRef Id='translations' />
</Feature>
<Icon Id='engauge.ico' SourceFile='../../bin/digitizer.ico' />
<Icon Id='engauge.ico' SourceFile='../../src/img/digitizer.ico' />
<Property Id='ARPPRODUCTION' Value='engauge.ico' />
<Property Id="WIXUI_INSTALLDIR" Value="MYAPPDIRPROPERTY" />
<UIRef Id="WixUI_InstallDir_NoLicense" />
Expand Down

0 comments on commit 50eb84d

Please sign in to comment.