Skip to content

Commit

Permalink
Installer updated
Browse files Browse the repository at this point in the history
Removed src from installer
  • Loading branch information
KindDragon committed Jan 8, 2016
1 parent c275230 commit bb9e0f8
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 43 deletions.
16 changes: 14 additions & 2 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,22 @@ chrisJohnson http://www.codeplex.com/site/users/view/chrisJohnson

Contributors: (listed alphabetically)
------------------------------------------------
benpmorgan, geordi, jerker_back, Laurent Lessieux (llessieux), snakefoot, VictorKharkov, xpol
akaStiX
benpmorgan
Eric Bissonnette
geordi
ioannis-e
jerker_back
jlddodger
Kristian Paradis
Laurent Lessieux (llessieux)
mnissl
snakefoot
VictorKharkov
xpol

Many thanks to everyone who supported development without having
svn write access.
git push access.

Based on the original version (C) 2005-2009 by Dan Moulding (e-mail [email protected])
http://sites.google.com/site/dmoulding/vld
2 changes: 1 addition & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Visual Leak Detector (VLD) Version 2.5.0

Change Log / Release Notes

2.5 (2015)
2.5 (09 January 2016)
----------------------------
Enhancements:
+ VS2015 support added.
Expand Down
12 changes: 6 additions & 6 deletions setup/build_version.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ TITLE Building VLD...
SETLOCAL ENABLEDELAYEDEXPANSION

REM Check if the needed files are present
IF "%VS100COMNTOOLS%"=="" GOTO :BadPaths
IF "%VS140COMNTOOLS%"=="" GOTO :BadPaths

CD %~dp0/..

GOTO :GoodPaths

:BadPaths
ECHO: "Not all build dependencies found. To build iZ3D Driver you need:"
ECHO: "* Visual Studio 2010 installed"
ECHO: "Not all build dependencies found. To build VLD you need:"
ECHO: "* Visual Studio 2015 installed"
PAUSE
GOTO :EndGood

Expand All @@ -26,7 +26,7 @@ IF "%1"=="" SET BUILDTYPE=/rebuild
rem IF "%1"=="build" SET BUILDTYPE=

SET ORIGPATH="%CD%"
CALL "%VS100COMNTOOLS%vsvars32.bat"
CALL "%VS140COMNTOOLS%vsvars32.bat"
CD %ORIGPATH%

:: Store start time
Expand All @@ -36,9 +36,9 @@ FOR /f "tokens=1-4 delims=:.," %%T IN ("%TIME%") DO (
SET /a Start100S=%%T*360000+1%%U*6000+1%%V*100+1%%W - 610100
)

devenv /nologo vld_vs10.sln %BUILDTYPE% "Release|Win32" /Project vld
devenv /nologo vld_vs14.sln %BUILDTYPE% "Release|Win32" /Project vld
IF %ERRORLEVEL% NEQ 0 GOTO EndBad
devenv /nologo vld_vs10.sln %BUILDTYPE% "Release|x64" /Project vld
devenv /nologo vld_vs14.sln %BUILDTYPE% "Release|x64" /Project vld
IF %ERRORLEVEL% NEQ 0 GOTO EndBad

if not exist "%ProgFiles%\Inno Setup 5\ISCC.exe" GOTO EndBad
Expand Down
6 changes: 3 additions & 3 deletions setup/version.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

#define VLDVERSION L"2.5RC"
#define VLDVERSION L"2.5"
#define VERSION_NUMBER 2,5,0,0
#define VERSION_STRING "2.5.0.0"
#define VERSION_COPYRIGHT "Copyright (C) 2005-2014"
#define VERSION_COPYRIGHT "Copyright (C) 2005-2016"

#ifndef __FILE__
!define VLD_VERSION "2.5RC" // NSIS Script
!define VLD_VERSION "2.5" // NSIS Script
#endif
31 changes: 1 addition & 30 deletions setup/vld-setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Visual Leak Detector"
#define MyAppVersion "2.5rc"
#define MyAppVersion "2.5"
#define MyAppPublisher "VLD Team"
#define MyAppURL "http://vld.codeplex.com/"
#define MyAppRegKey "Software\Visual Leak Detector"
Expand Down Expand Up @@ -52,38 +52,9 @@ Source: "..\src\bin\x64\Release-v140\vld_x64.dll"; DestDir: "{app}\bin\Win64"; F
Source: "..\src\vld.h"; DestDir: "{app}\include"; Flags: ignoreversion
Source: "..\src\vld_def.h"; DestDir: "{app}\include"; Flags: ignoreversion
Source: "..\vld.ini"; DestDir: "{app}"; Flags: ignoreversion
Source: "version.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\AUTHORS.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\CHANGES.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\src\callstack.cpp"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\dllspatches.cpp"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\ntapi.cpp"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\stdafx.cpp"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\utility.cpp"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vld.cpp"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vld_hooks.cpp"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vldapi.cpp"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vldheap.cpp"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\callstack.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\criticalsection.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\crtmfcpatch.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\map.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\ntapi.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\resource.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\set.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\stdafx.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\tree.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\utility.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vld.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vld_def.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vldheap.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vldint.h"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vld.dll.dependency.x64.manifest"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vld.dll.dependency.x86.manifest"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vld.rc"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vld.vcxproj"; DestDir: "{app}\src"; Flags: ignoreversion
Source: "..\src\vld.vcxproj.filters"; DestDir: "{app}\src"; Flags: ignoreversion

[Tasks]
Name: "modifypath"; Description: "Add VLD directory to your environmental path"
Expand Down
2 changes: 1 addition & 1 deletion vld.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; Visual Leak Detector - Initialization/Configuration File
;; Copyright (c) 2005-2015 VLD Team
;; Copyright (c) 2005-2016 VLD Team
;;
;; This library is free software; you can redistribute it and/or
;; modify it under the terms of the GNU Lesser General Public
Expand Down

0 comments on commit bb9e0f8

Please sign in to comment.