diff options
| author | Kacper Michajłow <kasper93@gmail.com> | 2015-02-16 18:26:46 +0300 |
|---|---|---|
| committer | Kacper Michajłow <kasper93@gmail.com> | 2015-02-17 01:41:08 +0300 |
| commit | 3eaa44a8664ed275fa9c5e225c4893635809bdea (patch) | |
| tree | 12230c99aad8eed3e73896813eca6b49cb407a6e /src/filters/transform | |
| parent | 5882f90c0fa0b1e8ab8891dbdaf42c1234430bf8 (diff) | |
Add common.bat file with common functions.
Diffstat (limited to 'src/filters/transform')
| -rwxr-xr-x | src/filters/transform/VSFilter/installer/build_installer.bat | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/src/filters/transform/VSFilter/installer/build_installer.bat b/src/filters/transform/VSFilter/installer/build_installer.bat index 13314751a..8764b78ee 100755 --- a/src/filters/transform/VSFilter/installer/build_installer.bat +++ b/src/filters/transform/VSFilter/installer/build_installer.bat @@ -1,5 +1,5 @@ @ECHO OFF
-REM (C) 2012-2013 see Authors.txt
+REM (C) 2012-2013, 2015 see Authors.txt
REM
REM This file is part of MPC-HC.
REM
@@ -20,14 +20,10 @@ REM along with this program. If not, see <http://www.gnu.org/licenses/>. SETLOCAL
PUSHD %~dp0
-REM You can set here the Inno Setup path if for example you have Inno Setup Unicode
-REM installed and you want to use the ANSI Inno Setup which is in another location
-IF NOT DEFINED InnoSetupPath SET "InnoSetupPath=H:\progs\thirdparty\isetup"
-
SET ROOT_DIR=..\..\..\..\..
SET "BIN_DIR=%ROOT_DIR%\bin"
-CALL :SubDetectInnoSetup
+CALL "%~dp0%ROOT_DIR%\common.bat" :SubDetectInnoSetup
IF EXIST "%~dp0%ROOT_DIR%\signinfo.txt" (
CALL :SubSign VSFilter.dll x86
CALL :SubSign VSFilter.dll x64
@@ -71,34 +67,6 @@ IF /I "%~1%" == "x64Build" ( EXIT /B
-:SubDetectInnoSetup
-REM Detect if we are running on 64bit Windows and use Wow6432Node since Inno Setup is
-REM a 32-bit application, and set the registry key of Inno Setup accordingly
-IF DEFINED PROGRAMFILES(x86) (
- SET "U_=HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall"
-) ELSE (
- SET "U_=HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
-)
-
-IF DEFINED InnoSetupPath IF NOT EXIST "%InnoSetupPath%" (
- ECHO "%InnoSetupPath%" wasn't found on this machine! I will try to detect Inno Setup's path from the registry...
-)
-
-IF NOT EXIST "%InnoSetupPath%" (
- FOR /F "delims=" %%a IN (
- 'REG QUERY "%U_%\Inno Setup 5_is1" /v "Inno Setup: App Path"2^>Nul^|FIND "REG_SZ"') DO (
- SET "InnoSetupPath=%%a" & CALL :SubInnoSetupPath %%InnoSetupPath:*Z=%%)
-)
-
-IF NOT EXIST "%InnoSetupPath%" ECHO Inno Setup wasn't found! & GOTO EndWithError
-EXIT /B
-
-
-:SubInnoSetupPath
-SET "InnoSetupPath=%*"
-EXIT /B
-
-
:EndWithError
Title Building VSFilter installer [ERROR]
COLOR 0C
|