Skip to content

Commit

Permalink
Merge branch 'release-1.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
bovender committed Mar 2, 2017
2 parents fba5721 + abf48d6 commit ad374fa
Show file tree
Hide file tree
Showing 25 changed files with 120 additions and 112 deletions.
8 changes: 8 additions & 0 deletions NEWS
@@ -1,3 +1,11 @@
Version 1.4.1 (2017-03-02)
------------------------------------------------------------------------

- Fix: Removed zero client detection that was not working properly anyway.

* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *


Version 1.4.0 (2016-09-04)
------------------------------------------------------------------------

Expand Down
98 changes: 49 additions & 49 deletions README.md
Expand Up @@ -2,22 +2,22 @@
VstoAddinInstaller
===================

[InnoSetup][] script to install and activate Visual Studio Tools for
Office® (VSTO) addins. VstoAddinInstaller makes heavy use of the
[InnoSetup][] script to install and activate Visual Studio Tools for
Office® (VSTO) addins. VstoAddinInstaller makes heavy use of the
InnoSetup Preprocessor (ISPP).

Features
--------

- Installs Word®, Excel®, PowerPoint®, or Outlook®
- Installs Word®, Excel®, PowerPoint®, or Outlook®
add-ins.
- Downloads and installs .NET and VSTO runtimes if needed.
- Checks if the target application is currently running and can
automatically shut it down before proceeding with the installation
- Checks if the target application is currently running and can
automatically shut it down before proceeding with the installation
process.
- Can be used with an `/UPDATE` switch to silently shut down and
- Can be used with an `/UPDATE` switch to silently shut down and
restart the target application after the installation.
- Modular structure makes it easy to keep custom configuration
- Modular structure makes it easy to keep custom configuration
separate from the core functionality.

The script is based on the installer used by [Daniel's XL Toolbox][].
Expand All @@ -26,11 +26,11 @@ The script is based on the installer used by [Daniel's XL Toolbox][].
Requirements
------------

- [InnoSetup][] with InnoSetup Preprocessor; ideally you would obtain
- [InnoSetup][] with InnoSetup Preprocessor; ideally you would obtain
the InnoSetup QuickStart Pack.
- [InnoSetup Download Plugin][isdp] (takes care of downloading the
- [InnoSetup Download Plugin][isdp] (takes care of downloading the
.NET and VSTO runtime installers on the target system, if needed)
- Visual Studio with Visual Studio Tools for Office (VSTO) (included
- Visual Studio with Visual Studio Tools for Office (VSTO) (included
in the 'Professional' editions).

Some of these requirements should be fairly obvious...
Expand All @@ -39,13 +39,13 @@ Some of these requirements should be fairly obvious...
Instructions for use
--------------------

VstoAddinInstaller is designed to keep itself out of your way: After
downloading and extracting the [archive][zip] (or cloning the [Git][]
repository), you should have a dedicated folder 'VstoAddinInstaller'
in your solution directory. You won't have to edit anything inside the
VstoAddinInstaller directory. A configuration file can be copied from
an example file `make-installer.dist.iss` from the `config-dist`
subdirectory to your solution's directory, where you may want to
VstoAddinInstaller is designed to keep itself out of your way: After
downloading and extracting the [archive][zip] (or cloning the [Git][]
repository), you should have a dedicated folder 'VstoAddinInstaller'
in your solution directory. You won't have to edit anything inside the
VstoAddinInstaller directory. A configuration file can be copied from
an example file `make-installer.dist.iss` from the `config-dist`
subdirectory to your solution's directory, where you may want to
include it in your own version control system.

A recommended folder structure is as follows:
Expand Down Expand Up @@ -78,57 +78,57 @@ A recommended folder structure is as follows:

### Cloning as Git submodule

If you use [Git][] as your version control, you can clone the
VstoAddinInstaller respository into a submodule of your project
If you use [Git][] as your version control, you can clone the
VstoAddinInstaller respository into a submodule of your project
repository:

git submodule add git@github.com:bovender/VstoAddinInstaller.git
You can then easily update the VstoAddinInstaller module by *changing

You can then easily update the VstoAddinInstaller module by *changing
into the directory* and issuing

git pull

Because the entire VstoAddinInstaller repository is contained in the
submodule, you can switch between branches and use the `develop`
Because the entire VstoAddinInstaller repository is contained in the
submodule, you can switch between branches and use the `develop`
branch rather than the `master` branch if you wish to do so.


### Configuring

You need to make a copy of `config-dist\make-installer.dist.iss` and
edit the contents. Ideally you would keep your copy of this file
outside the `VstoAddinInstaller` directory, as shown above, so it does
You need to make a copy of `config-dist\make-installer.dist.iss` and
edit the contents. Ideally you would keep your copy of this file
outside the `VstoAddinInstaller` directory, as shown above, so it does
not get overwritten when you update VstoAddinInstaller.

You can rename the file to `make-installer.iss` or whatever you wish;
the `.dist` part in the original file only serves to indicate that
You can rename the file to `make-installer.iss` or whatever you wish;
the `.dist` part in the original file only serves to indicate that
this is the distributed example file.

Follow along the instructions in your copy of
Follow along the instructions in your copy of
`make-installer.dist.iss`.

**Important**: Each installer produced with InnoSetup must have its
own global unique identifier (GUID). Please insert your own GUID where
indicated. You can generate a GUID using the corresponding command
**Important**: Each installer produced with InnoSetup must have its
own global unique identifier (GUID). Please insert your own GUID where
indicated. You can generate a GUID using the corresponding command
from the `Tools` menu in InnoSetup Studio, for example.


### Compiling the installer

To compile the installer, simply run your copy of `make-installer.iss`
To compile the installer, simply run your copy of `make-installer.iss`
through InnoSetup.


### Extending

If you wish to add additional capabilities to your installer (e.g.
InnoSetup tasks), have a look in the `config-dist` directory where you
If you wish to add additional capabilities to your installer (e.g.
InnoSetup tasks), have a look in the `config-dist` directory where you
will find some example files.

Currently it is not possible to run additonal code during
initialization of setup (`InitializeSetup`) or initialization of the
wizard (`InitializeWizard`). I have been thinking about how to provide
Currently it is not possible to run additonal code during
initialization of setup (`InitializeSetup`) or initialization of the
wizard (`InitializeWizard`). I have been thinking about how to provide
this capability, but have not yet have the time to implement it.


Expand All @@ -137,16 +137,16 @@ Demos

Demo projects are contained in the [demo](demo/) directory.

In order to try out these demo installers, you must first build the
corresponding projects in Visual Studio. The binaries are not contained
In order to try out these demo installers, you must first build the
corresponding projects in Visual Studio. The binaries are not contained
in this repository!


Further information
-------------------

For background information on the prerequisites of a VSTO add-in, see
<http://xltoolbox.net/blog/2015-01-30-net-vsto-add-ins-getting-prerequisites-right.html>.
<https://www.xltoolbox.net/blog/2015-01-30-net-vsto-add-ins-getting-prerequisites-right.html>.


Related
Expand All @@ -162,12 +162,12 @@ VstoAddinInstaller is [semantically versioned][semver] using Git tags.

In short: The version number follows the scheme `MAJOR.MINOR.PATCH`.

- An increase in the `MAJOR` version number signifies API-breaking
changes, i.e., if you decide to upgrade, you *must* adjust your local
- An increase in the `MAJOR` version number signifies API-breaking
changes, i.e., if you decide to upgrade, you *must* adjust your local
copy of `make-install.iss`.
- An increase in the `MINOR` version number denotes new or improved
- An increase in the `MINOR` version number denotes new or improved
features. You can upgrade without adjusting your `make-install.iss`.
- The `PATCH` number is increased with bug fixes. Again, no need to edit
- The `PATCH` number is increased with bug fixes. Again, no need to edit
your copy of `make-install.iss`.


Expand All @@ -176,7 +176,7 @@ License

Published under the [Apache License, Version 2.0](LICENSE).

Copyright (C) 2016 Daniel Kraus (bovender) <http://github.com/bovender>
Copyright (C) 2016-2017 Daniel Kraus (bovender) <https://github.com/bovender>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -190,12 +190,12 @@ Published under the [Apache License, Version 2.0](LICENSE).
See the License for the specific language governing permissions and
limitations under the License.

Microsoft®, Windows®, Office, and Excel&reg;, PowerPoint&reg;, and
Outlook&reg; are either registered trademarks or trademarks of Microsoft
Microsoft®, Windows®, Office, and Excel&reg;, PowerPoint&reg;, and
Outlook&reg; are either registered trademarks or trademarks of Microsoft
Corporation in the United States and/or other countries.

[InnoSetup]: http://www.jrsoftware.org/isinfo.php
[isdp]: http://mitrichsoftware.wordpress.com
[isdp]: http://mitrichsoftware.wordpress.com
[Daniel's XL Toolbox]: https://www.xltoolbox.net
[ZIP]: https://github.com/bovender/VstoAddinInstaller/archive/master.zip
[Git]: http://git-scm.com/downloads
Expand Down
2 changes: 1 addition & 1 deletion config-dist/custom-code.dist.pas
Expand Up @@ -3,7 +3,7 @@
; == custom-code.dist.iss
; == Part of VstoAddinInstaller
; == (https://github.com/bovender/VstoAddinInstaller)
; == (c) 2016 Daniel Kraus <bovender@bovender.de>
; == (c) 2016-2017 Daniel Kraus <bovender@bovender.de>
; == Published under the Apache License 2.0
; == See http://www.apache.org/licenses
; =====================================================================
Expand Down
2 changes: 1 addition & 1 deletion config-dist/custom-files.dist.iss
Expand Up @@ -2,7 +2,7 @@
; == custom-files.dist.iss
; == Part of VstoAddinInstaller
; == (https://github.com/bovender/VstoAddinInstaller)
; == (c) 2016 Daniel Kraus <bovender@bovender.de>
; == (c) 2016-2017 Daniel Kraus <bovender@bovender.de>
; == Published under the Apache License 2.0
; == See http://www.apache.org/licenses
; =====================================================================
Expand Down
2 changes: 1 addition & 1 deletion config-dist/custom-languages.dist.iss
Expand Up @@ -2,7 +2,7 @@
; == custom-languages.dist.iss
; == Part of VstoAddinInstaller
; == (https://github.com/bovender/VstoAddinInstaller)
; == (c) 2016 Daniel Kraus <bovender@bovender.de>
; == (c) 2016-2017 Daniel Kraus <bovender@bovender.de>
; == Published under the Apache License 2.0
; == See http://www.apache.org/licenses
; =====================================================================
Expand Down
2 changes: 1 addition & 1 deletion config-dist/custom-messages.dist.iss
Expand Up @@ -2,7 +2,7 @@
; == custom-messages.dist.iss
; == Part of VstoAddinInstaller
; == (https://github.com/bovender/VstoAddinInstaller)
; == (c) 2016 Daniel Kraus <bovender@bovender.de>
; == (c) 2016-2017 Daniel Kraus <bovender@bovender.de>
; == Published under the Apache License 2.0
; == See http://www.apache.org/licenses
; =====================================================================
Expand Down
2 changes: 1 addition & 1 deletion config-dist/custom-tasks.dist.iss
Expand Up @@ -2,7 +2,7 @@
; == custom-tasks.dist.iss
; == Part of VstoAddinInstaller
; == (https://github.com/bovender/VstoAddinInstaller)
; == (c) 2016 Daniel Kraus <bovender@bovender.de>
; == (c) 2016-2017 Daniel Kraus <bovender@bovender.de>
; == Published under the Apache License 2.0
; == See http://www.apache.org/licenses
; =====================================================================
Expand Down
8 changes: 4 additions & 4 deletions config-dist/make-installer.dist.iss
Expand Up @@ -2,11 +2,11 @@
; == make-installer.iss
; == Part of VstoAddinInstaller
; == (https://github.com/bovender/VstoAddinInstaller)
; == (c) 2016 Daniel Kraus <bovender@bovender.de>
; == (c) 2016-2017 Daniel Kraus <bovender@bovender.de>
; == Published under the Apache License 2.0
; == See http://www.apache.org/licenses
; =====================================================================
;
;
; *** DO NOT EDIT THIS FILE, WORK ON A COPY! ***
; Changes may be lost if the file is updated from the Git repository.
; Make a copy of the file in the parent directory and name it
Expand Down Expand Up @@ -49,8 +49,8 @@
; The version in four-number format
#define FOUR_NUMBER_VERSION "1.0.0.0"

; The year(s) of publication (e.g., "2014-2016")
#define PUB_YEARS "2016"
; The year(s) of publication (e.g., "2014-2017")
#define PUB_YEARS "2017"


; =====================================================================
Expand Down
6 changes: 3 additions & 3 deletions demo/make-installer-excel.iss
Expand Up @@ -2,11 +2,11 @@
; == demo\make-installer-excel.iss
; == Part of VstoAddinInstaller
; == (https://github.com/bovender/VstoAddinInstaller)
; == (c) 2016 Daniel Kraus <bovender@bovender.de>
; == (c) 2016-2017 Daniel Kraus <bovender@bovender.de>
; == Published under the Apache License 2.0
; == See http://www.apache.org/licenses
; =====================================================================
;
;
; This is the configuration file for the demo installer.
; To try out this script, you must first build the VSTO project in
; Visual Studio with Debug configuration.
Expand All @@ -20,7 +20,7 @@
#define COMPANY "Daniel Kraus (bovender)"
#define HOMEPAGE "https://github.com/bovender/VstoAddinInstaller"
#define DESCRIPTION "Demonstrate VstoAddinInstaller with Excel."
#define PUB_YEARS "2016"
#define PUB_YEARS "2017"

#define SOURCEDIR "VstoInstallerDemoExcel\bin\Debug\"
#define VSTOFILE "VstoInstallerDemoExcel.vsto"
Expand Down
6 changes: 3 additions & 3 deletions demo/make-installer-outlook.iss
Expand Up @@ -2,11 +2,11 @@
; == demo\make-installer-outlook.iss
; == Part of VstoAddinInstaller
; == (https://github.com/bovender/VstoAddinInstaller)
; == (c) 2016 Daniel Kraus <bovender@bovender.de>
; == (c) 2016-2017 Daniel Kraus <bovender@bovender.de>
; == Published under the Apache License 2.0
; == See http://www.apache.org/licenses
; =====================================================================
;
;
; This is the configuration file for the demo installer.
; To try out this script, you must first build the VSTO project in
; Visual Studio with Debug configuration.
Expand All @@ -20,7 +20,7 @@
#define COMPANY "Daniel Kraus (bovender)"
#define HOMEPAGE "https://github.com/bovender/VstoAddinInstaller"
#define DESCRIPTION "Demonstrate VstoAddinInstaller with Outlook."
#define PUB_YEARS "2016"
#define PUB_YEARS "2017"

#define SOURCEDIR "VstoInstallerDemoOutlook\bin\Debug\"
#define VSTOFILE "VstoInstallerDemoOutlook.vsto"
Expand Down
6 changes: 3 additions & 3 deletions demo/make-installer-powerpoint.iss
Expand Up @@ -2,11 +2,11 @@
; == demo\make-installer-powerpoint.iss
; == Part of VstoAddinInstaller
; == (https://github.com/bovender/VstoAddinInstaller)
; == (c) 2016 Daniel Kraus <bovender@bovender.de>
; == (c) 2016-2017 Daniel Kraus <bovender@bovender.de>
; == Published under the Apache License 2.0
; == See http://www.apache.org/licenses
; =====================================================================
;
;
; This is the configuration file for the demo installer.
; To try out this script, you must first build the VSTO project in
; Visual Studio with Debug configuration.
Expand All @@ -20,7 +20,7 @@
#define COMPANY "Daniel Kraus (bovender)"
#define HOMEPAGE "https://github.com/bovender/VstoAddinInstaller"
#define DESCRIPTION "Demonstrate VstoAddinInstaller with PowerPoint."
#define PUB_YEARS "2016"
#define PUB_YEARS "2017"

#define SOURCEDIR "VstoInstallerDemoPowerPoint\bin\Debug\"
#define VSTOFILE "VstoInstallerDemoPowerPoint.vsto"
Expand Down
6 changes: 3 additions & 3 deletions demo/make-installer-word.iss
Expand Up @@ -2,11 +2,11 @@
; == demo\make-installer-word.iss
; == Part of VstoAddinInstaller
; == (https://github.com/bovender/VstoAddinInstaller)
; == (c) 2016 Daniel Kraus <bovender@bovender.de>
; == (c) 2016-2017 Daniel Kraus <bovender@bovender.de>
; == Published under the Apache License 2.0
; == See http://www.apache.org/licenses
; =====================================================================
;
;
; This is the configuration file for the demo installer.
; To try out this script, you must first build the VSTO project in
; Visual Studio with Debug configuration.
Expand All @@ -20,7 +20,7 @@
#define COMPANY "Daniel Kraus (bovende)"
#define HOMEPAGE "https://github.com/bovender/VstoAddinInstaller"
#define DESCRIPTION "Demonstrate VstoAddinInstaller with Word."
#define PUB_YEARS "2016"
#define PUB_YEARS "2017"

#define SOURCEDIR "VstoInstallerDemoWord\bin\Debug\"
#define VSTOFILE "VstoInstallerDemoWord.vsto"
Expand Down

0 comments on commit ad374fa

Please sign in to comment.