Skip to content

Commit

Permalink
Updating Inno Setup installer for 1.8
Browse files Browse the repository at this point in the history 
Updating Inno Setup installer for 1.8
  • Loading branch information
@danames
danames committed Nov 5, 2018
1 parent 5b1b092 commit 6d574f8
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 19 deletions.
39 changes: 23 additions & 16 deletions Installer/setup.iss
View file
Expand Up @@ -10,12 +10,13 @@
;; define some version parameters ;; define some version parameters
;; from http://stackoverflow.com/questions/357803/automated-build-version-number-with-wix-inno-setup-and-vs2008 ;; from http://stackoverflow.com/questions/357803/automated-build-version-number-with-wix-inno-setup-and-vs2008
;; or maybe http://agiletracksoftware.com/blog.html?id=4 ;; or maybe http://agiletracksoftware.com/blog.html?id=4
#define AppName "HydroDesktop 1.7.3" #define AppName "HydroDesktop 1.8.0"
#define SrcApp "HydroDesktop_1_7_3.exe" #define SrcApp "HydroDesktop.exe"
#define FileVerStr GetFileVersion(SrcApp) #define FileVerStr GetFileVersion(SrcApp)
;#define StripBuild(str VerStr) Copy(VerStr, 1, RPos(".", VerStr)-1) ;#define StripBuild(str VerStr) Copy(VerStr, 1, RPos(".", VerStr)-1)
#define StripBuild(VerStr) Copy(VerStr, 1, RPos(".", VerStr)-1) ;#define StripBuild(VerStr) Copy(VerStr, 1, RPos(".", VerStr)-1)
#define AppVerStr StripBuild(FileVerStr) ;#define AppVerStr StripBuild(FileVerStr)
#define AppVerStr "1.8.0"
;#define MyAppPublisher "CUAHSI" ;#define MyAppPublisher "CUAHSI"
;#define MyAppURL "http://www.hydrodesktop.org" ;#define MyAppURL "http://www.hydrodesktop.org"
;#define MyOutputBaseFilename "HydroDesktop09_Installer" ;#define MyOutputBaseFilename "HydroDesktop09_Installer"
Expand All @@ -40,24 +41,26 @@
AppID={{52A4C3C0-3B01-4455-B3DF-CE7BCADCB714} AppID={{52A4C3C0-3B01-4455-B3DF-CE7BCADCB714}


PrivilegesRequired=poweruser PrivilegesRequired=poweruser
MinVersion=,5.01 MinVersion=5.01
; Necessary setting for the 64bit version ; Necessary setting for the 64bit version
ArchitecturesInstallIn64BitMode="x64 ia64" ArchitecturesInstallIn64BitMode="x64 ia64"
AppName={#AppName} AppName={#AppName}
AppVersion={#AppVerStr} AppVersion={#AppVerStr}
AppVerName={#AppName} {#AppVerStr} ;AppVerName={#AppName} {#AppVerStr}
UninstallDisplayName={#AppName} {#AppVerStr} AppVerName={#AppName}
;UninstallDisplayName={#AppName} {#AppVerStr}
UninstallDisplayName={#AppName}
VersionInfoVersion={#FileVerStr} VersionInfoVersion={#FileVerStr}
VersionInfoTextVersion={#AppVerStr} VersionInfoTextVersion={#AppVerStr}
;OutputBaseFilename=MyApp-{#FileVerStr}-setup ;OutputBaseFilename=MyApp-{#FileVerStr}-setup
AppPublisher="CUAHSI" AppPublisher="CUAHSI"
AppPublisherURL="www.cuahsi.org" AppPublisherURL="www.cuahsi.org"
AppSupportURL="www.hydrodesktop.org" AppSupportURL="www.hydrodesktop.org"
AppUpdatesURL="www.hydrodesktop.org" AppUpdatesURL="www.hydrodesktop.org"
AppCopyright=Copyright © CUAHSI 2009-2012 AppCopyright=Copyright © CUAHSI 2009-2018
AppContact="www.hydrodesktop.org" AppContact="www.hydrodesktop.org"
VersionInfoCompany=CUAHSI [www.cuahsi.org] VersionInfoCompany=CUAHSI [www.cuahsi.org]
VersionInfoCopyright=Mozilla Public License (MPL) 1.1 VersionInfoCopyright=MIT License [https://opensource.org/licenses/MIT]
VersionInfoDescription=HydroDesktop [www.HydroDesktop.org] VersionInfoDescription=HydroDesktop [www.HydroDesktop.org]
VersionInfoProductName="{#AppName} {#AppVerStr} VersionInfoProductName="{#AppName} {#AppVerStr}
VersionInfoProductVersion={#AppVerStr} VersionInfoProductVersion={#AppVerStr}
Expand All @@ -72,7 +75,7 @@ AlwaysShowComponentsList=false
;InfoBeforeFile=Source\..\..\Documents\Pre-install.txt ;InfoBeforeFile=Source\..\..\Documents\Pre-install.txt
;InfoAfterFile=Source\..\..\Documents\Post-install.txt ;InfoAfterFile=Source\..\..\Documents\Post-install.txt
OutputDir=Releases OutputDir=Releases
OutputBaseFilename="HydroDesktop16_Installer" OutputBaseFilename="HydroDesktop_1_8_Installer"
;install to a separate directory ;install to a separate directory
UsePreviousAppDir=no UsePreviousAppDir=no
Expand All @@ -95,6 +98,12 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files] [Files]
;Core Executable
Source: "..\Binaries\HydroDesktop_1_8.exe"; DestDir: "{app}"; DestName: "{#SrcApp}"; Flags: ignoreversion;
Source: "..\Binaries\HydroDesktop_1_8.exe.config"; DestDir: "{app}"; DestName: "{#SrcApp}.config"; Flags: ignoreversion;
;DLLs
Source: "..\Binaries\HydroDesktop.*.dll"; DestDir: "{app}"; Flags: ignoreversion; Source: "..\Binaries\HydroDesktop.*.dll"; DestDir: "{app}"; Flags: ignoreversion;
Source: "..\Binaries\DotSpatial.*.dll"; DestDir: "{app}"; Flags: ignoreversion; Source: "..\Binaries\DotSpatial.*.dll"; DestDir: "{app}"; Flags: ignoreversion;
Source: "..\Binaries\Microsoft.*.dll"; DestDir: "{app}"; Flags: ignoreversion; Source: "..\Binaries\Microsoft.*.dll"; DestDir: "{app}"; Flags: ignoreversion;
Expand All @@ -106,15 +115,13 @@ Source: "..\Binaries\ZedGraph.dll*"; DestDir: "{app}"; Flags: ignoreversion;
Source: "..\Binaries\x86\SQLite.Interop.dll"; DestDir: "{app}\x86"; Flags: ignoreversion; Source: "..\Binaries\x86\SQLite.Interop.dll"; DestDir: "{app}\x86"; Flags: ignoreversion;
Source: "..\Binaries\x64\SQLite.Interop.dll"; DestDir: "{app}\x64"; Flags: ignoreversion; Source: "..\Binaries\x64\SQLite.Interop.dll"; DestDir: "{app}\x64"; Flags: ignoreversion;
Source: "..\Binaries\HydroDesktopSplashLogo.png"; DestDir: "{app}"; Flags: ignoreversion; Source: "..\Binaries\HydroDesktopSplashLogo.png"; DestDir: "{app}"; Flags: ignoreversion;
Source: "..\Binaries\HydroDesktop_1_6_dev.exe"; DestDir: "{app}"; DestName: "{#SrcApp}"; Flags: ignoreversion;
Source: "..\Binaries\HydroDesktop_1_6_dev.exe.config"; DestDir: "{app}"; DestName: "{#SrcApp}.config"; Flags: ignoreversion;
;Plugins ;Plugins
Source: "..\Binaries\Plugins\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages"; Flags: recursesubdirs ignoreversion; Source: "..\Binaries\Plugins\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages"; Flags: recursesubdirs ignoreversion;
Source: "..\Source\packages\DotSpatial.Plugins.ExtensionManager.1.1.4\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.ExtensionManager.1.1.4"; Flags: recursesubdirs ignoreversion; ;Source: "..\Source\packages\DotSpatial.Plugins.ExtensionManager.1.1.4\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.ExtensionManager.1.1.4"; Flags: recursesubdirs ignoreversion;
Source: "..\Source\packages\DotSpatial.Plugins.MenuBar.1.0.1200\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.MenuBar.1.0.1200"; Flags: recursesubdirs ignoreversion; ;Source: "..\Source\packages\DotSpatial.Plugins.MenuBar.1.0.1200\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.MenuBar.1.0.1200"; Flags: recursesubdirs ignoreversion;
Source: "..\Source\packages\DotSpatial.Plugins.Ribbon.1.4.38\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.Ribbon.1.4.38"; Flags: recursesubdirs ignoreversion; ;Source: "..\Source\packages\DotSpatial.Plugins.Ribbon.1.4.38\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.Ribbon.1.4.38"; Flags: recursesubdirs ignoreversion;
Source: "..\Source\packages\DotSpatial.Plugins.WebMap.1.1.0.0\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.WebMap.1.1.0.0"; Flags: recursesubdirs ignoreversion; ;Source: "..\Source\packages\DotSpatial.Plugins.WebMap.1.1.0.0\*"; DestDir: "{commonappdata}\{#SrcApp}\Extensions\Packages\DotSpatial.Plugins.WebMap.1.1.0.0"; Flags: recursesubdirs ignoreversion;
;Windows Specific Folders ;Windows Specific Folders
Source: "..\Binaries\Support\Windows\*"; DestDir: "{app}\Support\Windows\"; Flags: ignoreversion; Source: "..\Binaries\Support\Windows\*"; DestDir: "{app}\Support\Windows\"; Flags: ignoreversion;
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/HydroDesktop.MainApplication/HydroDesktop.MainApplication.csproj
View file
Expand Up @@ -9,7 +9,7 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HydroDesktop.MainApplication</RootNamespace> <RootNamespace>HydroDesktop.MainApplication</RootNamespace>
<AssemblyName>HydroDesktop</AssemblyName> <AssemblyName>HydroDesktop_1_8</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile> <TargetFrameworkProfile>
</TargetFrameworkProfile> </TargetFrameworkProfile>
Expand All @@ -26,7 +26,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<DocumentationFile>..\..\..\Binaries\HydroDesktop.xml</DocumentationFile> <DocumentationFile>..\..\..\Binaries\HydroDesktop_1_8.xml</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
Expand All @@ -48,7 +48,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<DocumentationFile>..\..\..\Binaries\HydroDesktop.xml</DocumentationFile> <DocumentationFile>..\..\..\Binaries\HydroDesktop_1_8.xml</DocumentationFile>
<NoWarn>1591</NoWarn> <NoWarn>1591</NoWarn>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
Expand Down

0 comments on commit 6d574f8

Please sign in to comment.