update to version 3.0 beta2

7 files changed, 106 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5c3647efa8d..22eb658b7692 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = seexpr-git
 	pkgdesc = An embeddable expression evaluation engine (git version)
-	pkgver = 2.11.r0.ga5f02bb
+	pkgver = 3.0.beta.2.r2.g743f732
 	pkgrel = 1
 	url = http://www.disneyanimation.com/technology/seexpr.html
 	arch = i686
@@ -8,17 +8,15 @@ pkgbase = seexpr-git
 	license = custom
 	makedepends = cmake>=2.4.6
 	makedepends = git
-	optdepends = python2-pyqt4: required for SeExpr editor
+	makedepends = python2-sip
+	optdepends = llvm>=3.8.0: LLVM backend support
+	optdepends = python2-pyqt4: Editor support
 	provides = seexpr
 	conflicts = seexpr
 	source = git+https://github.com/wdas/SeExpr.git
-	source = build-info.patch
-	source = CMakeLists.txt.patch
-	source = Editor_CMakeLists.txt.patch
+	source = build.patch
 	md5sums = SKIP
-	md5sums = bb56b587bca21debebf86b7adb6242f1
-	md5sums = 0b04cc77edebf6d364767cad0a988ef2
-	md5sums = 69721fc7e11747cfbc7f0712b4975f79
+	md5sums = 156977932afc69ff24f85be68a7357b6
 
 pkgname = seexpr-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..241e560df690
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*
+
diff --git a/CMakeLists.txt.patch b/CMakeLists.txt.patch
deleted file mode 100644
index 9a78766f31a5..000000000000
--- a/CMakeLists.txt.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- /SeExpr/CMakeLists.txt	2016-06-03 17:23:09.148872767 -0400
-+++ /SeExpr/CMakeLists.txt	2016-06-03 17:24:26.255300396 -0400
-@@ -97,6 +97,3 @@
- ## Traverse subdirectories
- ADD_SUBDIRECTORY (src/SeExpr)
- ADD_SUBDIRECTORY (src/SeExprEditor)
--ADD_SUBDIRECTORY (src/doc)
--ADD_SUBDIRECTORY (src/demos)
--ADD_SUBDIRECTORY (src/tests)
diff --git a/Editor_CMakeLists.txt.patch b/Editor_CMakeLists.txt.patch
deleted file mode 100644
index ff5bb2c3dafb..000000000000
--- a/Editor_CMakeLists.txt.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- /SeExpr/src/SeExprEditor/CMakeLists.txt	2016-06-03 17:31:57.167238683 -0400
-+++ /SeExpr/src/SeExprEditor/CMakeLists.txt	2016-06-03 17:47:57.927613878 -0400
-@@ -13,8 +13,10 @@
- # You may obtain a copy of the License at
- # http://www.apache.org/licenses/LICENSE-2.0
- 
-+set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5 2.4)
- find_package(PythonInterp)
- find_package(PythonLibs)
-+if(PYTHONLIBS_FOUND)
- 
- macro(get_build_info NAME STORAGE)
-     execute_process(
-@@ -118,3 +120,4 @@
-             DESTINATION ${CMAKE_INSTALL_PYTHON})
- 
- endif(QT4_FOUND)
-+endif(PYTHONLIBS_FOUND)
diff --git a/PKGBUILD b/PKGBUILD
index 150e5c156478..8e6f655b3194 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,20 @@
 # Maintainer: meepzh <meep.aur@meepzh.com>
 pkgname=seexpr-git
-pkgver=2.11.r0.ga5f02bb
+pkgver=3.0.beta.2.r2.g743f732
 pkgrel=1
 pkgdesc="An embeddable expression evaluation engine (git version)"
 arch=(i686 x86_64)
 url="http://www.disneyanimation.com/technology/seexpr.html"
 license=('custom')
-optdepends=('python2-pyqt4: required for SeExpr editor')
-makedepends=('cmake>=2.4.6' 'git')
+optdepends=('llvm>=3.8.0: LLVM backend support'
+            'python2-pyqt4: Editor support')
+makedepends=('cmake>=2.4.6' 'git' 'python2-sip')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=('git+https://github.com/wdas/SeExpr.git'
-        'build-info.patch'
-        'CMakeLists.txt.patch'
-        'Editor_CMakeLists.txt.patch')
+        'build.patch')
 md5sums=('SKIP'
-         'bb56b587bca21debebf86b7adb6242f1'
-         '0b04cc77edebf6d364767cad0a988ef2'
-         '69721fc7e11747cfbc7f0712b4975f79')
+         '156977932afc69ff24f85be68a7357b6')
 
 pkgver() {
   cd "$srcdir/SeExpr"
@@ -26,13 +23,11 @@ pkgver() {
 }
 
 prepare() {
-  cd "$srcdir"
-  # Remove pyqtconfig module dependency
-  patch -p1 -i "$srcdir/build-info.patch"
-  # Remove demos, tests, and docs
-  patch -p1 -i "$srcdir/CMakeLists.txt.patch"
-  # Use Python2 for editor if available
-  patch -p1 -i "$srcdir/Editor_CMakeLists.txt.patch"
+  cd "$srcdir/SeExpr"
+  patch -p0 -i "../build.patch"
+  mkdir "$srcdir/SeExpr/src/SeExpr/generated"
+  touch "$srcdir/SeExpr/src/SeExpr/generated/ExprParser.tab.h"
+  touch "$srcdir/SeExpr/src/SeExpr/generated/ExprParser.cpp"
 }
 
 build() {
diff --git a/build-info.patch b/build-info.patch
deleted file mode 100644
index cbb3bd31d32f..000000000000
--- a/build-info.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- /SeExpr/src/build/build-info	2016-06-03 12:54:07.200156578 -0400
-+++ /SeExpr/src/build/build-info	2016-06-03 14:32:59.060643373 -0400
-@@ -11,7 +11,6 @@
- from distutils import sysconfig as sc
- 
- import sipconfig
--from PyQt4 import pyqtconfig
- 
- def main():
-     parser = argparse.ArgumentParser()
-@@ -55,8 +54,7 @@
- 
- 
- def pyqt4_sip(args):
--    pkg_cfg = pyqtconfig._pkg_config
--    return pkg_cfg['pyqt_sip_dir']
-+    return os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt4')
- 
- 
- def sip_inc(args):
diff --git a/build.patch b/build.patch
new file mode 100644
index 000000000000..3cf67ca9abb2
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,87 @@
+diff --git CMakeLists.txt CMakeLists.txt
+index 8dd3d24..a896aaf 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -93,7 +93,7 @@ ELSE(WIN32)
+ 
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g -std=c++11 -msse4.1")
+   if(NOT APPLE)
+-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic")
++    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic -Wno-date-time")
+   else()
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-date-time")
+   endif()
+@@ -185,10 +185,7 @@ ENDIF(ENABLE_LLVM_BACKEND AND LLVM_FOUND)
+ 
+ ## Traverse subdirectories
+ ADD_SUBDIRECTORY (src/SeExpr)
+-ADD_SUBDIRECTORY (src/ui)
+-ADD_SUBDIRECTORY (src/tests)
++#ADD_SUBDIRECTORY (src/ui)
+ #TODO: put this back
+-ADD_SUBDIRECTORY (src/py)
+-ADD_SUBDIRECTORY (src/utils)
+-ADD_SUBDIRECTORY (src/demos)
+-ADD_SUBDIRECTORY (src/doc)
++#ADD_SUBDIRECTORY (src/py)
++#ADD_SUBDIRECTORY (src/utils)
+diff --git src/build/build-info src/build/build-info
+index de58622..6f53cf2 100755
+--- src/build/build-info
++++ src/build/build-info
+@@ -11,7 +11,6 @@ if 'MACOSX_DEPLOYMENT_TARGET' in os.environ:
+ from distutils import sysconfig as sc
+ 
+ import sipconfig
+-from PyQt4 import pyqtconfig
+ 
+ def main():
+     parser = argparse.ArgumentParser()
+@@ -56,8 +55,7 @@ def python_site(args):
+ 
+ 
+ def pyqt4_sip(args):
+-    pkg_cfg = pyqtconfig._pkg_config
+-    return pkg_cfg['pyqt_sip_dir']
++    return os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt4')
+ 
+ 
+ def sip_inc(args):
+diff --git src/py/CMakeLists.txt src/py/CMakeLists.txt
+index 1cc5cac..eade98e 100644
+--- src/py/CMakeLists.txt
++++ src/py/CMakeLists.txt
+@@ -23,10 +23,10 @@ IF(APPLE)
+ #    endif()
+ 
+ ELSE()
+-EXECUTE_PROCESS( COMMAND python -c "import sys;print\"%s.%s\"%sys.version_info[0:2]" OUTPUT_VARIABLE PYTHON_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+-EXECUTE_PROCESS( COMMAND  which python OUTPUT_VARIABLE PYTHON_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE)
++EXECUTE_PROCESS( COMMAND python2 -c "import sys;print\"%s.%s\"%sys.version_info[0:2]" OUTPUT_VARIABLE PYTHON_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
++EXECUTE_PROCESS( COMMAND  which python2 OUTPUT_VARIABLE PYTHON_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE)
+ EXECUTE_PROCESS( COMMAND  bash -c "ldd `which python` | grep libpyth | awk '{print $3}'" OUTPUT_VARIABLE PYTHON_LIBRARY OUTPUT_STRIP_TRAILING_WHITESPACE)
+-EXECUTE_PROCESS( COMMAND python-config --includes OUTPUT_VARIABLE PYTHON_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
++EXECUTE_PROCESS( COMMAND python2-config --includes OUTPUT_VARIABLE PYTHON_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ #FIND_PACKAGE(PythonLibs)
+ string(REGEX REPLACE "^[-I]" "" PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_DIR}")
+ string(REGEX REPLACE "[ ]-I" " " PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_DIR}")
+diff --git src/ui/CMakeLists.txt src/ui/CMakeLists.txt
+index 67b1bc8..ea6a78f 100644
+--- src/ui/CMakeLists.txt
++++ src/ui/CMakeLists.txt
+@@ -15,8 +15,10 @@
+ 
+ # Find python includes and libs. cmake doesn't seem to handle automatically
+ 
++set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5 2.4)
+ find_package(PythonInterp)
+ find_package(PythonLibs)
++if(PYTHONLIBS_FOUND)
+ 
+ macro(get_build_info NAME STORAGE)
+     execute_process(
+@@ -121,3 +123,4 @@ ENDIF(WIN32)
+             DESTINATION ${CMAKE_INSTALL_PYTHON})
+ 
+ endif(QT4_FOUND)
++endif(PYTHONLIBS_FOUND)