Remove OpenColorIO-Configs submodule and download it separately instead.

MX-05 · Sep 15, 2015 · c6c7eba · c6c7eba
1 parent 4f6d1bc
commit c6c7eba
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 11 deletions.
diff --git 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
@@ -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
diff --git 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 <srcPath> must be absolute and <buildPath> must not be a subdir of <srcPath>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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


Expand Down