Skip to content

Commit

Permalink
Rename splitting go code to gen_msi_wxs.go
Browse files Browse the repository at this point in the history
it does more than just splitting the bundles now it also
generates the product.wxs file from the template
  • Loading branch information
anjannath authored and praveenkumar committed Aug 30, 2021
1 parent 516f582 commit 3e596b9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -304,15 +304,15 @@ $(GOPATH)/bin/gomod2rpmdeps:
-e 's/__OPENSHIFT_VERSION__/'$(BUNDLE_VERSION)'/g' \
$< >$@

$(HOST_BUILD_DIR)/split: packaging/windows/split.go
go build -o $(HOST_BUILD_DIR)/split -ldflags="-X main.crcVersion=$(CRC_VERSION)" packaging/windows/split.go
$(HOST_BUILD_DIR)/GenMsiWxs: packaging/windows/gen_msi_wxs.go
go build -o $@ -ldflags="-X main.crcVersion=$(CRC_VERSION)" $<

CRC_EXE=crc.exe
BUNDLE_NAME=crc_hyperv_$(BUNDLE_VERSION).$(BUNDLE_EXTENSION)

.PHONY: msidir
msidir: LDFLAGS+= -X '$(REPOPATH)/pkg/crc/version.installerBuild=true' $(RELEASE_VERSION_VARIABLES)
msidir: clean $(HOST_BUILD_DIR)/crc-embedder $(HOST_BUILD_DIR)/split $(BUILD_DIR)/windows-amd64/crc.exe check_bundledir $(PACKAGE_DIR)/product.wxs.template
msidir: clean $(HOST_BUILD_DIR)/crc-embedder $(HOST_BUILD_DIR)/GenMsiWxs $(BUILD_DIR)/windows-amd64/crc.exe check_bundledir $(PACKAGE_DIR)/product.wxs.template
mkdir -p $(PACKAGE_DIR)/msi
$(HOST_BUILD_DIR)/crc-embedder download $(PACKAGE_DIR)/msi
cp $(HOST_BUILD_DIR)/crc.exe $(PACKAGE_DIR)/msi/$(CRC_EXE)
Expand All @@ -321,7 +321,7 @@ ifeq ($(MOCK_BUNDLE),true)
touch $(PACKAGE_DIR)/msi/$(BUNDLE_NAME)
endif
cp $(HYPERV_BUNDLENAME) $(PACKAGE_DIR)/msi
$(HOST_BUILD_DIR)/split $(PACKAGE_DIR)/msi/$(BUNDLE_NAME)
$(HOST_BUILD_DIR)/GenMsiWxs $(PACKAGE_DIR)/msi/$(BUNDLE_NAME)
rm $(PACKAGE_DIR)/msi/$(BUNDLE_NAME)
cp -r $(PACKAGE_DIR)/Resources $(PACKAGE_DIR)/msi/
cp $(PACKAGE_DIR)/*.wxs $(PACKAGE_DIR)/msi
Expand Down
File renamed without changes.

0 comments on commit 3e596b9

Please sign in to comment.