diff options
| author | pmichaud <pmichaud@pobox.com> | 2012-07-28 02:08:34 -0500 |
|---|---|---|
| committer | pmichaud <pmichaud@pobox.com> | 2012-07-28 02:08:34 -0500 |
| commit | 12b921c0c021f28ddfa0e41346eb6e162eb16e80 (patch) | |
| tree | 07451b87698a4da382dc29e8e6be7df3bdb4292d /skel/tools/build/Makefile.in | |
| parent | 9132003e48d4d0be818e368aa03533ce84547ae3 (diff) | |
Refactor .msi building process a fair bit.
Diffstat (limited to 'skel/tools/build/Makefile.in')
| -rw-r--r-- | skel/tools/build/Makefile.in | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/skel/tools/build/Makefile.in b/skel/tools/build/Makefile.in index 84d7499..deeefa4 100644 --- a/skel/tools/build/Makefile.in +++ b/skel/tools/build/Makefile.in @@ -4,7 +4,7 @@ PARROT = parrot-4.6.0 NQP = nqp-2012.07 RAKUDO = rakudo-2012.07 -STAR = rakudo-star-2012.07 +STAR_VERSION = 2012.07 PARROT_ARGS = @@ -49,7 +49,6 @@ LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @libs@ @icu_shared@ PERL6_EXE = perl6$(EXE) PERL6_LANG_DIR = $(PARROT_LIB_DIR)/languages/perl6 -STAR_WXS = $(STAR).wxs # This list must be kept in order, modules always coming after their # dependencies @@ -157,14 +156,10 @@ CRITIC_FILES=Configure.pl tools/build/ perlcritic: perlcritic -1 --profile tools/util/perlcritic.conf $(CRITIC_FILES) -$(STAR_WXS): $(PARROT_BIN_DIR) $(PREFIX_DIR) +msi: -$(CP) c:/strawberry/c/bin/libgcc_s_sjlj-1.dll $(PARROT_BIN_DIR) - cmd /c heat dir $(PREFIX_DIR) -gg -sfrag -template product -cg RakudoStar -out $(STAR_WXS) - $(PERL) -ibak tools/build/wxs-patch.pl $(STAR_WXS) - -wxs: $(STAR_WXS) - -msi: $(STAR_WXS) - cmd /c candle $(STAR_WXS) - cmd /c light -b $(PREFIX_DIR) $(STAR).wixobj + cmd /c heat dir rakudo -gg -sfrag -cg RakudoStar -dr INSTALLROOT -srd -out star-files.wxs + cmd /c candle star-files.wxs + cmd /c candle -dSTARVERSION=$(STAR_VERSION) tools/build/star-product.wxs + cmd /c light -b $(PREFIX_DIR) -ext WixUIExtension star-files.wixobj star-product.wixobj -o rakudo-star-$(STAR_VERSION).msi |