diff --git a/.gitmodules b/.gitmodules index 311802ff57..a9f706b528 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "Tests/google-mock"] path = Tests/google-mock url = https://github.com/MrKepzie/google-mock -[submodule "Gui/Resources/OpenColorIO-Configs"] - path = Gui/Resources/OpenColorIO-Configs - url = https://github.com/MrKepzie/OpenColorIO-Configs.git [submodule "libs/SequenceParsing"] path = libs/SequenceParsing url = https://github.com/MrKepzie/SequenceParsing diff --git a/App/App.pro b/App/App.pro index 71c5060e33..3e23f04d66 100644 --- a/App/App.pro +++ b/App/App.pro @@ -245,7 +245,7 @@ SOURCES += \ INSTALLS += target -Resources.files = $$PWD/../Gui/Resources/OpenColorIO-Configs +Resources.files = $$PWD/../OpenColorIO-Configs macx { Resources.files += $$PWD/../Gui/Resources/Images/natronProjectIcon_osx.icns Resources.path = Contents/Resources diff --git a/Gui/Resources/OpenColorIO-Configs b/Gui/Resources/OpenColorIO-Configs deleted file mode 160000 index a6e1d90103..0000000000 --- a/Gui/Resources/OpenColorIO-Configs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a6e1d90103bdd22cdda9d7cb8239ac129cb7f69a diff --git a/INSTALL_FREEBSD.md b/INSTALL_FREEBSD.md index c1bd396eea..c81ea115a0 100644 --- a/INSTALL_FREEBSD.md +++ b/INSTALL_FREEBSD.md @@ -75,6 +75,12 @@ LIBS is the path to the libs EOF ----- end ----- +###Download OpenColorIO-Configs + +In the past, OCIO configs were a submodule, though due to the size of the repository, we have chosen instead +to make a tarball release and let you download it [here](https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v2.0.tar.gz). +Place it at the root of Natron repository. + ### Build The must be absolute and must not be a subdir of diff --git a/INSTALL_LINUX.md b/INSTALL_LINUX.md index 9f802fc9e7..e35a820def 100644 --- a/INSTALL_LINUX.md +++ b/INSTALL_LINUX.md @@ -63,6 +63,12 @@ On Ubuntu 12.04 LTS the package can be added with the following ppa: We're done here for libraries. +###Download OpenColorIO-Configs + +In the past, OCIO configs were a submodule, though due to the size of the repository, we have chosen instead +to make a tarball release and let you download it [here](https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v2.0.tar.gz). +Place it at the root of Natron repository. + ###Add the config.pri file You have to define the locations of some required libraries. diff --git a/INSTALL_OSX.md b/INSTALL_OSX.md index 0260d85aea..77251140c3 100644 --- a/INSTALL_OSX.md +++ b/INSTALL_OSX.md @@ -76,6 +76,12 @@ this in your .bash_profile): export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig:/usr/local/opt/cairo/lib/pkgconfig +###Download OpenColorIO-Configs + +In the past, OCIO configs were a submodule, though due to the size of the repository, we have chosen instead +to make a tarball release and let you download it [here](https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v2.0.tar.gz). +Place it at the root of Natron repository. + ## Add the config.pri file You have to define the locations of the required libraries. diff --git a/INSTALL_WINDOWS.md b/INSTALL_WINDOWS.md index 83a2e09893..a19e6929e8 100644 --- a/INSTALL_WINDOWS.md +++ b/INSTALL_WINDOWS.md @@ -70,6 +70,11 @@ Then this page has a complete answer on how to compile the dependencies: http://stackoverflow.com/questions/85622/how-to-compile-cairo-for-visual-c-2008-express-edition This will work successfully. +###Download OpenColorIO-Configs + +In the past, OCIO configs were a submodule, though due to the size of the repository, we have chosen instead +to make a tarball release and let you download it [here](https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v2.0.tar.gz). +Place it at the root of Natron repository. ###Add the config.pri file diff --git a/tools/MacOSX/build-natron.sh b/tools/MacOSX/build-natron.sh index 362e99afb1..a226308437 100755 --- a/tools/MacOSX/build-natron.sh +++ b/tools/MacOSX/build-natron.sh @@ -47,6 +47,8 @@ shiboken { } EOF +#Copy OpenColorIO-Config in Natron root as the .pro expects them there to copy it to the application bundle +cp -r $TMP/OpenColorIO-Configs . || exit 1 # Add CONFIG+=snapshot to indicate the build is a snapshot if [ "$BRANCH" == "workshop" ]; then diff --git a/tools/MacOSX/build.sh b/tools/MacOSX/build.sh index e13981fe6e..2d18aa992a 100755 --- a/tools/MacOSX/build.sh +++ b/tools/MacOSX/build.sh @@ -115,6 +115,14 @@ LOGDIR="$CWD/logs" rm -rf $LOGDIR mkdir -p $LOGDIR || exit 1 +#If OpenColorIO-Configs do not exist, download them +if [ ! -d "$TMP/OpenColorIO-Configs" ]; then + wget $GIT_OCIO_CONFIG_TAR -O $TMP/OpenColorIO-Configs.tar.gz || exit 1 + tar xvf $TMP/OpenColorIO-Configs.tar.gz || exit 1 + rm $TMP/OpenColorIO-Configs.tar.gz || exit 1 + mv $TMP/OpenColorIO-Configs* $TMP/OpenColorIO-Configs || exit 1 +fi + PLUGINDIR="$CWD/build/Natron/App/Natron.app/Contents/Plugins" NATRONLOG="$LOGDIR/Natron-$TAG.log" diff --git a/tools/MacOSX/common.sh b/tools/MacOSX/common.sh index 57fe0c1672..11d6d8f35f 100755 --- a/tools/MacOSX/common.sh +++ b/tools/MacOSX/common.sh @@ -17,6 +17,8 @@ GIT_MISC=https://github.com/devernay/openfx-misc.git GIT_OPENCV=https://github.com/devernay/openfx-opencv.git GIT_ARENA=https://github.com/olear/openfx-arena.git +GIT_OCIO_CONFIG_TAR=https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v2.0.tar.gz + TMP=$CWD/tmp PKGOS=OSX diff --git a/tools/Windows/common.sh b/tools/Windows/common.sh index 5572bba05f..fee41b65b8 100644 --- a/tools/Windows/common.sh +++ b/tools/Windows/common.sh @@ -40,6 +40,7 @@ PACKAGES=$NATRON_PKG,$CORELIBS_PKG,$PROFILES_PKG,$IOPLUG_PKG,$MISCPLUG_PKG,$AREN # bump number when OpenColorIO-Configs changes +GIT_OCIO_CONFIG_TAR=https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v2.0.tar.gz COLOR_PROFILES_VERSION=2.0 diff --git a/tools/Windows/include/scripts/build-natron.sh b/tools/Windows/include/scripts/build-natron.sh index 3150622feb..d6486f22a0 100644 --- a/tools/Windows/include/scripts/build-natron.sh +++ b/tools/Windows/include/scripts/build-natron.sh @@ -121,10 +121,15 @@ if [ -f CrashReporter/release/NatronCrashReporter.exe ]; then fi -#Remove all git related stuff before installing color profiles -(cd ../Gui/Resources/OpenColorIO-Configs ; find . -type d -name .git -exec rm -rf {} \;) +#If OpenColorIO-Configs do not exist, download them +if [ ! -d "$SRC_PATH/OpenColorIO-Configs" ]; then + wget $GIT_OCIO_CONFIG_TAR -O $SRC_PATH/OpenColorIO-Configs.tar.gz || exit 1 + tar xvf $TMP_PATH/OpenColorIO-Configs.tar.gz || exit 1 + rm $SRC_PATH/OpenColorIO-Configs.tar.gz || exit 1 + mv $SRC_PATH/OpenColorIO-Configs* $SRC_PATH/OpenColorIO-Configs || exit 1 +fi -cp -a ../Gui/Resources/OpenColorIO-Configs $INSTALL_PATH/share/ || exit 1 +cp -a $TMP_PATH/OpenColorIO-Configs $INSTALL_PATH/share/ || exit 1 mkdir -p $INSTALL_PATH/docs/natron || exit 1 cp ../LICENSE.txt ../README* ../BUGS* ../CONTRI* ../Documentation/* $INSTALL_PATH/docs/natron/ mkdir -p $INSTALL_PATH/share/stylesheets || exit 1 diff --git a/tools/linux/common.sh b/tools/linux/common.sh index b018719887..cfe452f42a 100644 --- a/tools/linux/common.sh +++ b/tools/linux/common.sh @@ -46,6 +46,7 @@ PACKAGES=$NATRON_PKG,$CORELIBS_PKG,$PROFILES_PKG,$IOPLUG_PKG,$MISCPLUG_PKG,$AREN # bump number when OpenColorIO-Configs changes +GIT_OCIO_CONFIG_TAR=https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v2.0.tar.gz COLOR_PROFILES_VERSION=2.0.0 # bump number on bugfixes diff --git a/tools/linux/include/scripts/build-natron.sh b/tools/linux/include/scripts/build-natron.sh index 948440b11a..4df63fc3be 100644 --- a/tools/linux/include/scripts/build-natron.sh +++ b/tools/linux/include/scripts/build-natron.sh @@ -156,9 +156,15 @@ fi # fi #fi -#Remove all git related stuff before installing color profiles -(cd ../Gui/Resources/OpenColorIO-Configs ; find . -type d -name .git -exec rm -rf {} \;) -cp -a ../Gui/Resources/OpenColorIO-Configs $INSTALL_PATH/share/ || exit 1 +#If OpenColorIO-Configs do not exist, download them +if [ ! -d "$SRC_PATH/OpenColorIO-Configs" ]; then + wget $GIT_OCIO_CONFIG_TAR -O $SRC_PATH/OpenColorIO-Configs.tar.gz || exit 1 + tar xvf $SRC_PATH/OpenColorIO-Configs.tar.gz || exit 1 + rm $SRC_PATH/OpenColorIO-Configs.tar.gz || exit 1 + mv $SRC_PATH/OpenColorIO-Configs* $SRC_PATH/OpenColorIO-Configs || exit 1 +fi + +cp -a $SRC_PATH/OpenColorIO-Configs $INSTALL_PATH/share/ || exit 1 mkdir -p $INSTALL_PATH/docs/natron || exit 1 cp ../LICENSE.txt ../README* ../BUGS* ../CONTRI* ../Documentation/* $INSTALL_PATH/docs/natron/ mkdir -p $INSTALL_PATH/share/stylesheets || exit 1