From 721b09eee6f3870cfe7a9ec9b59ef6ba8d42e264 Mon Sep 17 00:00:00 2001
From: liuyuan04 <liuyuan04@baidu.com>
Date: Wed, 7 Sep 2016 13:34:50 +0800
Subject: [PATCH] Update Jumbo package to 0.8.0b0.

Change-Id: I0b8608feab8f6be5094e8981fc5f65cb401ed415
---
 CMakeLists.txt                   | 2 +-
 paddle/CMakeLists.txt            | 3 +++
 paddle/{setup.py => setup.py.in} | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename paddle/{setup.py => setup.py.in} (93%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d950e144ff..007f1f18bb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 project(paddle CXX C)
 set(PADDLE_MAJOR_VERSION 0)
 set(PADDLE_MINOR_VERSION 8)
-set(PADDLE_PATCH_VERSION 0b)
+set(PADDLE_PATCH_VERSION 0b0)
 set(PADDLE_VERSION ${PADDLE_MAJOR_VERSION}.${PADDLE_MINOR_VERSION}.${PADDLE_PATCH_VERSION})
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
diff --git a/paddle/CMakeLists.txt b/paddle/CMakeLists.txt
index c6fa7dc2b16..cae0f64400a 100644
--- a/paddle/CMakeLists.txt
+++ b/paddle/CMakeLists.txt
@@ -7,6 +7,9 @@ add_subdirectory(pserver)
 add_subdirectory(trainer)
 add_subdirectory(scripts)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/setup.py)
+
 if(WITH_PREDICT_SDK)
     add_subdirectory(predict)
 endif()
diff --git a/paddle/setup.py b/paddle/setup.py.in
similarity index 93%
rename from paddle/setup.py
rename to paddle/setup.py.in
index fabe2a6b4c1..da86eb795dc 100644
--- a/paddle/setup.py
+++ b/paddle/setup.py.in
@@ -35,11 +35,11 @@ except:
   pass
 
 setup(name="py_paddle",
-  version="0.8.0b",  # TODO(yuyang18): Make this version same as CMake
+  version="@PADDLE_VERSION@",
   ext_modules=[
     Extension('py_paddle._swig_paddle',      # Build SWIG Extension.
       ['Paddle_wrap.cxx'],
-      extra_link_args=["-Xlinker", '-start-group'] + 
+      extra_link_args=["-Xlinker", '-start-group'] +
                         extra_links + ["-Xlinker", "-end-group"]
     )
   ],
-- 
GitLab