Mercurial > hg > release > icedtea-web-1.7
changeset 1434:b1a36c9a5a32
Makefile.am: installer renamed to itw-installer.msi, relative paths in json.in sedded to absolute ones to allow build in different build dir.
author | Jiri Vanek <jvanek@redhat.com> |
---|---|
date | Mon, 15 May 2017 16:58:43 +0200 |
parents | 6088323af92c |
children | c4808d9c611f |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon May 15 16:20:41 2017 +0200 +++ b/ChangeLog Mon May 15 16:58:43 2017 +0200 @@ -1,3 +1,8 @@ +2017-12-10 Jiri Vanek <jvanek@redhat.com> + + * Makefile.am: installer renamed to itw-installer.msi, relative paths + in json.in sedded to absolute ones to allow build in different build dir. + 2017-12-10 Alex Kashchenko <akashche@redhat.com> Jiri Vanek <jvanek@redhat.com>
--- a/Makefile.am Mon May 15 16:20:41 2017 +0200 +++ b/Makefile.am Mon May 15 16:58:43 2017 +0200 @@ -396,14 +396,16 @@ clean-win-installer: rm -rf $(WIN_INSTALLER_DIR) -$(WIN_INSTALLER_DIR)/installer.json: clean-win-installer +$(WIN_INSTALLER_DIR)/itw-installer.json: clean-win-installer mkdir $(WIN_INSTALLER_DIR) - sed -e s/[@]PACKAGE_VERSION[@]/$(PACKAGE_VERSION)/g $(WIN_INSTALLER_SRC_DIR)/installer.json.in > $@ + sed \ + -e "s|../win-installer|$(WIN_INSTALLER_SRC_DIR)|g" \ + -e s/[@]PACKAGE_VERSION[@]/$(PACKAGE_VERSION)/g $(WIN_INSTALLER_SRC_DIR)/installer.json.in > $@ -win-installer: win-only-image $(WIN_INSTALLER_DIR)/installer.json - "$(JAVA)" -jar "$(WIXGEN_JAR)" "$(DESTDIR)$(prefix)" -c $(WIN_INSTALLER_DIR)/installer.json -o $(WIN_INSTALLER_DIR)/installer.wxs - cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/candle.exe /nologo installer.wxs - cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/light.exe /nologo -ext WixUIExtension installer.wixobj +win-installer: win-only-image $(WIN_INSTALLER_DIR)/itw-installer.json + "$(JAVA)" -jar "$(WIXGEN_JAR)" "$(DESTDIR)$(prefix)" -c $(WIN_INSTALLER_DIR)/itw-installer.json -o $(WIN_INSTALLER_DIR)/itw-installer.wxs + cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/candle.exe /nologo itw-installer.wxs + cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/light.exe /nologo -ext WixUIExtension itw-installer.wixobj endif # note that this is called only from windows specific target (hidden otherwise)