You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tcl.apache.org by pe...@apache.org on 2018/12/24 13:27:42 UTC
[tcl-rivet] branch master updated: AppVeyor: removed hard-coded
paths
This is an automated email from the ASF dual-hosted git repository.
petasis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
The following commit(s) were added to refs/heads/master by this push:
new a0b0cf5 AppVeyor: removed hard-coded paths
a0b0cf5 is described below
commit a0b0cf5118b6aa970a3f7a29ad083a47b83bb1d9
Author: petasis <pe...@yahoo.gr>
AuthorDate: Mon Dec 24 15:27:29 2018 +0200
AppVeyor: removed hard-coded paths
---
.appveyor.yml | 19 +++++++++++++++++--
ChangeLog | 5 ++++-
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
index 2bd4ff0..0452c45 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,6 +7,7 @@ image:
platform:
- x64
+ - x86
configuration:
- Release
@@ -18,6 +19,9 @@ matrix:
configuration: Release
install:
+ # Capture environment:
+ - cmd: set RIVET_HOME=%cd%
+ - cmd: set /p RIVET_VERSION=<VERSION
# Install Tcl/Tk
- cmd: if %platform%==x86 set DOWNLOAD_PLATFORM=win32
- cmd: if %platform%==x64 set DOWNLOAD_PLATFORM=amd64
@@ -30,6 +34,8 @@ install:
- cmd: cmake -E tar xf irontcl-%DOWNLOAD_PLATFORM%-%IRONTCL_VERSION%.zip
- cmd: set TCL_ROOT=%cd%\IronTcl
- cmd: set PATH=%TCL_ROOT%\bin;%PATH%
+ - cmd: set TCL_TCLSH=%cd%\IronTcl\bin\tclsh86t.exe
+ - cmd: set TK_WISH=%cd%\IronTcl\bin\wish86t.exe
# Install Apache
- cmd: set APACHE_VERSION="2.4.37"
- cmd: set APACHE_COMPILER="VC15"
@@ -39,7 +45,16 @@ install:
# Generate solution...
- cmd: cd cmake
- cmd: cmake -E make_directory "build"
- - cmd: cmake -E chdir build cmake -DAPACHE_ROOT=%APACHE_ROOT% -DTCL_ROOT=%TCL_ROOT% -G %CMAKE_GENERATOR% ..
+ - cmd: cmake -E chdir build cmake -DAPACHE_ROOT=%APACHE_ROOT% -DTCL_ROOT=%TCL_ROOT% -DTCL_TCLSH=%TCL_TCLSH% -DTK_WISH=%TK_WISH% -G %CMAKE_GENERATOR% ..
build:
- project: C:\projects\tcl-rivet\cmake\build\Rivet.sln # path to Visual Studio solution or project
+ project: %RIVET_HOME%\cmake\build\Rivet.sln # path to Visual Studio solution or project
+
+before_build:
+ - cmd: if %platform%==x86 set RIVET_PLATFORM=Win32
+ - cmd: if %platform%==x64 set RIVET_PLATFORM=x64
+
+build_script:
+ - cmd: msbuild Rivet.sln /p:Platform=%RIVET_PLATFORM% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+ - cmd: msbuild INSTALL.vcxproj /p:Platform=%RIVET_PLATFORM% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
diff --git a/ChangeLog b/ChangeLog
index 2f08b47..2015f2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
+2018-12-24 Georgios Petasis <pe...@apache.org>
+ * .appveyor.yml: Enhancements to not rely on hard-coded paths.
+
2018-12-23 Massimo Manghi <mx...@apache.org>
- * cmake/CMakeLists.txt: starting with rivet 3 we need Tcl > 8.6.1
+ * cmake/CMakeLists.txt: starting with rivet 3 we need Tcl > 8.6.1
2018-12-20 Georgios Petasis <pe...@apache.org>
* cmake/CMakeLists.txt: Set policy behaviour of CMP0074, only if policy is
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org