From 99fa6e5cf479333fe36ebf461b868296ad975db1 Mon Sep 17 00:00:00 2001 From: Andy Somogyi Date: Fri, 28 Mar 2014 13:59:18 -0400 Subject: [PATCH] tweaked for installer, ran win32 tests, bumped version --- VERSION.txt | 2 +- installer/windows/CMakeLists.txt | 4 +- ...MSVC__Release_develop_2014-03-28_13-57.xml | 1084 +++++++++++++++++ wrappers/Python/setup.py | 2 +- 4 files changed, 1089 insertions(+), 3 deletions(-) create mode 100644 reports/win_i386/c_tests_MSVC__Release_develop_2014-03-28_13-57.xml diff --git a/VERSION.txt b/VERSION.txt index 35f1b22e37..3aec61c3f6 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.1.0-beta1 +1.1.0-beta2 diff --git a/installer/windows/CMakeLists.txt b/installer/windows/CMakeLists.txt index 06c3f43cad..8581ea927d 100644 --- a/installer/windows/CMakeLists.txt +++ b/installer/windows/CMakeLists.txt @@ -1,6 +1,8 @@ install( DIRECTORY . DESTINATION installer/windows - FILES_MATCHING PATTERN "*.*" + FILES_MATCHING + PATTERN "*.iss" + PATTERN "*.ico" ) diff --git a/reports/win_i386/c_tests_MSVC__Release_develop_2014-03-28_13-57.xml b/reports/win_i386/c_tests_MSVC__Release_develop_2014-03-28_13-57.xml new file mode 100644 index 0000000000..7281453d20 --- /dev/null +++ b/reports/win_i386/c_tests_MSVC__Release_develop_2014-03-28_13-57.xml @@ -0,0 +1,1084 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wrappers/Python/setup.py b/wrappers/Python/setup.py index 085388f44d..87adf1e9ae 100644 --- a/wrappers/Python/setup.py +++ b/wrappers/Python/setup.py @@ -132,7 +132,7 @@ def get_file_list (self): }, package_data={ # add dll, won't hurt unix, not there anyway - "roadrunner" : ["_roadrunner." + _sharedLibExt(), "*.dll" ], + "roadrunner" : ["_roadrunner." + _sharedLibExt(), "*.dll", "*.txt" ], "roadrunner.testing" : ["*.xml", "*.txt", "*.dat"] }, cmdclass={'sdist' : RoadRunnerSDist}