From 98b10b69d006917ac6ec9365b4c670419de73c12 Mon Sep 17 00:00:00 2001 From: Jeremy Wright Date: Mon, 25 May 2015 21:34:45 -0400 Subject: [PATCH] Fixes for mistakes found by @ruminations --- Ubuntu_14_04_OCE_PythonOCC_Setup.sh | 4 ++-- changes.md | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 changes.md diff --git a/Ubuntu_14_04_OCE_PythonOCC_Setup.sh b/Ubuntu_14_04_OCE_PythonOCC_Setup.sh index 931c354..fbb3c09 100755 --- a/Ubuntu_14_04_OCE_PythonOCC_Setup.sh +++ b/Ubuntu_14_04_OCE_PythonOCC_Setup.sh @@ -8,7 +8,7 @@ OCEMAKEPATH="oce/build" POCCMAKEPATH="pythonocc-core/cmake-build" #Attempt to install all the pre-requisites -apt-get install -fy git cmake libx11-dev mesa-common-dev freeglut3-dev libfreetype6-dev libc6-dev libstdc++6 libstdc++-4.8-dev build-essential gcc g++ libftgl-dev xorg-dev tcl-dev tk-dev python-dev swig python-wxgtk2.8 python-qt4 python-qt4-gl python-pyside swig python-sympy +apt-get install -fy git cmake libx11-dev mesa-common-dev freeglut3-dev libfreetype6-dev libc6-dev libstdc++6 libstdc++-4.8-dev build-essential gcc g++ libftgl-dev xorg-dev tcl-dev tk-dev python-dev swig python-wxgtk2.8 python-qt4 python-qt4-gl python-pyside python-sympy git clone --branch $OCETAG https://github.com/tpaviot/oce.git @@ -29,6 +29,6 @@ git clone --branch $PYTHONOCCTAG https://github.com/tpaviot/pythonocc-core.git mkdir $POCCMAKEPATH && cd $POCCMAKEPATH -#Guild the geom extension +#Build the geom extension cmake -DOCE_INCLUDE_PATH=/usr/local/include/oce -DOCE_LIB_PATH=/usr/local/lib .. make && make install diff --git a/changes.md b/changes.md new file mode 100644 index 0000000..820469c --- /dev/null +++ b/changes.md @@ -0,0 +1,11 @@ +Changes +======= + + +v0.16 +----- + * Initial Version, version number sync'd to OCE and PythonOCC + * Changes to keep OCE and PythonOCC versions in sync + * Compiles both OCE and PythonOCC from source + * Removed duplicate swig from apt-get line (thanks @ruminations) + * Comment fix (thanks @ruminations)