diff options
Diffstat (limited to 'cmake/modules')
-rw-r--r-- | cmake/modules/FindLibDigiDoc.cmake | 2 | ||||
-rw-r--r-- | cmake/modules/FindLibDigiDocpp.cmake | 2 | ||||
-rw-r--r-- | cmake/modules/FindPoDoFo.cmake | 28 | ||||
-rw-r--r-- | cmake/modules/FindXSD.cmake | 7 | ||||
-rw-r--r-- | cmake/modules/FindXercesC.cmake | 6 | ||||
-rw-r--r-- | cmake/modules/FindXmlSecurityC.cmake | 10 | ||||
-rw-r--r-- | cmake/modules/ID.ico | bin | 0 -> 7358 bytes | |||
-rw-r--r-- | cmake/modules/MacOSXBundleInfo.plist.in | 2 | ||||
-rw-r--r-- | cmake/modules/VersionInfo.cmake | 84 | ||||
-rw-r--r-- | cmake/modules/WelcomeDlg2.wxs | 42 | ||||
-rw-r--r-- | cmake/modules/WixUI_Minimal2.wxs | 64 | ||||
-rw-r--r-- | cmake/modules/banner.bmp | bin | 0 -> 85896 bytes | |||
-rw-r--r-- | cmake/modules/dlgbmp.bmp | bin | 0 -> 461816 bytes |
13 files changed, 191 insertions, 56 deletions
diff --git a/cmake/modules/FindLibDigiDoc.cmake b/cmake/modules/FindLibDigiDoc.cmake index 47ccf00..6956117 100644 --- a/cmake/modules/FindLibDigiDoc.cmake +++ b/cmake/modules/FindLibDigiDoc.cmake @@ -11,7 +11,7 @@ IF (LIBDIGIDOC_INCLUDE_DIR) SET(LIBDIGIDOC_FIND_QUIETLY TRUE) ENDIF (LIBDIGIDOC_INCLUDE_DIR) -FIND_PATH(LIBDIGIDOC_INCLUDE_DIR libdigidoc/DigiDocDefs.h PATH_SUFFIXES include) +FIND_PATH(LIBDIGIDOC_INCLUDE_DIR libdigidoc/DigiDocDefs.h) FIND_LIBRARY(LIBDIGIDOC_LIBRARY NAMES digidoc) # handle the QUIETLY and REQUIRED arguments and set LIBDIGIDOC_FOUND to TRUE if diff --git a/cmake/modules/FindLibDigiDocpp.cmake b/cmake/modules/FindLibDigiDocpp.cmake index 8ec6371..3382efc 100644 --- a/cmake/modules/FindLibDigiDocpp.cmake +++ b/cmake/modules/FindLibDigiDocpp.cmake @@ -11,7 +11,7 @@ IF (LIBDIGIDOCPP_INCLUDE_DIR) SET(LIBDIGIDOCPP_FIND_QUIETLY TRUE) ENDIF (LIBDIGIDOCPP_INCLUDE_DIR) -FIND_PATH(LIBDIGIDOCPP_INCLUDE_DIR digidocpp/Container.h PATH_SUFFIXES include) +FIND_PATH(LIBDIGIDOCPP_INCLUDE_DIR digidocpp/Container.h) FIND_LIBRARY(LIBDIGIDOCPP_LIBRARY NAMES digidocpp) # handle the QUIETLY and REQUIRED arguments and set LIBDIGIDOCPP_FOUND to TRUE if diff --git a/cmake/modules/FindPoDoFo.cmake b/cmake/modules/FindPoDoFo.cmake new file mode 100644 index 0000000..bc1a629 --- /dev/null +++ b/cmake/modules/FindPoDoFo.cmake @@ -0,0 +1,28 @@ +# - Find PoDoFo +# Find the native PoDoFo includes and library +# +# PODOFO_INCLUDE_DIR - where to find winscard.h, wintypes.h, etc. +# PODOFO_LIBRARIES - List of libraries when using PoDoFo. +# PODOFO_FOUND - True if PoDoFo found. + + +IF (PODOFO_INCLUDE_DIR) + # Already in cache, be silent + SET(PODOFO_FIND_QUIETLY TRUE) +ENDIF (PODOFO_INCLUDE_DIR) + +FIND_PATH(PODOFO_INCLUDE_DIR podofo/podofo.h) +FIND_LIBRARY(PODOFO_LIBRARY NAMES podofo) + +# handle the QUIETLY and REQUIRED arguments and set PODOFO_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PODOFO DEFAULT_MSG PODOFO_LIBRARY PODOFO_INCLUDE_DIR) + +IF(PODOFO_FOUND) + SET( PODOFO_LIBRARIES ${PODOFO_LIBRARY} ) +ELSE(PODOFO_FOUND) + SET( PODOFO_LIBRARIES ) +ENDIF(PODOFO_FOUND) + +MARK_AS_ADVANCED(PODOFO_LIBRARY PODOFO_INCLUDE_DIR) diff --git a/cmake/modules/FindXSD.cmake b/cmake/modules/FindXSD.cmake index 2e168f1..a96dc8c 100644 --- a/cmake/modules/FindXSD.cmake +++ b/cmake/modules/FindXSD.cmake @@ -11,10 +11,8 @@ IF (XSD_INCLUDE_DIR) SET(XSD_FIND_QUIETLY TRUE) ENDIF (XSD_INCLUDE_DIR) -FIND_PATH(XSD_INCLUDE_DIR xsd/cxx/parser/elements.hxx HINTS /Library/EstonianIDCard/include) - -SET(XSD_NAMES xsdcxx xsdgen xsd) -FIND_PROGRAM(XSD_EXECUTABLE NAMES ${XSD_NAMES} HINTS /Library/EstonianIDCard/bin) +FIND_PATH(XSD_INCLUDE_DIR xsd/cxx/parser/elements.hxx) +FIND_PROGRAM(XSD_EXECUTABLE NAMES xsdcxx xsdgen xsd) if(XSD_EXECUTABLE) execute_process (COMMAND ${XSD_EXECUTABLE} "--version" OUTPUT_VARIABLE EXEC_OUT) string(REGEX REPLACE ".*compiler ([0-9]+)\\.([0-9]+)\\.([0-9]+).*" "\\1" XSD_VERSION_MAJOR ${EXEC_OUT}) @@ -43,6 +41,7 @@ macro( XSD_SCHEMA SOURCES HEADERS OUTPUT INPUT ) --type-naming ucc --function-naming lcc --generate-serialization + --suppress-assignment --std c++11 --output-dir ${OUTPUT} ${ARGN} diff --git a/cmake/modules/FindXercesC.cmake b/cmake/modules/FindXercesC.cmake index 2d5c1cf..6f31742 100644 --- a/cmake/modules/FindXercesC.cmake +++ b/cmake/modules/FindXercesC.cmake @@ -11,10 +11,8 @@ IF (XERCESC_INCLUDE_DIR) SET(XERCESC_FIND_QUIETLY TRUE) ENDIF (XERCESC_INCLUDE_DIR) -FIND_PATH(XERCESC_INCLUDE_DIR xercesc/dom/DOM.hpp HINTS /Library/EstonianIDCard/include) - -SET(XERCESC_NAMES xerces-c xerces-c_3 xerces-c_2) -FIND_LIBRARY(XERCESC_LIBRARY NAMES ${XERCESC_NAMES} HINTS /Library/EstonianIDCard/lib) +FIND_PATH(XERCESC_INCLUDE_DIR xercesc/dom/DOM.hpp) +FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c xerces-c_3) # Handle the QUIETLY and REQUIRED arguments and set XERCESC_FOUND to # TRUE if all listed variables are TRUE. diff --git a/cmake/modules/FindXmlSecurityC.cmake b/cmake/modules/FindXmlSecurityC.cmake index 9912c81..9336ef1 100644 --- a/cmake/modules/FindXmlSecurityC.cmake +++ b/cmake/modules/FindXmlSecurityC.cmake @@ -11,12 +11,12 @@ IF (XMLSECURITYC_INCLUDE_DIR) SET(XMLSECURITYC_FIND_QUIETLY TRUE) ENDIF (XMLSECURITYC_INCLUDE_DIR) -#FIND_PATH(XALANC_INCLUDE_DIR xalanc/XalanTransformer/XalanTransformer.hpp HINTS /Library/EstonianIDCard/include) -FIND_PATH(XMLSECURITYC_INCLUDE_DIR xsec/utils/XSECPlatformUtils.hpp HINTS /Library/EstonianIDCard/include) +FIND_PATH(XALANC_INCLUDE_DIR xalanc/XalanTransformer/XalanTransformer.hpp) +FIND_PATH(XMLSECURITYC_INCLUDE_DIR xsec/utils/XSECPlatformUtils.hpp) -#FIND_LIBRARY(XALANC_LIBRARY NAMES xalan-c xalan-C_1 HINTS /Library/EstonianIDCard/lib) -#FIND_LIBRARY(XALANMSG_LIBRARY NAMES xalanMsg XalanMessages_1 HINTS /Library/EstonianIDCard/lib) -FIND_LIBRARY(XMLSECURITYC_LIBRARY NAMES xml-security-c xsec_1 HINTS /Library/EstonianIDCard/lib) +FIND_LIBRARY(XALANC_LIBRARY NAMES xalan-c xalan-C_1) +FIND_LIBRARY(XALANMSG_LIBRARY NAMES xalanMsg XalanMessages_1) +FIND_LIBRARY(XMLSECURITYC_LIBRARY NAMES xml-security-c xsec_1) # Handle the QUIETLY and REQUIRED arguments and set XMLSECURITYC_FOUND to # TRUE if all listed variables are TRUE. diff --git a/cmake/modules/ID.ico b/cmake/modules/ID.ico Binary files differnew file mode 100644 index 0000000..0654fe1 --- /dev/null +++ b/cmake/modules/ID.ico diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in index e7f2177..b47814f 100644 --- a/cmake/modules/MacOSXBundleInfo.plist.in +++ b/cmake/modules/MacOSXBundleInfo.plist.in @@ -31,6 +31,6 @@ <key>LSApplicationCategoryType</key> <string>public.app-category.utilities</string> <key>LSMinimumSystemVersion</key> - <string>10.7</string> + <string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string> </dict> </plist> diff --git a/cmake/modules/VersionInfo.cmake b/cmake/modules/VersionInfo.cmake index 2955ce1..53024c3 100644 --- a/cmake/modules/VersionInfo.cmake +++ b/cmake/modules/VersionInfo.cmake @@ -1,39 +1,38 @@ -set( MAJOR_VER 3 ) -set( MINOR_VER 10 ) -set( RELEASE_VER 1 ) -set( BUILD_VER 1208 ) if( $ENV{BUILD_NUMBER} ) - set( BUILD_VER 1208 ) -endif() - -if( WIN32 ) - execute_process( COMMAND "cmd.exe" "/C date /T" OUTPUT_VARIABLE BUILD_DATE ) - string( REGEX REPLACE ".*([0-3][0-9]).([0-1][0-9]).([0-9][0-9][0-9][0-9]).*" "\\1.\\2.\\3" BUILD_DATE ${BUILD_DATE} ) -elseif( UNIX ) - execute_process( COMMAND "date" "+%d.%m.%Y" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE ) + set( BUILD_VER $ENV{BUILD_NUMBER} ) +elseif(PROJECT_VERSION_TWEAK) + set( BUILD_VER ${PROJECT_VERSION_TWEAK} ) else() - message( SEND_ERROR "date not implemented") - set( BUILD_DATE "00.00.0000" ) + set( BUILD_VER 0 ) +endif() +if(NOT BUILD_DATE) + string(TIMESTAMP BUILD_DATE "%d.%m.%Y") endif() -set( VERSION ${MAJOR_VER}.${MINOR_VER}.${RELEASE_VER}.${BUILD_VER} ) +set( VERSION ${PROJECT_VERSION}.${BUILD_VER} ) add_definitions( - -DMAJOR_VER=${MAJOR_VER} - -DMINOR_VER=${MINOR_VER} - -DRELEASE_VER=${RELEASE_VER} + -DMAJOR_VER=${PROJECT_VERSION_MAJOR} + -DMINOR_VER=${PROJECT_VERSION_MINOR} + -DRELEASE_VER=${PROJECT_VERSION_PATCH} -DBUILD_VER=${BUILD_VER} -DVER_SUFFIX=\"$ENV{VER_SUFFIX}\" -DBUILD_DATE=\"${BUILD_DATE}\" - -DDOMAINURL=\"ria.ee\" - -DORG=\"RIA\" ) -set( MACOSX_BUNDLE_COPYRIGHT "(C) 2010-2015 Estonian Information System Authority" ) -set( MACOSX_BUNDLE_SHORT_VERSION_STRING ${MAJOR_VER}.${MINOR_VER}.${RELEASE_VER} ) +set( MACOSX_BUNDLE_COPYRIGHT "(C) 2010-2018 Estonian Information System Authority" ) +set( MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION} ) set( MACOSX_BUNDLE_BUNDLE_VERSION ${BUILD_VER} ) set( MACOSX_BUNDLE_ICON_FILE Icon.icns ) -set( MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${MAJOR_VER}.${MINOR_VER}.${RELEASE_VER} ) +set( MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION} ) set( MACOSX_FRAMEWORK_BUNDLE_VERSION ${BUILD_VER} ) +if( APPLE AND NOT IOS AND NOT CMAKE_OSX_DEPLOYMENT_TARGET ) + execute_process(COMMAND xcodebuild -version -sdk macosx SDKVersion + OUTPUT_VARIABLE CMAKE_OSX_DEPLOYMENT_TARGET OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() +if( APPLE AND NOT CMAKE_OSX_SYSROOT ) + execute_process(COMMAND xcodebuild -version -sdk macosx Path + OUTPUT_VARIABLE CMAKE_OSX_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE) +endif() macro( SET_APP_NAME OUTPUT NAME ) set( ${OUTPUT} "${NAME}" ) @@ -55,28 +54,38 @@ endmacro() macro( add_manifest TARGET ) if( WIN32 ) add_custom_command(TARGET ${TARGET} POST_BUILD - COMMAND mt -manifest "${CMAKE_MODULE_PATH}/win81.exe.manifest" -outputresource:"$<TARGET_FILE:${TARGET}>") + COMMAND mt -nologo -manifest "${CMAKE_MODULE_PATH}/win81.exe.manifest" -outputresource:"$<TARGET_FILE:${TARGET}>") endif() endmacro() -macro( SET_EX NAME VAR DEF ) - if( "${VAR}" STREQUAL "" ) - set( ${NAME} ${DEF} ${ARGN} ) +macro( SET_ENV NAME DEF ) + if( DEFINED ENV{${NAME}} ) + set( ${NAME} $ENV{${NAME}} ${ARGN} ) else() - set( ${NAME} ${VAR} ${ARGN} ) + set( ${NAME} ${DEF} ${ARGN} ) endif() endmacro() -if(CMAKE_COMPILER_IS_GNUCC OR __COMPILER_GNU) - if(NOT DEFINED ENABLE_VISIBILITY) - set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") + +if(NOT DEFINED ENABLE_VISIBILITY) + if(POLICY CMP0063) + cmake_policy(GET CMP0063 VISIBILITY_POLICY) + endif() + if(VISIBILITY_POLICY STREQUAL NEW) + set(CMAKE_C_VISIBILITY_PRESET hidden) + set(CMAKE_CXX_VISIBILITY_PRESET hidden) + set(CMAKE_VISIBILITY_INLINES_HIDDEN YES) + elseif(CMAKE_COMPILER_IS_GNUCC OR __COMPILER_GNU) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") - #set( CMAKE_C_VISIBILITY_PRESET hidden ) - #set( CMAKE_CXX_VISIBILITY_PRESET hidden ) - #set( CMAKE_VISIBILITY_INLINES_HIDDEN 1 ) endif() +endif() - if(NOT DISABLE_CXX11) +if(NOT DISABLE_CXX11) + if(CMAKE_VERSION VERSION_GREATER 3.1.0) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED YES) + elseif(CMAKE_COMPILER_IS_GNUCC OR __COMPILER_GNU) include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG(-std=c++11 C11) CHECK_CXX_COMPILER_FLAG(-std=c++0x C0X) @@ -87,9 +96,4 @@ if(CMAKE_COMPILER_IS_GNUCC OR __COMPILER_GNU) endif() set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++0x") endif() - if(APPLE) - set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7") - endif() endif() diff --git a/cmake/modules/WelcomeDlg2.wxs b/cmake/modules/WelcomeDlg2.wxs new file mode 100644 index 0000000..98f0b51 --- /dev/null +++ b/cmake/modules/WelcomeDlg2.wxs @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> + + +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Fragment> + <UI> + <Dialog Id="WelcomeDlg2" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)"> + <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" /> + <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" /> + <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" /> + <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> + <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> + <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes"> + <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish> + <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> + <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> + <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> + <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> + <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> + <Condition Action="show">ALLUSERS</Condition> + </Control> + <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes"> + <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish> + <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish> + <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish> + <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> + <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish> + <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish> + <Condition Action="show">NOT ALLUSERS</Condition> + </Control> + <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> + <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> + </Control> + </Dialog> + </UI> + + <InstallUISequence> + <Show Dialog="WelcomeDlg2" Before="ProgressDlg" Overridable="yes">NOT Installed</Show> + </InstallUISequence> + </Fragment> +</Wix> diff --git a/cmake/modules/WixUI_Minimal2.wxs b/cmake/modules/WixUI_Minimal2.wxs new file mode 100644 index 0000000..5bae0ae --- /dev/null +++ b/cmake/modules/WixUI_Minimal2.wxs @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> + + + +<!-- +First-time install dialog sequence: + - WixUI_WelcomeDlg2 + +Maintenance dialog sequence: + WixUI_MaintenanceWelcomeDlg + - WixUI_MaintenanceTypeDlg + - WixUI_VerifyReadyDlg + +Patch dialog sequence: + - WixUI_WelcomeDlg + - WixUI_VerifyReadyDlg +--> + +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Fragment> + <UI Id="WixUI_Minimal2"> + <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> + <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> + <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" /> + + <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" /> + <Property Id="WixUI_Mode" Value="Minimal" /> + + <DialogRef Id="ErrorDlg" /> + <DialogRef Id="FatalError" /> + <DialogRef Id="FilesInUse" /> + <DialogRef Id="MsiRMFilesInUse" /> + <DialogRef Id="PrepareDlg" /> + <DialogRef Id="ProgressDlg" /> + <DialogRef Id="ResumeDlg" /> + <DialogRef Id="UserExit" /> + <DialogRef Id="WelcomeDlg" /> + <DialogRef Id="WelcomeDlg2" /> + + <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> + + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> + + <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> + + <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish> + + <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish> + + <InstallUISequence> + <Show Dialog="WelcomeDlg" Before="WelcomeDlg2">Installed AND PATCH</Show> + <Show Dialog="WelcomeDlg2" Before="ProgressDlg">NOT Installed</Show> + </InstallUISequence> + + <Property Id="ARPNOMODIFY" Value="1" /> + </UI> + + <UIRef Id="WixUI_Common" /> + </Fragment> +</Wix> diff --git a/cmake/modules/banner.bmp b/cmake/modules/banner.bmp Binary files differnew file mode 100644 index 0000000..b74514a --- /dev/null +++ b/cmake/modules/banner.bmp diff --git a/cmake/modules/dlgbmp.bmp b/cmake/modules/dlgbmp.bmp Binary files differnew file mode 100644 index 0000000..28bc092 --- /dev/null +++ b/cmake/modules/dlgbmp.bmp |