Skip to content

Commit 15d7a52

Browse files
committed
Cleanup Adobe Flex SDK installation following AS3 library removal
1 parent 2176204 commit 15d7a52

7 files changed

Lines changed: 0 additions & 49 deletions

File tree

build/appveyor/MSVC-appveyor-full.bat

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,6 @@ IF "%WITH_PYTHON%" == "ON" (
152152
zope.interface>=6.1 || EXIT /B
153153
)
154154

155-
:: Adobe Flex SDK 4.6 for ActionScript
156-
MKDIR "C:\Adobe\Flex\SDK\4.6" || EXIT /B
157-
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
158-
CD "C:\Adobe\Flex\SDK\4.6" || EXIT /B
159-
7z x SDK.zip || EXIT /B
160-
SETX FLEX_HOME "C:\Adobe\Flex\SDK\4.6"
161-
162155

163156
::
164157
:: Configure and build our software with cmake

build/cmake/DefineOptions.cmake

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,6 @@ if (NOT Boost_USE_STATIC_LIBS)
4444
add_definitions(-DBOOST_TEST_DYN_LINK)
4545
endif()
4646

47-
# as3
48-
option(WITH_AS3 "Build ActionScript 3 Thrift Library" ON)
49-
if (WITH_AS3)
50-
set(POSSIBLE_PATHS "${FLEX_HOME}/bin" "$ENV{FLEX_HOME}/bin")
51-
find_program(HAVE_COMPC NAMES compc HINTS ${POSSIBLE_PATHS})
52-
endif ()
53-
CMAKE_DEPENDENT_OPTION(BUILD_AS3 "Build as3 library" ON
54-
"BUILD_LIBRARIES;WITH_AS3;HAVE_COMPC" OFF)
55-
5647
# C++
5748
option(WITH_CPP "Build C++ Thrift library" ON)
5849
if(WITH_CPP)
@@ -171,10 +162,6 @@ message(STATUS " Build type: ${CMAKE_BUILD_TYPE
171162
message(STATUS)
172163
message(STATUS "Language libraries:")
173164
message(STATUS)
174-
message(STATUS " Build as3 library: ${BUILD_AS3}")
175-
MESSAGE_DEP(WITH_AS3 "Disabled by WITH_AS3=OFF")
176-
MESSAGE_DEP(HAVE_COMPC "Adobe Flex compc was not found - did you set env var FLEX_HOME?")
177-
message(STATUS)
178165
message(STATUS " Build with OpenSSL: ${WITH_OPENSSL}")
179166
if(WITH_OPENSSL)
180167
message(STATUS " Version: ${OPENSSL_VERSION}")

build/docker/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ Last updated: March 5, 2024
175175
| Tool | ubuntu-focal | ubuntu-jammy | ubuntu-noble | Notes |
176176
| :-------- | :------------ | :------------ | :------------ | :---- |
177177
| as of | Mar 06, 2018 | Jul 1, 2019 | | |
178-
| as3 | 4.6.0 | 4.6.0 | | |
179178
| C++ gcc | 9.4.0 | 11.4.0 | | |
180179
| C++ clang | 13.0.0 | 13.0.0 | | |
181180
| c\_glib | 3.2.12 | 3.2.12 | | |

build/docker/msvc/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,6 @@ RUN choco install jdk8 -y
9393
RUN choco install python3 -y
9494
RUN pip install setuptools
9595

96-
# Install Adobe Flex 4.6 SDK and set FLEX_HOME so it can be found
97-
ADD --checksum=sha256:622b63f29de44600ff8d4231174a70fcb3085812c0e146a42e91877ca8b46798 http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip C:\Adobe\Flex\SDK\4.6\SDK.zip
98-
RUN CD C:\Adobe\Flex\SDK\4.6 && `
99-
7z x SDK.zip && `
100-
DEL SDK.zip && `
101-
SETX FLEX_HOME "C:\Adobe\Flex\SDK\4.6"
102-
10396
RUN choco install nodejs -y
10497

10598
# Start developer command prompt with any other commands specified.

build/docker/ubuntu-focal/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,6 @@ RUN apt-get update -yq && \
8585
vim
8686
ENV PATH=/usr/lib/llvm-6.0/bin:$PATH
8787

88-
# lib/as3 (ActionScript)
89-
RUN mkdir -p /usr/local/adobe/flex/4.6 && \
90-
cd /usr/local/adobe/flex/4.6 && \
91-
wget -q "http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip" && \
92-
unzip flex_sdk_4.6.zip
93-
ENV FLEX_HOME=/usr/local/adobe/flex/4.6
94-
9588
# TODO: "apt-get install" without "apt-get update" in the same "RUN" step can cause cache issues if modified later.
9689
# See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run
9790
RUN apt-get install -y --no-install-recommends \

build/docker/ubuntu-jammy/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,6 @@ RUN apt-get update -yq && \
7979
vim
8080
ENV PATH=/usr/lib/llvm-6.0/bin:$PATH
8181

82-
# lib/as3 (ActionScript)
83-
RUN mkdir -p /usr/local/adobe/flex/4.6 && \
84-
cd /usr/local/adobe/flex/4.6 && \
85-
wget -q "http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip" && \
86-
unzip flex_sdk_4.6.zip
87-
ENV FLEX_HOME=/usr/local/adobe/flex/4.6
88-
8982
# TODO: "apt-get install" without "apt-get update" in the same "RUN" step can cause cache issues if modified later.
9083
# See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run
9184
RUN apt-get install -y --no-install-recommends \

build/docker/ubuntu-noble/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ RUN apt-get update -yq && \
7878
vim
7979
ENV PATH=/usr/lib/llvm-6.0/bin:$PATH
8080

81-
# lib/as3 (ActionScript)
82-
RUN mkdir -p /usr/local/adobe/flex/4.6 && \
83-
cd /usr/local/adobe/flex/4.6 && \
84-
wget -q "http://download.macromedia.com/pub/flex/sdk/flex_sdk_4.6.zip" && \
85-
unzip flex_sdk_4.6.zip
86-
ENV FLEX_HOME=/usr/local/adobe/flex/4.6
87-
8881
# TODO: "apt-get install" without "apt-get update" in the same "RUN" step can cause cache issues if modified later.
8982
# See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run
9083
RUN apt-get install -y --no-install-recommends \

0 commit comments

Comments
 (0)