You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2012/11/05 19:08:28 UTC
svn commit: r1405898 - in /qpid/proton/trunk: ./ proton-c/CMakeLists.txt
proton-c/README proton-c/env.py
Author: kgiusti
Date: Mon Nov 5 18:08:28 2012
New Revision: 1405898
URL: http://svn.apache.org/viewvc?rev=1405898&view=rev
Log:
NO-JIRA: fix the python build scripts for Windows
Added:
qpid/proton/trunk/proton-c/env.py
- copied unchanged from r1405897, qpid/proton/branches/kgiusti-msvc2010/proton-c/env.py
Modified:
qpid/proton/trunk/ (props changed)
qpid/proton/trunk/proton-c/CMakeLists.txt
qpid/proton/trunk/proton-c/README
Propchange: qpid/proton/trunk/
------------------------------------------------------------------------------
Merged /qpid/proton/branches/kgiusti-msvc2010:r1404579-1405897
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1405898&r1=1405897&r2=1405898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Mon Nov 5 18:08:28 2012
@@ -37,7 +37,7 @@ include(soversion.cmake)
if (NOT DEFINED LIB_SUFFIX)
get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
- if (${LIB64} STREQUAL "TRUE" AND ${CMAKE_SIZEOF_VOID_P} STREQUAL "8")
+ if ("${LIB64}" STREQUAL "TRUE" AND ${CMAKE_SIZEOF_VOID_P} STREQUAL "8")
set(LIB_SUFFIX 64)
else()
set(LIB_SUFFIX "")
@@ -78,13 +78,13 @@ include_directories ("${PROJECT_SOURCE_D
add_custom_command (
OUTPUT ${PROJECT_BINARY_DIR}/encodings.h
- COMMAND PYTHONPATH=${PROJECT_SOURCE_DIR} python ${PROJECT_SOURCE_DIR}/src/codec/encodings.h.py > ${PROJECT_BINARY_DIR}/encodings.h
+ COMMAND python ${PROJECT_SOURCE_DIR}/env.py PYTHONPATH=${PROJECT_SOURCE_DIR} python ${PROJECT_SOURCE_DIR}/src/codec/encodings.h.py > ${PROJECT_BINARY_DIR}/encodings.h
DEPENDS ${PROJECT_SOURCE_DIR}/src/codec/encodings.h.py
)
add_custom_command (
OUTPUT ${PROJECT_BINARY_DIR}/protocol.h
- COMMAND PYTHONPATH=${PROJECT_SOURCE_DIR} python ${PROJECT_SOURCE_DIR}/src/protocol.h.py > ${PROJECT_BINARY_DIR}/protocol.h
+ COMMAND python ${PROJECT_SOURCE_DIR}/env.py PYTHONPATH=${PROJECT_SOURCE_DIR} python ${PROJECT_SOURCE_DIR}/src/protocol.h.py > ${PROJECT_BINARY_DIR}/protocol.h
DEPENDS ${PROJECT_SOURCE_DIR}/src/protocol.h.py
)
@@ -108,9 +108,12 @@ add_subdirectory(examples/messenger/c)
# in lieu of doing this set the library name directly.
set (UUID_LIB uuid)
-set (COMPILE_WARNING_FLAGS "-Wall -Werror -pedantic-errors")
-set (COMPILE_LANGUAGE_FLAGS "-std=c99")
-set (COMPILE_PLATFORM_FLAGS "-std=gnu99")
+# Set any additional platform specific C compiler flags
+if (CMAKE_COMPILER_IS_GNUCC)
+ set (COMPILE_WARNING_FLAGS "-Wall -Werror -pedantic-errors")
+ set (COMPILE_LANGUAGE_FLAGS "-std=c99")
+ set (COMPILE_PLATFORM_FLAGS "-std=gnu99")
+endif (CMAKE_COMPILER_IS_GNUCC)
set (qpid-proton-platform
src/driver.c
Modified: qpid/proton/trunk/proton-c/README
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/README?rev=1405898&r1=1405897&r2=1405898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/README (original)
+++ qpid/proton/trunk/proton-c/README Mon Nov 5 18:08:28 2012
@@ -25,7 +25,7 @@ Proton is multi-lingual:
Please see http://qpid.apache.org/proton for a more info.
-== Build Instructions ==
+== Build Instructions (Linux) ==
The following prerequesuites are required to do a full build. If you
do not wish to build a given language binding you can ommit the -devel
@@ -63,3 +63,59 @@ From the directory where you found this
Note that all installed files are stored in the install_manifest.txt
file.
+
+
+== Build Instructions (Windows) ==
+
+This describes how to build the Proton library on Windows using Microsoft Visual C++ 2010
+Express (VC10).
+
+The Proton build uses the cmake tool to generate the Visual Studio project files. These
+project files can then be loaded into Express and used to build the Proton library.
+
+Note that these instructions were created using a 32 bit version of Windows 7
+Professional. These instructions assume use of a command shell.
+
+The following packages must be installed:
+
+ Visual Studio 2010 Express (or equivalent)
+ Python (www.python.org)
+ Cmake (www.cmake.org)
+
+ Notes:
+ - Be sure to install MSVC Express 2010 Service Pack 1 also!
+ - python.exe _must_ be in your path
+ - cmake.exe _must_ be in your path
+
+
+Step 1: Create a 'build' directory - this must be at the same level as the 'src'
+ directory. Example:
+
+ $ cd proton-c
+ $ mkdir build
+
+Step 2: cd into the build directory
+
+ $ cd build
+
+Step 3: Generate the Visual Studio project files using cmake. You must provide:
+
+ 1) the name of the compiler you are using [see cmake documentation],
+ 2) the path to the _directory_ that contains the "CMakeLists.txt"
+ file (the parent directory, in this case).
+ Example:
+
+ $ cmake -G "Visual Studio 10" ..
+
+ Refer to the cmake documentation for more information.
+
+Step 4: Load the ALL_BUILD project into Visual C++ Express.
+
+ 4a: Run the Microsoft Visual C++ Express IDE
+ 4b: From within the IDE, open the ALL_BUILD project file - it should be in the
+ 'build' directory you created above.
+
+Step 5: Build the ALL_BUILD project.
+
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org