When locally installed prebuild MSM is found, the build process clones it automatically now.
This commit is contained in:
parent
371d648819
commit
f56e7574d9
23
Makefile
23
Makefile
@ -81,9 +81,14 @@ MSIBUILD_PLAT=Intel
|
|||||||
!ELSE
|
!ELSE
|
||||||
MSIBUILD_PLAT=$(PLAT)
|
MSIBUILD_PLAT=$(PLAT)
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
|
||||||
|
MSIBUILD_MSM_MS_REPO=$(PROGRAMW6432) (x86)\Common Files\Merge Modules
|
||||||
|
!ELSE
|
||||||
|
MSIBUILD_MSM_MS_REPO=$(COMMONPROGRAMFILES)\Merge Modules
|
||||||
|
!ENDIF
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
# Target stubs
|
# Target Stubs
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
All ::
|
All ::
|
||||||
@ -151,6 +156,9 @@ $(MSIBUILD_MODULES) ::
|
|||||||
$(MAKE) /f "Makefile" /$(MAKEFLAGS) MSIBUILD_HAS_VERSION=1
|
$(MAKE) /f "Makefile" /$(MAKEFLAGS) MSIBUILD_HAS_VERSION=1
|
||||||
cd "$(MAKEDIR)"
|
cd "$(MAKEDIR)"
|
||||||
|
|
||||||
|
$(MSIBUILD_MODULES_PRECOMPILED) ::
|
||||||
|
if exist "$(MSIBUILD_MSM_MS_REPO)\$(@F:"=)" $(MAKE) /f "Makefile" /$(MAKEFLAGS) MSIBUILD_PHASE=90 MSIBUILD_MSM_SRC="$(MSIBUILD_MSM_MS_REPO)\$(@F:"=)" MSIBUILD_MSM_DST=$@ All
|
||||||
|
|
||||||
!ELSEIF $(MSIBUILD_PHASE) == 2
|
!ELSEIF $(MSIBUILD_PHASE) == 2
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
@ -221,10 +229,21 @@ All :: \
|
|||||||
attrib.exe +r "$(@:"=).tmp"
|
attrib.exe +r "$(@:"=).tmp"
|
||||||
move /y "$(@:"=).tmp" $@ > NUL
|
move /y "$(@:"=).tmp" $@ > NUL
|
||||||
|
|
||||||
|
!ELSEIF $(MSIBUILD_PHASE) == 90
|
||||||
|
|
||||||
|
######################################################################
|
||||||
|
# MSM Copy from Repository Phase
|
||||||
|
######################################################################
|
||||||
|
|
||||||
|
All :: "$(MSIBUILD_MSM_DST)"
|
||||||
|
|
||||||
|
"$(MSIBUILD_MSM_DST)" : "$(MSIBUILD_MSM_SRC)"
|
||||||
|
copy /y $** $@ > NUL
|
||||||
|
|
||||||
!ELSE
|
!ELSE
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
# Cleanup phase
|
# Cleanup Phase
|
||||||
# - Cleaning modules
|
# - Cleaning modules
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user