[certi-cvs] certi CERTICPackOptions.cmake.in CMakeLists.txt...

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      14/04/17 09:42:14

Modified files:
        .              : CERTICPackOptions.cmake.in CMakeLists.txt 
Added files:
        doc            : certi-favi.jpg 
                         certi-installer-banner-493x58.jpg 
                         certi-installer-banner-493x58.png 
                         certi-ui-dialog-493x312.jpg 
                         certi-ui-dialog-493x312.png 

Log message:
        Add support for WIX installer if WiX Toolset is found on the machine.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/CERTICPackOptions.cmake.in?cvsroot=certi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.134&r2=1.135
http://cvs.savannah.gnu.org/viewcvs/certi/doc/certi-favi.jpg?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/doc/certi-installer-banner-493x58.jpg?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/doc/certi-installer-banner-493x58.png?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/doc/certi-ui-dialog-493x312.jpg?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/doc/certi-ui-dialog-493x312.png?cvsroot=certi&rev=1.1

Patches:
Index: CERTICPackOptions.cmake.in
===================================================================
RCS file: /sources/certi/certi/CERTICPackOptions.cmake.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CERTICPackOptions.cmake.in  23 May 2012 21:18:31 -0000      1.4
+++ CERTICPackOptions.cmake.in  17 Apr 2014 09:42:13 -0000      1.5
@@ -1,5 +1,5 @@
 # Only mangle package name if binary package
-if (@CPACK_GENERATOR@)
+if ("${CPACK_GENERATOR}" STRGREATER "")
    if (@MSVC@)
       # FIXME We have to find way to evaluate CMAKE_CFG_INTDIR at cpack time
       # or generate this current file at build time
@@ -11,8 +11,15 @@
       set(CPACK_PACKAGE_FILE_NAME "address@hidden@-${CPACK_SYSTEM_NAME}")
    endif(@MSVC@)
 
+   #Normalize CPACK_PACKAGE_VERSION for picky WiX 
+   if ("${CPACK_GENERATOR}" STREQUAL "WIX")
+       string(REGEX MATCH "([0-9]*).*" CPACK_PACKAGE_VERSION_PATCH_WIX 
"${CPACK_PACKAGE_VERSION_PATCH}")
+          set(CPACK_PACKAGE_VERSION_PATCH_WIX ${CMAKE_MATCH_1})
+          set(CPACK_PACKAGE_VERSION 
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH_WIX}")
+   endif()
+
    if("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
       set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr/local")
       set(CPACK_OSX_PACKAGE_VERSION "10.4")
-   endif("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
-endif(@CPACK_GENERATOR@)
+   endif()
+endif()

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- CMakeLists.txt      16 Apr 2014 14:32:19 -0000      1.134
+++ CMakeLists.txt      17 Apr 2014 09:42:13 -0000      1.135
@@ -477,8 +477,9 @@
 SET(CPACK_PROJECT_CONFIG_FILE "${CERTI_BINARY_DIR}/CERTICPackOptions.cmake")
 
 IF (WIN32)
-    SET(CPACK_SOURCE_GENERATOR "ZIP")
-    SET(CPACK_GENERATOR "ZIP")
+    set(CPACK_SOURCE_GENERATOR "ZIP")
+    set(CPACK_GENERATOR "ZIP")
+       
     # Add NSIS generator iff makensis is found on the system
     find_program(MAKENSIS_EXECUTABLE
                  NAMES makensis
@@ -487,6 +488,19 @@
       list(APPEND CPACK_GENERATOR "NSIS")
     endif(MAKENSIS_EXECUTABLE)
 
+       # Add WIX generator iff candle compiler is found on the system
+    find_program(CANDLE_EXECUTABLE
+                 NAMES candle
+                                PATH $ENV{WIX}/bin
+                 DOC "The WIX package compiler command")
+    if (CANDLE_EXECUTABLE)
+               list(APPEND CPACK_GENERATOR "WIX")
+               set(CPACK_WIX_UPGRADE_GUID 
"CE218AF5-CAC3-4A99-8CB5-98DFC182DC1B")
+               set(CPACK_WIX_PRODUCT_ICON 
"${CMAKE_SOURCE_DIR}/doc/certi-favi.jpg")
+               set(CPACK_WIX_UI_BANNER 
"${CMAKE_SOURCE_DIR}/doc/certi-installer-banner-493x58.jpg")
+               set(CPACK_WIX_UI_DIALOG 
"${CMAKE_SOURCE_DIR}/doc/certi-ui-dialog-493x312.jpg")
+       endif (CANDLE_EXECUTABLE)
+
     ## Add a custom target callable from IDE (Mostly for Visual Studio)
     GET_FILENAME_COMPONENT(CPACK_COMMAND ${CMAKE_COMMAND} PATH)
     SET(CPACK_COMMAND ${CPACK_COMMAND}/cpack)
@@ -567,7 +581,6 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR})
 SET(CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR})
 SET(CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION_PATCH})
-#SET(CPACK_PACKAGE_CONTACT "address@hidden")
 
 INCLUDE(CPack)
 INCLUDE(UsePackageBackup)

Index: doc/certi-favi.jpg
===================================================================
RCS file: doc/certi-favi.jpg
diff -N doc/certi-favi.jpg
Binary files /dev/null and /tmp/cvsmqHL9j differ

Index: doc/certi-installer-banner-493x58.jpg
===================================================================
RCS file: doc/certi-installer-banner-493x58.jpg
diff -N doc/certi-installer-banner-493x58.jpg
Binary files /dev/null and /tmp/cvs1MI00j differ

Index: doc/certi-installer-banner-493x58.png
===================================================================
RCS file: doc/certi-installer-banner-493x58.png
diff -N doc/certi-installer-banner-493x58.png
Binary files /dev/null and /tmp/cvsmcFfvi differ

Index: doc/certi-ui-dialog-493x312.jpg
===================================================================
RCS file: doc/certi-ui-dialog-493x312.jpg
diff -N doc/certi-ui-dialog-493x312.jpg
Binary files /dev/null and /tmp/cvsGvtbji differ

Index: doc/certi-ui-dialog-493x312.png
===================================================================
RCS file: doc/certi-ui-dialog-493x312.png
diff -N doc/certi-ui-dialog-493x312.png
Binary files /dev/null and /tmp/cvsMsYPgj differ