detect the wix components installed on the build machine
This commit is contained in:
parent
5a1ca44c11
commit
9e07a75968
|
@ -52,6 +52,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||||
|
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
# AC_PROG_CXX is needed to built the win32 custom action. Indeed dutil.h use [extern "C"] definition which fails on pure c compiler
|
||||||
|
AC_PROG_CXX
|
||||||
PKG_PROG_PKG_CONFIG
|
PKG_PROG_PKG_CONFIG
|
||||||
AC_C_BIGENDIAN
|
AC_C_BIGENDIAN
|
||||||
|
|
||||||
|
|
|
@ -6,20 +6,20 @@ MINIDRIVER_DEF = /DENABLE_MINIDRIVER
|
||||||
#Build MSI with the Windows Installer XML (WIX) toolkit, requires WIX >= 3.6
|
#Build MSI with the Windows Installer XML (WIX) toolkit, requires WIX >= 3.6
|
||||||
!IF "$(BUILD_ON)" == "WIN64"
|
!IF "$(BUILD_ON)" == "WIN64"
|
||||||
WIX_PATH = "C:\Program Files (x86)\Windows Installer XML v3.6"
|
WIX_PATH = "C:\Program Files (x86)\Windows Installer XML v3.6"
|
||||||
WIX_INCL_DIR = "/IC:\Program Files (x86)\Windows Installer XML v3.6\SDK\VS2010\inc"
|
WIX_INCL_DIR = "/IC:\Program Files (x86)\Windows Installer XML v3.6\SDK\inc"
|
||||||
!IF "$(BUILD_FOR)" == "WIN64"
|
!IF "$(BUILD_FOR)" == "WIN64"
|
||||||
WIX_LIB = "C:\Program Files (x86)\Windows Installer XML v3.6\SDK\VS2010\lib\x64"
|
WIX_LIBS = "C:\Program Files (x86)\Windows Installer XML v3.6\SDK\lib\dutil_2010_x64.lib" "C:\Program Files (x86)\Windows Installer XML v3.6\SDK\lib\wcautil_2010_x64.lib"
|
||||||
!ELSE
|
!ELSE
|
||||||
WIX_LIB = "C:\Program Files (x86)\Windows Installer XML v3.6\SDK\VS2010\lib\x86"
|
WIX_LIBS = "C:\Program Files (x86)\Windows Installer XML v3.6\SDK\lib\dutil_2010.lib" "C:\Program Files (x86)\Windows Installer XML v3.6\SDK\lib\wcautil_2010.lib"
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
!ELSE
|
!ELSE
|
||||||
WIX_PATH = "C:\Program Files\Windows Installer XML v3.6"
|
WIX_PATH = "C:\Program Files\Windows Installer XML v3.6"
|
||||||
WIX_INCL_DIR = "/IC:\Program Files\Windows Installer XML v3.6\SDK\VS2010\inc"
|
WIX_INCL_DIR = "/IC:\Program Files\Windows Installer XML v3.6\SDK\inc"
|
||||||
!IF "$(BUILD_FOR)" == "WIN64"
|
!IF "$(BUILD_FOR)" == "WIN64"
|
||||||
WIX_LIB = "C:\Program Files\Windows Installer XML v3.6\SDK\VS2010\lib\x64"
|
WIX_LIBS = "C:\Program Files\Windows Installer XML v3.6\SDK\lib\dutil_2010_x64.lib" "C:\Program Files\Windows Installer XML v3.6\SDK\lib\wcautil_2010_x64.lib"
|
||||||
!ELSE
|
!ELSE
|
||||||
WIX_LIB = "C:\Program Files\Windows Installer XML v3.6\SDK\VS2010\lib\x86"
|
WIX_LIBS = "C:\Program Files\Windows Installer XML v3.6\SDK\lib\dutil_2010.lib" "C:\Program Files\Windows Installer XML v3.6\SDK\lib\wcautil_2010.lib"
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
|
@ -15,7 +15,7 @@ lib_LTLIBRARIES = customactions@LIBRARY_BITNESS@.la
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)
|
AM_CPPFLAGS = -I$(top_srcdir)
|
||||||
|
|
||||||
|
|
||||||
customactions@LIBRARY_BITNESS@_la_SOURCES = customactions.c customactions.exports
|
customactions@LIBRARY_BITNESS@_la_SOURCES = customactions.cpp customactions.exports
|
||||||
customactions@LIBRARY_BITNESS@_la_LIBADD = \
|
customactions@LIBRARY_BITNESS@_la_LIBADD = \
|
||||||
$(top_builddir)/win32/customactions.la
|
$(top_builddir)/win32/customactions.la
|
||||||
customactions@LIBRARY_BITNESS@_la_LDFLAGS = $(AM_LDFLAGS) \
|
customactions@LIBRARY_BITNESS@_la_LDFLAGS = $(AM_LDFLAGS) \
|
||||||
|
|
|
@ -11,14 +11,13 @@ customactions.dll: customactions.obj
|
||||||
echo LIBRARY $* > $*.def
|
echo LIBRARY $* > $*.def
|
||||||
echo EXPORTS >> $*.def
|
echo EXPORTS >> $*.def
|
||||||
type customactions.exports >> $*.def
|
type customactions.exports >> $*.def
|
||||||
link /dll $(LINKFLAGS) /def:$*.def /out:customactions.dll customactions.obj msi.lib $(WIX_LIB)\dutil.lib $(WIX_LIB)\wcautil.lib
|
link /dll $(LINKFLAGS) /def:$*.def /out:customactions.dll customactions.obj msi.lib $(WIX_LIBS)
|
||||||
|
|
||||||
|
|
||||||
OpenSC.msi: OpenSC.wixobj
|
OpenSC.msi: OpenSC.wixobj
|
||||||
$(WIX_PATH)\bin\light.exe -sh -ext WixUIExtension -ext WiXUtilExtension $?
|
$(WIX_PATH)\bin\light.exe -sh -ext WixUIExtension -ext WiXUtilExtension $?
|
||||||
|
|
||||||
OpenSC.wixobj: OpenSC.wxs customactions.dll
|
OpenSC.wixobj: OpenSC.wxs customactions.dll
|
||||||
$(WIX_PATH)\bin\candle.exe -ext WiXUtilExtension -dSOURCE_DIR=$(TOPDIR) $(CANDLEFLAGS) $?
|
$(WIX_PATH)\bin\candle.exe -ext WiXUtilExtension -dSOURCE_DIR=$(TOPDIR) $(CANDLEFLAGS) OpenSC.wxs
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
del /Q config.h *.msi *.wixobj *.wixpdb
|
del /Q config.h *.msi *.wixobj *.wixpdb
|
||||||
|
|
|
@ -33,6 +33,10 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
#include <tchar.h>
|
||||||
|
#include <strsafe.h>
|
||||||
|
|
||||||
|
#include <msiquery.h>
|
||||||
|
|
||||||
// WiX Header Files:
|
// WiX Header Files:
|
||||||
#include <wcautil.h>
|
#include <wcautil.h>
|
Loading…
Reference in New Issue