Merge pull request #43 from gambhiro/script-improvements

Script improvements

Builds/create-symlinks.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+if [[ $# -ne 2 ]]; then
+    echo "Usage: `basename $0` LOCAL_LIB_DIR LOCAL_INCLUDE_DIR"
+    exit 2
+fi
+
+LOCAL_LIB_DIR="$1"
+LOCAL_INCLUDE_DIR="$2"
+
+if [[ ! -d $LOCAL_LIB_DIR ]]; then
+    mkdir -p "$LOCAL_LIB_DIR"
+fi
+
+if [[ ! -d $LOCAL_INCLUDE_DIR ]]; then
+    mkdir -p "$LOCAL_INCLUDE_DIR"
+fi
+
+targetpath="/usr/lib/x86_64-linux-gnu/libOpenCL.so.1"
+linkpath="$LOCAL_LIB_DIR/libOpenCL.so"
+
+if [[ ! -e $linkpath && -e $targetpath ]]; then
+    ln -s "$targetpath" "$linkpath"
+fi
+
+targetpath=$(ls -d1 /usr/include/*/GL | head -n 1)
+linkpath="$LOCAL_INCLUDE_DIR/GL"
+
+if [[ ! -e $linkpath && -e $targetpath ]]; then
+    ln -s "$targetpath" "$linkpath"
+fi
+
+targetpath=$(ls -d1 /usr/include/*/CL | head -n 1)
+linkpath="$LOCAL_INCLUDE_DIR/CL"
+
+if [[ ! -e $linkpath && -e $targetpath ]]; then
+    ln -s "$targetpath" "$linkpath"
+fi

README.md

@@ -33,7 +33,7 @@ Install the dependencies.
 For Ubuntu 15.04 (vivid) and 15.10 (wily):
 
 ```
-sudo apt-get install g++ libdbus-1-dev libgl1-mesa-dev libgl-dev libglm-dev libjpeg-dev libpng12-dev libtbb-dev libxml2-dev qt5-default qt5-qmake qtbase5-dev libqt5opengl5-dev nvidia-libopencl1-352
+sudo apt-get install g++ libdbus-1-dev libgl1-mesa-dev libgl-dev libglm-dev libjpeg-dev libpng12-dev libtbb-dev libxml2-dev qt5-default qt5-qmake qtbase5-dev libqt5opengl5-dev ocl-icd-libopencl1
 ```
 
 Install the OpenCL drivers and opencl support for your hardware. For Nvidia:

main.pro

@@ -4,17 +4,7 @@ CONFIG += ordered
 LOCAL_LIB_DIR = $$(PWD)/Builds/lib
 LOCAL_INCLUDE_DIR = $$(PWD)/Builds/include
 
-unix {
+unix:symlinks.commands = $$(PWD)/Builds/create-symlinks.sh \"$$LOCAL_LIB_DIR\" \"$$LOCAL_INCLUDE_DIR\"
-  symlinks.commands = \
-  test -d $$LOCAL_LIB_DIR || mkdir -p $$LOCAL_LIB_DIR ; \
-  test -d $$LOCAL_INCLUDE_DIR || mkdir -p $$LOCAL_INCLUDE_DIR ; \
-  test -e $$LOCAL_LIB_DIR/libOpenCL.so || \
-    ln -s /usr/lib/x86_64-linux-gnu/libOpenCL.so.1 $$LOCAL_LIB_DIR/libOpenCL.so ; \
-  test -e $$LOCAL_INCLUDE_DIR/GL || \
-    ln -s /usr/include/nvidia-352/GL $$LOCAL_INCLUDE_DIR ; \
-  test -e $$PWD/include/CL || \
-    ln -s /usr/include/nvidia-352/CL $$LOCAL_INCLUDE_DIR ;
-}
 
 SUBDIRS += Builds/QtCreator/Ember Builds/QtCreator/EmberCL Builds/QtCreator/EmberAnimate Builds/QtCreator/EmberGenome Builds/QtCreator/EmberRender Builds/QtCreator/Fractorium
 

package-linux.sh

@@ -16,9 +16,27 @@ Options:
 --signed
 --unsigned"
 
-# version for the debian package
-VERSION=0.9.9.2e
 PROJECT=fractorium
+
+changelogVersion=$(cat ./debian/changelog | head -n 1 | sed 's/^'$PROJECT' (\([^-]\+\)-.*/\1/')
+emberVersion=$(grep '#define EMBER_VERSION' ./Source/Ember/EmberDefines.h | sed 's/^.*EMBER_VERSION "\([^"]\+\)".*/\1/')
+
+a=$(echo -n "$changelogVersion" | sed 's/[a-z]//g')
+b=$(echo -n "$emberVersion" | sed 's/[a-z]//g')
+
+if [[ "$a" != "$b" ]]; then
+    echo "Error: Different version numbers were found. Please update the correct file,
+the version numbers should agree up to the digits in:
+
+$changelogVersion
+$emberVersion
+
+./debian/changelog            : $a
+./Source/Ember/EmberDefines.h : $b"
+    exit 2
+fi
+
+VERSION=$changelogVersion
 PROJECT_ROOT=$PWD
 PPA_DIR="$HOME/PPA/$PROJECT-$VERSION"
 TAR_NAME="$PROJECT-$VERSION.tar.gz"