Permalink
Browse files

Generate dotInstaller setup_conf.xml.

Uses version numbers from main Swish CMakeLists.txt.
  • Loading branch information...
1 parent 0f00665 commit 2038c7b6fa8fbc299aeca4f805a07457c6d1d0f7 @alamaison committed May 13, 2015
Showing with 24 additions and 18 deletions.
  1. +8 −1 CMakeLists.txt
  2. +0 −1 build/making_a_release.txt
  3. +16 −16 setup_conf.xml → setup_conf.xml.in
View
@@ -72,4 +72,11 @@ string(TIMESTAMP PUBLICATION_DATE UTC)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/appcast.xml.in
${CMAKE_CURRENT_BINARY_DIR}/appcast.xml
- @ONLY)
+ @ONLY)
+
+set(SWISH_COPYRIGHT "Copyright (C) 2006-2015 Alexander Lamaison and Contributors")
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/setup_conf.xml.in
+ ${CMAKE_CURRENT_BINARY_DIR}/setup_conf.xml
+ @ONLY)
@@ -1,6 +1,5 @@
Update version number in:
- top-level CMakeLists.txt
-- setup_conf.xml (x4)
- wix/swish.wxs
- wix/wix.wixproj
- swish/versions/metadata.h (x1 and copyright date)
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configurations lcid_type="UserExe" show_language_selector="False" language_selector_title="" language_selector_ok="OK" language_selector_cancel="Cancel" configuration_no_match_message="" ui_level="basic" fileversion="0.8.2.0" productversion="0.8.2.0" log_enabled="False" log_file="#TEMPPATH\dotNetInstallerLog.txt">
- <schema version="2.0.81.0" generator="dotNetInstaller InstallerEditor" />
- <fileattributes>
- <fileattribute name="ProductName" value="Swish" />
- <fileattribute name="LegalCopyright" value="Copyright (C) 2011, 2012 Alexander Lamaison &amp; Contributors" />
- <fileattribute name="FileDescription" value="Swish x86/x64 installer" />
- <fileattribute name="CompanyName" value="swish-sftp.org" />
- </fileattributes>
- <configuration dialog_caption="Swish Installer" dialog_message="In order to install Swish you must first install these components:" dialog_message_uninstall="" dialog_bitmap="#APPPATH\banner.bmp" skip_caption="Skip" install_caption="Install" uninstall_caption="Uninstall" cancel_caption="Close" status_installed=" (Installed)" status_notinstalled="" failed_exec_command_continue="" installation_completed="" uninstallation_completed="" installation_none="Swish is already installed!" uninstallation_none="Swish is not installed!" installing_component_wait="Installing %s. Wait, this operation could take some time ..." uninstalling_component_wait="Uninstalling %s. Wait, this operation could take some time ..." reboot_required="To continue the installation you must restart your computer. Restart now?" must_reboot_required="False" dialog_otherinfo_caption="" dialog_otherinfo_link="" complete_command="" complete_command_silent="" complete_command_basic="" wait_for_complete_command="True" auto_close_if_installed="True" auto_close_on_error="True" reload_on_error="False" dialog_show_installed="False" dialog_show_uninstalled="False" dialog_show_required="False" cab_dialog_message="%s" cab_cancelled_message="" cab_dialog_caption="" cab_path="#TEMPPATH\#GUID" cab_path_autodelete="True" dialog_default_button="cancel" dialog_position="" dialog_components_list_position="" dialog_message_position="" dialog_bitmap_position="" dialog_otherinfo_link_position="" dialog_osinfo_position="" dialog_install_button_position="" dialog_cancel_button_position="" dialog_skip_button_position="" auto_start="True" auto_continue_on_reboot="False" reboot_cmd="" show_progress_dialog="False" show_cab_dialog="True" disable_wow64_fs_redirection="False" administrator_required="False" administrator_required_message="APPLICATION_NAME installation requires administration rights." type="install" lcid_filter="" language_id="" language="" os_filter="" os_filter_min="" os_filter_max="" processor_architecture_filter="" supports_install="True" supports_uninstall="True">
- <component package="#CABPATH\swish-x86.msi" cmdparameters="" cmdparameters_silent="" cmdparameters_basic="" uninstall_package="" uninstall_cmdparameters="/qb-" uninstall_cmdparameters_silent="/qn" uninstall_cmdparameters_basic="/qb-" disable_wow64_fs_redirection="False" id="swish-Win32" display_name="swish-x86.msi" uninstall_display_name="" os_filter="" os_filter_min="" os_filter_max="" os_filter_lcid="" type="msi" installcompletemessage="" uninstallcompletemessage="" mustreboot="False" reboot_required="" must_reboot_required="False" failed_exec_command_continue="" allow_continue_on_error="False" default_continue_on_error="False" required_install="True" required_uninstall="True" selected_install="True" selected_uninstall="True" note="" processor_architecture_filter="x86" status_installed="" status_notinstalled="" supports_install="True" supports_uninstall="True" show_progress_dialog="False" show_cab_dialog="False" />
- <component package="#CABPATH\swish-x64.msi" cmdparameters="" cmdparameters_silent="" cmdparameters_basic="" uninstall_package="" uninstall_cmdparameters="/qb-" uninstall_cmdparameters_silent="/qn" uninstall_cmdparameters_basic="/qb-" disable_wow64_fs_redirection="False" id="swish-x64" display_name="swish-x64.msi" uninstall_display_name="" os_filter="" os_filter_min="" os_filter_max="" os_filter_lcid="" type="msi" installcompletemessage="" uninstallcompletemessage="" mustreboot="False" reboot_required="" must_reboot_required="False" failed_exec_command_continue="" allow_continue_on_error="False" default_continue_on_error="False" required_install="True" required_uninstall="True" selected_install="True" selected_uninstall="True" note="" processor_architecture_filter="x64" status_installed="" status_notinstalled="" supports_install="True" supports_uninstall="True" show_progress_dialog="False" show_cab_dialog="False" />
- <embedfile sourcefilepath=".\bin\Release-Win32\swish-0.8.2.msi" targetfilepath="swish-x86.msi" />
- <embedfile sourcefilepath=".\bin\Release-x64\swish-0.8.2.msi" targetfilepath="swish-x64.msi" />
- </configuration>
-</configurations>
+<?xml version="1.0" encoding="utf-8"?>
+<configurations lcid_type="UserExe" show_language_selector="False" language_selector_title="" language_selector_ok="OK" language_selector_cancel="Cancel" configuration_no_match_message="" ui_level="basic" fileversion="@swish_VERSION@.0" productversion="@swish_VERSION@.0" log_enabled="False" log_file="#TEMPPATH\dotNetInstallerLog.txt">
+ <schema version="2.0.81.0" generator="dotNetInstaller InstallerEditor" />
+ <fileattributes>
+ <fileattribute name="ProductName" value="Swish" />
+ <fileattribute name="LegalCopyright" value="@SWISH_COPYRIGHT@" />
+ <fileattribute name="FileDescription" value="Swish x86/x64 installer" />
+ <fileattribute name="CompanyName" value="swish-sftp.org" />
+ </fileattributes>
+ <configuration dialog_caption="Swish Installer" dialog_message="In order to install Swish you must first install these components:" dialog_message_uninstall="" dialog_bitmap="#APPPATH\banner.bmp" skip_caption="Skip" install_caption="Install" uninstall_caption="Uninstall" cancel_caption="Close" status_installed=" (Installed)" status_notinstalled="" failed_exec_command_continue="" installation_completed="" uninstallation_completed="" installation_none="Swish is already installed!" uninstallation_none="Swish is not installed!" installing_component_wait="Installing %s. Wait, this operation could take some time ..." uninstalling_component_wait="Uninstalling %s. Wait, this operation could take some time ..." reboot_required="To continue the installation you must restart your computer. Restart now?" must_reboot_required="False" dialog_otherinfo_caption="" dialog_otherinfo_link="" complete_command="" complete_command_silent="" complete_command_basic="" wait_for_complete_command="True" auto_close_if_installed="True" auto_close_on_error="True" reload_on_error="False" dialog_show_installed="False" dialog_show_uninstalled="False" dialog_show_required="False" cab_dialog_message="%s" cab_cancelled_message="" cab_dialog_caption="" cab_path="#TEMPPATH\#GUID" cab_path_autodelete="True" dialog_default_button="cancel" dialog_position="" dialog_components_list_position="" dialog_message_position="" dialog_bitmap_position="" dialog_otherinfo_link_position="" dialog_osinfo_position="" dialog_install_button_position="" dialog_cancel_button_position="" dialog_skip_button_position="" auto_start="True" auto_continue_on_reboot="False" reboot_cmd="" show_progress_dialog="False" show_cab_dialog="True" disable_wow64_fs_redirection="False" administrator_required="False" administrator_required_message="APPLICATION_NAME installation requires administration rights." type="install" lcid_filter="" language_id="" language="" os_filter="" os_filter_min="" os_filter_max="" processor_architecture_filter="" supports_install="True" supports_uninstall="True">
+ <component package="#CABPATH\swish-x86.msi" cmdparameters="" cmdparameters_silent="" cmdparameters_basic="" uninstall_package="" uninstall_cmdparameters="/qb-" uninstall_cmdparameters_silent="/qn" uninstall_cmdparameters_basic="/qb-" disable_wow64_fs_redirection="False" id="swish-Win32" display_name="swish-x86.msi" uninstall_display_name="" os_filter="" os_filter_min="" os_filter_max="" os_filter_lcid="" type="msi" installcompletemessage="" uninstallcompletemessage="" mustreboot="False" reboot_required="" must_reboot_required="False" failed_exec_command_continue="" allow_continue_on_error="False" default_continue_on_error="False" required_install="True" required_uninstall="True" selected_install="True" selected_uninstall="True" note="" processor_architecture_filter="x86" status_installed="" status_notinstalled="" supports_install="True" supports_uninstall="True" show_progress_dialog="False" show_cab_dialog="False" />
+ <component package="#CABPATH\swish-x64.msi" cmdparameters="" cmdparameters_silent="" cmdparameters_basic="" uninstall_package="" uninstall_cmdparameters="/qb-" uninstall_cmdparameters_silent="/qn" uninstall_cmdparameters_basic="/qb-" disable_wow64_fs_redirection="False" id="swish-x64" display_name="swish-x64.msi" uninstall_display_name="" os_filter="" os_filter_min="" os_filter_max="" os_filter_lcid="" type="msi" installcompletemessage="" uninstallcompletemessage="" mustreboot="False" reboot_required="" must_reboot_required="False" failed_exec_command_continue="" allow_continue_on_error="False" default_continue_on_error="False" required_install="True" required_uninstall="True" selected_install="True" selected_uninstall="True" note="" processor_architecture_filter="x64" status_installed="" status_notinstalled="" supports_install="True" supports_uninstall="True" show_progress_dialog="False" show_cab_dialog="False" />
+ <embedfile sourcefilepath=".\bin\Release-Win32\swish-@swish_VERSION@.msi" targetfilepath="swish-x86.msi" />
+ <embedfile sourcefilepath=".\bin\Release-x64\swish-@swish_VERSION@.msi" targetfilepath="swish-x64.msi" />
+ </configuration>
+</configurations>

0 comments on commit 2038c7b

Please sign in to comment.