You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jk...@apache.org on 2019/02/09 15:44:58 UTC
[thrift] branch master updated: THRIFT-4037: get as3 builds working
in cmake for windows too
This is an automated email from the ASF dual-hosted git repository.
jking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new 6c26e09 THRIFT-4037: get as3 builds working in cmake for windows too
6c26e09 is described below
commit 6c26e098cab78a965ff14460f2fee52e6940b2ed
Author: James E. King III <jk...@apache.org>
AuthorDate: Thu Feb 7 12:48:27 2019 -0500
THRIFT-4037: get as3 builds working in cmake for windows too
---
LANGUAGES.md | 2 +-
build/appveyor/MSVC-appveyor-install.bat | 7 +++++++
build/docker/msvc2017/Dockerfile | 11 +++++++++--
build/docker/msvc2017/build.bat | 3 ++-
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/LANGUAGES.md b/LANGUAGES.md
index c610d15..b74fd3e 100644
--- a/LANGUAGES.md
+++ b/LANGUAGES.md
@@ -36,7 +36,7 @@ The Language/Library Levels indicate the minimum and maximum versions that are u
<tr align=center>
<td align=left><a href="https://github.com/apache/thrift/blob/master/lib/as3/README.md">ActionScript</a></td>
<!-- Since -----------------><td>0.3.0</td>
-<!-- Build Systems ---------><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td>
+<!-- Build Systems ---------><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td>
<!-- Language Levels -------><td colspan=2>FLEX SDK 4.6</td>
<!-- Low-Level Transports --><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cred.png" alt=""/></td>
<!-- Transport Wrappers ----><td><img src="doc/images/cred.png" alt=""/></td><td><img src="doc/images/cgrn.png" alt="Yes"/></td><td><img src="doc/images/cred.png" alt=""/></td>
diff --git a/build/appveyor/MSVC-appveyor-install.bat b/build/appveyor/MSVC-appveyor-install.bat
index f973d29..bc4655a 100644
--- a/build/appveyor/MSVC-appveyor-install.bat
+++ b/build/appveyor/MSVC-appveyor-install.bat
@@ -57,3 +57,10 @@ pip.exe ^
twisted || EXIT /B
cinst -y ghc || EXIT /B
+
+:: Adobe Flex SDK 4.6 for ActionScript
+MKDIR "C:\Adobe\Flex\SDK\4.6" || EXIT /B
+appveyor DownloadFile http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip -FileName C:\Adobe\Flex\SDK\4.6\SDK.zip || EXIT /B
+CD "C:\Adobe\Flex\SDK\4.6" || EXIT /B
+7z x SDK.zip || EXIT /B
+SETX FLEX_HOME "C:\Adobe\Flex\SDK\4.6"
diff --git a/build/docker/msvc2017/Dockerfile b/build/docker/msvc2017/Dockerfile
index 7da895c..a2b3cd7 100644
--- a/build/docker/msvc2017/Dockerfile
+++ b/build/docker/msvc2017/Dockerfile
@@ -31,7 +31,7 @@ RUN C:\TEMP\vs_buildtools.exe --quiet --wait --norestart --nocache `
RUN DEL C:\TEMP\vs_buildtools.exe
# Install CMake
-ADD https://github.com/Kitware/CMake/releases/download/v3.13.2/cmake-3.13.2-win64-x64.msi C:\TEMP\cmake.msi
+ADD https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4-win64-x64.msi C:\TEMP\cmake.msi
RUN msiexec.exe /i C:\TEMP\cmake.msi /qn && `
SETX PATH "%PATH%;C:\Program Files\CMake\bin" && `
DEL C:\TEMP\cmake.msi
@@ -89,8 +89,15 @@ RUN choco install ghc -y
# Install python3
RUN choco install python3 -y
+# Install Adobe Flex 4.6 SDK and set FLEX_HOME so it can be found
+ADD http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip C:\Adobe\Flex\SDK\4.6\SDK.zip
+RUN CD C:\Adobe\Flex\SDK\4.6 && `
+ 7z x SDK.zip && `
+ DEL SDK.zip && `
+ SETX FLEX_HOME "C:\Adobe\Flex\SDK\4.6"
+
# Start developer command prompt with any other commands specified.
ENTRYPOINT C:\BuildTools\Common7\Tools\VsDevCmd.bat -arch=amd64 &&
# Default to PowerShell if no other command specified.
-CMD ["powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]
\ No newline at end of file
+CMD ["powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]
diff --git a/build/docker/msvc2017/build.bat b/build/docker/msvc2017/build.bat
index ac7b68a..018805b 100644
--- a/build/docker/msvc2017/build.bat
+++ b/build/docker/msvc2017/build.bat
@@ -28,6 +28,7 @@ cd c:\build
cmake^
-DBOOST_ROOT=C:\Libraries\boost_1_69_0^
-DBOOST_LIBRARYDIR=C:\Libraries\boost_1_69_0\lib64-msvc-14.1^
+ -DFLEX_HOME=C:\Adobe\Flex\SDK\4.6^
-DLIBEVENT_ROOT=C:\Libraries\libevent-2.1.8^
-DZLIB_ROOT=C:\Libraries\zlib-1.2.11^
-DCMAKE_BUILD_TYPE=Release^
@@ -41,4 +42,4 @@ cmake --build . --config Release || EXIT /B
cmake --build . --target check || EXIT /B
:: Install
-cmake --build . --target install
\ No newline at end of file
+cmake --build . --target install