Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
if ($LASTEXITCODE -eq 0) {
Write-Host "Successfully pulled cached image with hash tag"
$needBuild = $false
} elseif ($output -match 'not found|does not exist|404') {
} elseif ($output -match 'not found|does not exist|404|manifest unknown') {
Write-Host "Image not found in registry, will build from scratch."
$needBuild = $true
} else {
Expand Down
7 changes: 0 additions & 7 deletions build/appveyor/MSVC-appveyor-full.bat
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,6 @@ IF "%WITH_PYTHON%" == "ON" (
zope.interface>=6.1 || EXIT /B
)

:: Adobe Flex SDK 4.6 for ActionScript
MKDIR "C:\Adobe\Flex\SDK\4.6" || EXIT /B
appveyor DownloadFile https://fpdownload.adobe.com/pub/flex/sdk/builds/flex4.6/flex_sdk_4.6.0.23201B.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"


::
:: Configure and build our software with cmake
Expand Down
13 changes: 0 additions & 13 deletions build/cmake/DefineOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,6 @@ if (NOT Boost_USE_STATIC_LIBS)
add_definitions(-DBOOST_TEST_DYN_LINK)
endif()

# as3
option(WITH_AS3 "Build ActionScript 3 Thrift Library" ON)
if (WITH_AS3)
set(POSSIBLE_PATHS "${FLEX_HOME}/bin" "$ENV{FLEX_HOME}/bin")
find_program(HAVE_COMPC NAMES compc HINTS ${POSSIBLE_PATHS})
endif ()
CMAKE_DEPENDENT_OPTION(BUILD_AS3 "Build as3 library" ON
"BUILD_LIBRARIES;WITH_AS3;HAVE_COMPC" OFF)

# C++
option(WITH_CPP "Build C++ Thrift library" ON)
if(WITH_CPP)
Expand Down Expand Up @@ -171,10 +162,6 @@ message(STATUS " Build type: ${CMAKE_BUILD_TYPE
message(STATUS)
message(STATUS "Language libraries:")
message(STATUS)
message(STATUS " Build as3 library: ${BUILD_AS3}")
MESSAGE_DEP(WITH_AS3 "Disabled by WITH_AS3=OFF")
MESSAGE_DEP(HAVE_COMPC "Adobe Flex compc was not found - did you set env var FLEX_HOME?")
message(STATUS)
message(STATUS " Build with OpenSSL: ${WITH_OPENSSL}")
if(WITH_OPENSSL)
message(STATUS " Version: ${OPENSSL_VERSION}")
Expand Down
1 change: 0 additions & 1 deletion build/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ Last updated: March 5, 2024
| Tool | ubuntu-focal | ubuntu-jammy | ubuntu-noble | Notes |
| :-------- | :------------ | :------------ | :------------ | :---- |
| as of | Mar 06, 2018 | Jul 1, 2019 | | |
| as3 | 4.6.0 | 4.6.0 | | |
| C++ gcc | 9.4.0 | 11.4.0 | | |
| C++ clang | 13.0.0 | 13.0.0 | | |
| c\_glib | 3.2.12 | 3.2.12 | | |
Expand Down
9 changes: 1 addition & 8 deletions build/docker/msvc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ RUN C:\BuildTools\Common7\Tools\VsDevCmd.bat -arch=x64 -host_arch=x64 && `
SETX PATH "%ZLIB_ROOT%\bin;%PATH%"

# Install OpenSSL 3.6.1
ADD --checksum=sha256:8ce11c409adbd177ca627115bc697c3b66c414bb36175ebb375341eb426894a8 https://slproweb.com/download/Win64OpenSSL-3_6_1.exe C:\TEMP\openssl.exe
ADD --checksum=sha256:c395482a1af33b2cdd4b801b227c864ed049e0f6aff79413d31b4fa916a67b1a https://slproweb.com/download/Win64OpenSSL-3_6_2.exe C:\TEMP\openssl.exe
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ADD failed: failed to GET https://slproweb.com/download/Win64OpenSSL-3_6_1.exe with status 404 Not Found: <html>
<head><title>404 Not Found</title></head>
<body>
<center><h1>404 Not Found</h1></center>
<hr><center>nginx/1.26.0</center>
</body>
</html>

slproweb/opensslhashes@8c3f395

RUN C:\TEMP\openssl.exe /silent && `
DEL C:\TEMP\openssl.exe && `
SETX OPENSSL_ROOT "C:\OpenSSL-Win64" && `
Expand All @@ -93,13 +93,6 @@ RUN choco install jdk8 -y
RUN choco install python3 -y
RUN pip install setuptools

# Install Adobe Flex 4.6 SDK and set FLEX_HOME so it can be found
ADD --checksum=sha256:622b63f29de44600ff8d4231174a70fcb3085812c0e146a42e91877ca8b46798 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"

RUN choco install nodejs -y

# Start developer command prompt with any other commands specified.
Expand Down
7 changes: 0 additions & 7 deletions build/docker/ubuntu-focal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,6 @@ RUN apt-get update -yq && \
vim
ENV PATH=/usr/lib/llvm-6.0/bin:$PATH

# lib/as3 (ActionScript)
RUN mkdir -p /usr/local/adobe/flex/4.6 && \
cd /usr/local/adobe/flex/4.6 && \
wget -q "http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip" && \
unzip flex_sdk_4.6.zip
ENV FLEX_HOME=/usr/local/adobe/flex/4.6

# TODO: "apt-get install" without "apt-get update" in the same "RUN" step can cause cache issues if modified later.
# See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run
RUN apt-get install -y --no-install-recommends \
Expand Down
7 changes: 0 additions & 7 deletions build/docker/ubuntu-jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,6 @@ RUN apt-get update -yq && \
vim
ENV PATH=/usr/lib/llvm-6.0/bin:$PATH

# lib/as3 (ActionScript)
RUN mkdir -p /usr/local/adobe/flex/4.6 && \
cd /usr/local/adobe/flex/4.6 && \
wget -q "http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip" && \
unzip flex_sdk_4.6.zip
ENV FLEX_HOME=/usr/local/adobe/flex/4.6

# TODO: "apt-get install" without "apt-get update" in the same "RUN" step can cause cache issues if modified later.
# See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run
RUN apt-get install -y --no-install-recommends \
Expand Down
7 changes: 0 additions & 7 deletions build/docker/ubuntu-noble/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,6 @@ RUN apt-get update -yq && \
vim
ENV PATH=/usr/lib/llvm-6.0/bin:$PATH

# lib/as3 (ActionScript)
RUN mkdir -p /usr/local/adobe/flex/4.6 && \
cd /usr/local/adobe/flex/4.6 && \
wget -q "http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip" && \
unzip flex_sdk_4.6.zip
ENV FLEX_HOME=/usr/local/adobe/flex/4.6

# TODO: "apt-get install" without "apt-get update" in the same "RUN" step can cause cache issues if modified later.
# See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run
RUN apt-get install -y --no-install-recommends \
Expand Down
Loading