Skip to content

Commit eb3ad57

Browse files
committed
[Nuke] Drop support for Nuke 9&10 (requires too old versions of Visual Studio & gcc).
1 parent f56e5f2 commit eb3ad57

17 files changed

+17
-264
lines changed

.build_env.example

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
### Nuke Environment
3131
################################
3232

33-
#export NUKE90_DIR="D:\\Nuke\\Nuke9.0v9"
34-
#export NUKE105_DIR="D:\\Nuke\\Nuke10.0v6"
35-
#export NUKE105_DIR="D:\\Nuke\\Nuke10.5v8"
3633
#export NUKE111_DIR="D:\\Nuke\\Nuke11.1v6"
3734
#export NUKE112_DIR="D:\\Nuke\\Nuke11.2v7"
3835
#export NUKE113_DIR="D:\\Nuke\\Nuke11.3v6"

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@ build/
1212
release
1313
*.zip
1414
*.tar.gz
15-
build4.1/
1615
build4.8/
1716
.build_env

BUILDING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ $ make
5151
The build system is similar under windows. You need Visual Studio 2015 (and Visual Studio 2010 if you want to build Nuke plugins before Nuke 11).
5252
You need CMake 3.10, and Conan.
5353
For Nuke plugins building, Nuke installations should be accessible through environment variables
54-
"$NUKE90_DIR", "$NUKE105_DIR", "$NUKE111_DIR", "$NUKE112_DIR", "$NUKE113_DIR", "$NUKE120_DIR", "$NUKE121_DIR".
54+
"$NUKE111_DIR", "$NUKE112_DIR", "$NUKE113_DIR", "$NUKE120_DIR", "$NUKE121_DIR".
5555
In a shell such as git bash, run the script "build_scripts/build_windows.sh", which will grab the dependencies through Conan, and build libs and plugins with the appropriate compiler.

CMakeLists.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ IF(BUILD_PLUGINS)
3636
FIND_PACKAGE ( re2 REQUIRED )
3737
FIND_PACKAGE ( OpenImageIO REQUIRED )
3838
FIND_PACKAGE ( Threads REQUIRED )
39-
FIND_PACKAGE ( Nuke90 )
40-
FIND_PACKAGE ( Nuke100 )
41-
FIND_PACKAGE ( Nuke105 )
4239
FIND_PACKAGE ( Nuke111 )
4340
FIND_PACKAGE ( Nuke112 )
4441
FIND_PACKAGE ( Nuke113 )
@@ -93,15 +90,6 @@ IF(BUILD_PLUGINS)
9390
IF(OFX_FOUND)
9491
ADD_SUBDIRECTORY (openfx)
9592
ENDIF()
96-
IF(Nuke90_FOUND)
97-
ADD_SUBDIRECTORY (nuke9.0)
98-
ENDIF()
99-
IF(Nuke100_FOUND)
100-
ADD_SUBDIRECTORY (nuke10.0)
101-
ENDIF()
102-
IF(Nuke105_FOUND)
103-
ADD_SUBDIRECTORY (nuke10.5)
104-
ENDIF()
10593
IF(Nuke111_FOUND)
10694
ADD_SUBDIRECTORY (nuke11.1)
10795
ENDIF()

build.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ if [ "$build" ]; then
299299
fi
300300

301301
if [ "$machine" == "Windows" ]; then
302-
mkdir -p ${build_directory}/build2010
303302
mkdir -p ${build_directory}/build2015
304303
mkdir -p ${build_directory}/build2019
305304

@@ -308,19 +307,10 @@ if [ "$machine" == "Windows" ]; then
308307

309308
ConanUpdate ${root_directory}/build_tools/conan_profile_windows_vs2015
310309
CMAKE_BUILD_TYPE=$config conan build --install-folder ${build_directory}/Conan/ --source-folder ${root_directory} --build-folder ${build_directory}/build2015 --package-folder ${build_root_directory}/bin ${conan_actions} ${root_directory}/conanfile.py
311-
312-
ConanUpdate ${root_directory}/build_tools/conan_profile_windows_vs2010
313-
CMAKE_BUILD_TYPE=$config conan build --install-folder ${build_directory}/Conan/ --source-folder ${root_directory} --build-folder ${build_directory}/build2010 --package-folder ${build_root_directory}/bin ${conan_actions} ${root_directory}/conanfile.py
314310
else
315-
mkdir -p ${build_directory}/buildgcc41
316311
mkdir -p ${build_directory}/buildgcc48
317312
mkdir -p ${build_directory}/buildgcc93
318313

319-
if [ "$build41" ]; then
320-
ConanUpdate ${root_directory}/build_tools/conan_profile_linux_gcc4.1
321-
CMAKE_BUILD_TYPE=$config conan build --install-folder ${build_directory}/Conan/ --source-folder ${root_directory} --build-folder ${build_directory}/buildgcc41 --package-folder ${build_root_directory}/bin ${conan_actions} ${root_directory}/conanfile.py
322-
fi
323-
324314
if [ "$build48" ]; then
325315
ConanUpdate ${root_directory}/build_tools/conan_profile_linux_gcc4.8
326316
CMAKE_BUILD_TYPE=$config conan build --install-folder ${build_directory}/Conan/ --source-folder ${root_directory} --build-folder ${build_directory}/buildgcc48 --package-folder ${build_root_directory}/bin ${conan_actions} ${root_directory}/conanfile.py

build_tools/conan_profile_linux_gcc4.1

Lines changed: 0 additions & 15 deletions
This file was deleted.

build_tools/conan_profile_windows_vs2010

Lines changed: 0 additions & 13 deletions
This file was deleted.

build_tools/installer.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ def strip (path):
4242
os.makedirs ("openexrid/OFX/"+ofx_dst)
4343
shutil.copy (cwd + "/build/release/lib/OFX/openexrid.ofx", "openexrid/OFX/"+ofx_dst)
4444
strip ("openexrid/OFX/" + ofx_dst + "/openexrid.ofx")
45-
if os.path.exists(cwd + "/build/release/lib/OFX_nuke9/openexrid.ofx"):
46-
os.makedirs ("openexrid/OFX_nuke9/"+ofx_dst)
47-
shutil.copy (cwd + "/build/release/lib/OFX_nuke9/openexrid.ofx", "openexrid/OFX_nuke9/"+ofx_dst)
48-
strip ("openexrid/OFX_nuke9/" + ofx_dst + "/openexrid.ofx")
4945

5046
shutil.copy (cwd + "/LICENSE", "openexrid/")
5147

build_tools/linux/build-conan.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,4 @@ cd ${BUILD_ROOT}
88

99
conan remote add mercenaries http://c3dcoodq1.mercs-eng.com:8081/artifactory/api/conan/conan_packages --insert 0 --force
1010
conan remote add guerilla_legacy http://c3dcoodq1.mercs-eng.com:8081/artifactory/api/conan/guerilla_legacy --insert 1 --force
11-
if [ "$build41" ]; then
12-
conan config install https://github.com/conan-io/conanclientcert.git
13-
./build.sh --build
14-
else
15-
./build.sh --installer
16-
fi
17-
11+
./build.sh --installer

build_tools/linux/linux-docker-build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ docker run --rm -it \
2323
-u $(id -u):$(id -g) \
2424
-v "${this_directory}/../..:/openexrid" \
2525
-v "$CONAN_USER_HOME/.conan/data:/conan/.conan/data" \
26-
-e build41=1 \
2726
-e build48=1 \
2827
$nukes \
2928
"openexrid-9-13-builder" "scl enable sclo-git212 /openexrid/build_tools/linux/build-conan.sh"

0 commit comments

Comments
 (0)