From 4bc352c0c1f3284b3d8e8599f485a5044aa2391f Mon Sep 17 00:00:00 2001 From: Jeff Uchitjil Date: Sat, 20 Aug 2016 18:53:32 -0500 Subject: [PATCH] Make sure all the old files in the Modules and Common folder are removed before installing to ensure we have a clean install. --- Installer/Installer.nsi | 100 ++++------------------------------------ 1 file changed, 8 insertions(+), 92 deletions(-) diff --git a/Installer/Installer.nsi b/Installer/Installer.nsi index 50aa17297..fd9029400 100644 --- a/Installer/Installer.nsi +++ b/Installer/Installer.nsi @@ -255,30 +255,8 @@ Section "Application" SEC01 ${EndIf} ; Remove any old modules that are no longer used in case someone installs over an old version - Delete "$INSTDIR\Modules\SequenceType\Script.dll" - Delete "$INSTDIR\Modules\EffectEditor\RDSEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\LipSyncEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\LauncherEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\AlternatingEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\CustomValueEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\TwinkleEffectEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\SpinEffectEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\PercentageTypeEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\LevelTypeEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\IntUpDownEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\FilePathTypeEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\CurveTypeEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\ColorTypeEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\ColorGradientTypeEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\ChaseEffectEditor.dll" - Delete "$INSTDIR\Modules\EffectEditor\WipeEditor.dll" - Delete "$INSTDIR\Modules\Editor\VixenModules.Editor.EffectEditor.dll" - Delete "$INSTDIR\Modules\Editor\WeifenLuo.WinFormsUI.Docking.dll" - Delete "$INSTDIR\Modules\Editor\ScriptEditor.dll" - Delete "$INSTDIR\Modules\Script\CSharp.dll" - Delete "$INSTDIR\Modules\Script\VB.dll" - Delete "$INSTDIR\Modules\App\VirtualEffect.dll" - + RMDir /r $INSTDIR\Modules + RMDir /r $INSTDIR\Common ; only overwrite these if this installer has a newer version SetOverwrite ifnewer @@ -359,78 +337,16 @@ Section Uninstall Delete /REBOOTOK "$INSTDIR\uninst.exe" Delete /REBOOTOK "$INSTDIR\VixenApplication.exe.config" Delete /REBOOTOK "$INSTDIR\VixenApplication.exe" + Delete /REBOOTOK "$INSTDIR\VixenApplication.vshost.exe" + Delete /REBOOTOK "$INSTDIR\VixenApplication.vshost.exe.config" + Delete /REBOOTOK "$INSTDIR\VixenApplication.vshost.exe.manifest" Delete /REBOOTOK "$INSTDIR\Vixen.dll" Delete /REBOOTOK "$INSTDIR\SciLexer64.dll" Delete /REBOOTOK "$INSTDIR\SciLexer.dll" Delete /REBOOTOK "$INSTDIR\Release Notes.txt" - Delete /REBOOTOK "$INSTDIR\Modules\Timing\Generic.dll" - Delete /REBOOTOK "$INSTDIR\Modules\SequenceType\Vixen2x.dll" - Delete /REBOOTOK "$INSTDIR\Modules\SequenceType\Timed.dll" - Delete /REBOOTOK "$INSTDIR\Modules\SequenceType\Script.dll" - Delete /REBOOTOK "$INSTDIR\Modules\SequenceType\BaseSequence.dll" - Delete /REBOOTOK "$INSTDIR\Modules\SequenceFilter\FadeOut.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Script\VB.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Script\CSharp.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Property\Position.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Preview\DisplayPreview.dll" - Delete /REBOOTOK "$INSTDIR\Modules\OutputFilter\DimmingCurve.dll" - Delete /REBOOTOK "$INSTDIR\Modules\OutputFilter\ColorBreakdown.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Media\Audio.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Analysis\BeatsAndBars.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Analysis\QMLibrary.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\ValueTypes.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\TwinkleEffectEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\SpinEffectEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\PercentageTypeEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\LevelTypeEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\IntUpDownEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\FilePathTypeEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\CurveTypeEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\ColorTypeEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\ColorGradientTypeEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\ChaseEffectEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\NutcrackerEffectEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\EffectEditor\EffectDescriptorAttributes.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Effect\Twinkle.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Effect\Spin.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Effect\SetPosition.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Effect\SetLevel.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Effect\Pulse.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Effect\Chase.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Effect\Candle.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Editor\TimedSequenceEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Editor\ScriptEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Editor\ScintillaNET.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Editor\VixenModules.Editor.EffectEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Editor\EffectEditor.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Controller\Renard.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Controller\PSC.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Controller\OpenDMX.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Controller\Olsen595.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Controller\Hill320.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Controller\GenericSerial.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Controller\FGDimmer.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Controller\E131.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Controller\DummyLighting.dll" - Delete /REBOOTOK "$INSTDIR\Modules\Controller\DmxUsbPro.dll" - Delete /REBOOTOK "$INSTDIR\Modules\App\StateMach.dll" - Delete /REBOOTOK "$INSTDIR\Modules\App\Scheduler.dll" - Delete /REBOOTOK "$INSTDIR\Modules\App\InstrumentationPanel.dll" - Delete /REBOOTOK "$INSTDIR\Modules\App\Curves.dll" - Delete /REBOOTOK "$INSTDIR\Modules\App\ColorGradients.dll" - Delete /REBOOTOK "$INSTDIR\inpoutx64.dll" - Delete /REBOOTOK "$INSTDIR\inpout32.dll" - Delete /REBOOTOK "$INSTDIR\Common\ValueTypes.dll" - Delete /REBOOTOK "$INSTDIR\Common\ScriptSequence.dll" - Delete /REBOOTOK "$INSTDIR\Common\fmodex64.dll" - Delete /REBOOTOK "$INSTDIR\Common\fmodex.dll" - Delete /REBOOTOK "$INSTDIR\Common\FMOD.dll" - Delete /REBOOTOK "$INSTDIR\Common\Dataweb.NShape.WinFormsUI.xml" - Delete /REBOOTOK "$INSTDIR\Common\Dataweb.NShape.WinFormsUI.dll" - Delete /REBOOTOK "$INSTDIR\Common\Dataweb.NShape.GeneralShapes.dll" - Delete /REBOOTOK "$INSTDIR\Common\Dataweb.NShape.dll" - Delete /REBOOTOK "$INSTDIR\Common\Controls.dll" - Delete /REBOOTOK "$INSTDIR\Common\BaseSequence.dll" + Delete /REBOOTOK "$INSTDIR\NLog.dll" + Delete /REBOOTOK "$INSTDIR\NLog.xml" + Delete /REBOOTOK "$INSTDIR\NLog.config" Delete /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" Delete /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"