[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:45:54 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=20fdbb6
The following commit has been merged in the master branch:
commit 20fdbb63cf8e872a232921838c5e5feee7a33981
Author: Robin Mills <robin at clanmills.com>
Date: Tue Nov 17 19:15:54 2015 +0000
#1041. Lots of changes. Added a command-line parser to build.cmd. Build.cmd obtains source from the Exiv2 Team Repository.
---
contrib/cmake/msvc/build.cmd | 449 +++++++++++++++++++++++++-----------------
contrib/cmake/msvc/setenv.cmd | 83 +-------
2 files changed, 270 insertions(+), 262 deletions(-)
diff --git a/contrib/cmake/msvc/build.cmd b/contrib/cmake/msvc/build.cmd
index bab4bbd..879f2dd 100755
--- a/contrib/cmake/msvc/build.cmd
+++ b/contrib/cmake/msvc/build.cmd
@@ -1,39 +1,112 @@
@echo off
-SETLOCAL
+setlocal enableextensions
-REM ---------------------------------------------------
-REM -- Created by danielkaneider
-REM ---------------------------------------------------
+set "BUILD_DIR=%CD%"
-echo calling setenv
+:GETOPTS
+if /I "%1" == "--help" (
+ call:Help
+ exit /b
+)
+if /I "%1" == "--webready" set "_WEBREADY_=1"
+if /I "%1" == "--config" set "_CONFIG_=%2"& shift
+if /I "%1" == "--temp" set "_TEMP_=%2"& shift
+if /I "%1" == "--generator" set "_GENERATOR_=%2"& shift
+if /I "%1" == "--exiv2" set "_EXIV2_=%2"& shift
+if /I "%1" == "--verbose" set "_VERBOSE_=1"
+if /I "%1" == "--dryrun" set "_DRYRUN_=1"
+if /I "%1" == "--rebuild" set "_REBUILD_=1"
+if /I "%1" == "--silent" set "_SILENT_=1"
+if /I "%1" == "--silent" set "_QUIET_=1"
+if /I "%1" == "--quiet" set "_QUIET_=1"
+
+shift
+if not (%1) EQU () goto GETOPTS
+
+rem ----
+call:echo calling setenv
call setenv.cmd
IF ERRORLEVEL 1 (
echo "*** setenv.cmd has failed ***"
GOTO error_end
)
-IF EXIST ..\msvc (
- echo.
- echo.ERROR: This file should NOT be executed within the exiv2 source directory,
- echo. but in a new empty folder!
- echo.
- goto error_end
+rem if NOT DEFINED _DRYRUN_ if DEFINED _REBUILD_ (
+rem for /F "delims=" %%i in ('dir /b') do (rmdir "%%i" /s/q || del "%%i" /s/q)
+rem )
+
+rem ----
+call:echo checking that %_EXIV2_% exists
+if NOT EXIST %_EXIV2_% (
+ echo "_EXIV2_ = %_EXIV2_% does not exist ***"
+ exit /b 1
)
+pushd %_EXIV2_%
+set _EXIV2_=%CD%
+popd
+call:echo _EXIV2_ = %_EXIV2_%
-echo testing compiler
-cl > NUL
-IF ERRORLEVEL 1 (
- echo "*** ensure cl is not on path. Run vcvars32.bat or vcvarsall.bat ***"
+rem ----
+call:echo testing VSINSTALLDIR "%VSINSTALLDIR%"
+IF NOT DEFINED VSINSTALLDIR (
+ echo "VSINSTALLDIR not set. Run vcvars32.bat or vcvarsall.bat ***"
GOTO error_end
)
-
-echo testing VSINSTALLDIR
IF NOT EXIST "%VSINSTALLDIR%" (
- echo "VSINSTALLDIR %VSINSTALLDIR% does not exist. Ruv vcvars32.bat or vcvarsall.bat ***"
+ echo "VSINSTALLDIR %VSINSTALLDIR% does not exist. Run vcvars32.bat or vcvarsall.bat ***"
+ GOTO error_end
+)
+
+rem http://stackoverflow.com/questions/9252980/how-to-split-the-filename-from-a-full-path-in-batch
+for %%A in ("%VSINSTALLDIR%") do (
+ set "VSSTUDIO=%%~nA"
+)
+call:echo VSSTUDIO = "%VSSTUDIO%"
+
+rem ----
+call:echo setting CMake command options
+IF "%VSSTUDIO%" EQU "Microsoft Visual Studio 14" (
+ rem Visual Studio 2015
+ set VS_SHORT=vc14
+ set VS_CMAKE=Visual Studio 14
+ set VS_PROG_FILES=Microsoft Visual Studio 14.0
+ set VS_OPENSSL=vs2015
+) ELSE IF "%VSSTUDIO%" EQU "Microsoft Visual Studio 12" (
+ rem Visual Studio 2013
+ set VS_SHORT=vc12
+ set VS_CMAKE=Visual Studio 12
+ set VS_PROG_FILES=Microsoft Visual Studio 12.0
+ set VS_OPENSSL=vs2013
+) ELSE IF "%VSSTUDIO%" EQU "Microsoft Visual Studio 11" (
+ rem Visual Studio 2012
+ set VS_SHORT=vc11
+ set VS_CMAKE=Visual Studio 11
+ set VS_PROG_FILES=Microsoft Visual Studio 11.0
+ set VS_OPENSSL=vs2012
+) ELSE IF "%VSSTUDIO%" EQU "Microsoft Visual Studio 10" (
+ rem Visual Studio 2010
+ set VS_SHORT=vc10
+ set VS_CMAKE=Visual Studio 10
+ set VS_PROG_FILES=Microsoft Visual Studio 10.0
+ set VS_OPENSSL=vs2010
+) ELSE IF "%VSSTUDIO%" EQU "Microsoft Visual Studio 9" (
+ rem Visual Studio 2008
+ set VS_SHORT=vc9
+ set VS_CMAKE=Visual Studio 9 2008
+ set VS_PROG_FILES=Microsoft Visual Studio 9.0
+ set VS_OPENSSL=vs2008
+) ELSE IF "%VSSTUDIO%" EQU "Microsoft Visual Studio 8" (
+ rem Visual Studio 2005
+ set VS_SHORT=vc8
+ set VS_CMAKE=Visual Studio 8 2005
+ set VS_PROG_FILES=Microsoft Visual Studio 8.0
+ set VS_OPENSSL=vs2005
+) ELSE (
+ echo "*** Unsupported version of Visual Studio in '%VSINSTALLDIR%' ***"
GOTO error_end
)
-echo testing architecture
+call:echo testing architecture
if "%PROCESSOR_ARCHITECTURE%" EQU "AMD64" (
set Platform=x64
set RawPlatform=x64
@@ -44,38 +117,53 @@ if "%PROCESSOR_ARCHITECTURE%" EQU "AMD64" (
set CpuPlatform=ia32
)
-echo testing svn is on path
-svn --version > NUL
+IF %Platform% EQU x64 (
+ set VS_CMAKE=%VS_CMAKE% Win64
+)
+call:echo Platform = %Platform% (%RawPlatform%)
+
+rem ----
+call:echo testing out of source build
+dir/s exiv2.cpp >NUL 2>NUL
+IF NOT ERRORLEVEL 1 (
+ echo "*** error: do not execute this script within the exiv2 source directory ***"
+ goto error_end
+)
+
+rem ----
+call:echo testing compiler
+cl > NUL 2>NUL
IF ERRORLEVEL 1 (
- echo "*** please ensure SVN.exe is on the PATH ***"
+ echo "*** ensure cl is on path. Run vcvars32.bat or vcvarsall.bat ***"
GOTO error_end
)
+if NOT DEFINED _SILENT_ cl>/NUL
-echo testing cmake is on path
-cmake --version > NUL
+rem ----
+call:echo testing svn is on path
+svn --version > NUL
IF ERRORLEVEL 1 (
- echo "*** please ensure cmake.exe is on the PATH ***"
+ echo "*** please ensure SVN.exe is on the PATH ***"
GOTO error_end
)
-echo testing curl is on path
-curl --version > NUL
+rem ----
+call:echo testing cmake is on path
+cmake --version > NUL
IF ERRORLEVEL 1 (
echo "*** please ensure cmake.exe is on the PATH ***"
GOTO error_end
)
-echo testing the cygwin_dir exists
+rem ----
+call:echo testing the cygwin_dir exists
if NOT EXIST %CYGWIN_DIR% (
echo "*** CYGWIN_DIR %CYGWIN_DIR% does not exist ***"
GOTO error_end
)
-IF %Platform% EQU x64 (
- set VS_CMAKE=%VS_CMAKE% Win64
-)
-
-echo testing cygwin tools are available
+rem ----
+call:echo testing cygwin tools are available
SET 7Z_PATH=%CYGWIN_DIR%\lib\p7zipz.exe
IF NOT EXIST %CYGWIN_DIR%\lib\p7zipz.exe GOTO cygwin_error
IF NOT EXIST %CYGWIN_DIR%in
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list