This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "roboptim-core".
The branch, master has been updated
via 68192c580b737cc9e0508fc0354a48870e41cc30 (commit)
via 17d4fc5800b314d3238e6fa7d71e596e2491dc48 (commit)
via 020a3ec5f42d0138ead72c1e615bf532a9eaa8f9 (commit)
via fc4f239e5221989e655c4af9e898c7ad75d6ebf6 (commit)
from 4d0488538da5dc8eb960a9931119f7b86d7ab7c9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 68192c580b737cc9e0508fc0354a48870e41cc30
Author: Francois Keith <[email protected]>
Date: Tue Apr 6 22:19:05 2010 +0900
Win32: Modify the install project so that the property sheet is installed
in .../share/msvc/ Allows heritance of adequate flags in external projects by a
simple copy/paste of this file
* msvc/INSTALL/INSTALL.vcproj
* msvc/roboptim-core/boost.vsprops : default boost version is now 1_39_0
* msvc/roboptim-core/rob_opt.vsprops ->
msvc/roboptim-core/roboptim-core.vsprops
Signed-of-by: Keith Francois <[email protected]>
diff --git a/msvc/INSTALL/INSTALL.vcproj b/msvc/INSTALL/INSTALL.vcproj
index fc8f136..b4cec24 100644
--- a/msvc/INSTALL/INSTALL.vcproj
+++ b/msvc/INSTALL/INSTALL.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="INSTALL"
ProjectGUID="{97411593-CAE3-4A98-BD15-41A81614C4FC}"
RootNamespace="INSTALL"
@@ -19,7 +19,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="10"
-
InheritedPropertySheets="..\roboptim-core\rob_opt.vsprops"
+
InheritedPropertySheets="..\roboptim-core\roboptim-core.vsprops"
CharacterSet="2"
>
<Tool
@@ -33,7 +33,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="set
root_directory=%ROB_OPTIM_INSTALL_DIR%

XCOPY
..\..\include %root_directory%\include /S /E /C /I /F /K /Y
/EXCLUDE:excludedFiles.txt
XCOPY
..\roboptim-core\Debug\roboptim-cored.dll %root_directory%\bin\ /S /E /C /I
/F /K /Y
XCOPY ..\roboptim-core\Debug\roboptim-cored.lib
%root_directory%\lib\ /S /E /C /I /F /K /Y
XCOPY
..\roboptim-core\Debug\roboptim-cored.pdb %root_directory%\bin\ /S /E /C /I
/F /K /Y

XCOPY
..\roboptim-core\Debug\roboptim-core-dummy-plugind.dll %root_directory%\bin\
/S /E /C /I /F /K /Y
XCOPY
..\roboptim-core\Debug\roboptim-core-dummy-plugind.pdb %root_directory%\bin\
/S /E /C /I /F /K /Y
"
+ CommandLine="set
root_directory=%ROB_OPTIM_INSTALL_DIR%

XCOPY
..\..\include %root_directory%\include /S /E /C /I /F /K /Y
/EXCLUDE:excludedFiles.txt
XCOPY
..\roboptim-core\Debug\roboptim-cored.dll %root_directory%\bin\ /S /E /C /I
/F /K /Y
XCOPY ..\roboptim-core\Debug\roboptim-cored.lib
%root_directory%\lib\ /S /E /C /I /F /K /Y
XCOPY
..\roboptim-core\Debug\roboptim-cored.pdb %root_directory%\bin\ /S /E /C /I
/F /K /Y
XCOPY ..\roboptim-core\roboptim-core.vsprops
%root_directory%\share\msvc\ /S /C /I /F /K /Y
"
/>
</Configuration>
<Configuration
@@ -41,7 +41,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="10"
-
InheritedPropertySheets="..\roboptim-core\rob_opt.vsprops"
+
InheritedPropertySheets="..\roboptim-core\roboptim-core.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -56,7 +56,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="set
root_directory=%ROB_OPTIM_INSTALL_DIR%

XCOPY
..\..\include %root_directory%\include /S /E /C /I /F /K /Y
/EXCLUDE:excludedFiles.txt
XCOPY
..\roboptim-core\Release\roboptim-core.dll %root_directory%\bin\ /S /E /C /I
/F /K /Y
XCOPY
..\roboptim-core\Release\roboptim-core-dummy-plugin.dll %root_directory%\bin\
/S /E /C /I /F /K /Y
XCOPY
..\roboptim-core\Release\roboptim-core.lib %root_directory%\lib\ /S /E /C /I
/F /K /Y
"
+ CommandLine="set
root_directory=%ROB_OPTIM_INSTALL_DIR%

XCOPY
..\..\include %root_directory%\include /S /E /C /I /F /K /Y
/EXCLUDE:excludedFiles.txt
XCOPY
..\roboptim-core\Release\roboptim-core.dll %root_directory%\bin\ /S /E /C /I
/F /K /Y
XCOPY
..\roboptim-core\Release\roboptim-core-dummy-plugin.dll %root_directory%\bin\
/S /E /C /I /F /K /Y
XCOPY
..\roboptim-core\Release\roboptim-core.lib %root_directory%\lib\ /S /E /C /I
/F /K /Y
XCOPY ..\roboptim-core\roboptim-core.vsprops
%root_directory%\share\msvc\ /S /C /I /F /K /Y
"
/>
</Configuration>
</Configurations>
diff --git a/msvc/roboptim-core/boost.vsprops b/msvc/roboptim-core/boost.vsprops
index 4a2f72d..a3a7925 100644
--- a/msvc/roboptim-core/boost.vsprops
+++ b/msvc/roboptim-core/boost.vsprops
@@ -6,6 +6,10 @@
>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories=""E:\Libraries\Boost\boost_1_36_0\include\boost-1_36";"E:\Libraries\Boost\boost_1_36_0""
+
AdditionalIncludeDirectories=""$(BOOST_ROOT)";$(BOOST_ROOT)/include"
+ />
+ <UserMacro
+ Name="BOOST_ROOT"
+ Value="C:\Libraries\Boost\boost_1_39_0"
/>
</VisualStudioPropertySheet>
diff --git a/msvc/roboptim-core/rob_opt.vsprops
b/msvc/roboptim-core/roboptim-core.vsprops
similarity index 56%
rename from msvc/roboptim-core/rob_opt.vsprops
rename to msvc/roboptim-core/roboptim-core.vsprops
index 90c3793..21344e6 100644
--- a/msvc/roboptim-core/rob_opt.vsprops
+++ b/msvc/roboptim-core/roboptim-core.vsprops
@@ -2,19 +2,23 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="rob_opt"
+ Name="roboptim-core"
>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories=""${ROB_OPTIM_INSTALL_DIR}\include""
+
AdditionalIncludeDirectories=""$(ROB_OPTIM_INSTALL_DIR)\include";"$(BOOST_ROOT)""
/>
<Tool
Name="VCLinkerTool"
-
AdditionalLibraryDirectories=""${ROB_OPTIM_INSTALL_DIR}\lib""
+
AdditionalLibraryDirectories=""$(ROB_OPTIM_INSTALL_DIR)\lib""
/>
<UserMacro
Name="ROB_OPTIM_INSTALL_DIR"
Value=""C:/Libraries/roboptim""
PerformEnvironmentSet="true"
/>
+ <UserMacro
+ Name="BOOST_ROOT"
+ Value="C:\Libraries\Boost\boost_1_39_0"
+ />
</VisualStudioPropertySheet>
commit 17d4fc5800b314d3238e6fa7d71e596e2491dc48
Author: Francois Keith <[email protected]>
Date: Mon Apr 5 20:27:02 2010 +0900
Suppress the debug information in Release mode
* msvc/roboptim-core/roboptim-core.vcproj: here
* msvc/simple/simple.vcproj: here
* msvc/roboptim-core-dummy-plugin/roboptim-core-dummy-plugin.vcproj:
and here
Signed-of-by: Keith Francois <[email protected]>
diff --git a/msvc/roboptim-core-dummy-plugin/roboptim-core-dummy-plugin.vcproj
b/msvc/roboptim-core-dummy-plugin/roboptim-core-dummy-plugin.vcproj
index 39a34cc..035b28b 100644
--- a/msvc/roboptim-core-dummy-plugin/roboptim-core-dummy-plugin.vcproj
+++ b/msvc/roboptim-core-dummy-plugin/roboptim-core-dummy-plugin.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="shift_jis"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="roboptim-core-dummy-plugin"
ProjectGUID="{21220FE9-892A-4D20-BC45-7697DFC5242F}"
RootNamespace="roboptimcoredummyplugin"
@@ -132,7 +132,7 @@
/>
<Tool
Name="VCLinkerTool"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="false"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
diff --git a/msvc/roboptim-core/roboptim-core.vcproj
b/msvc/roboptim-core/roboptim-core.vcproj
index 7013e10..a8bec92 100644
--- a/msvc/roboptim-core/roboptim-core.vcproj
+++ b/msvc/roboptim-core/roboptim-core.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="shift_jis"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="roboptim-core"
ProjectGUID="{C6C47D7F-6793-4E24-9447-2DD0BA87BE6F}"
RootNamespace="roboptimcore"
@@ -134,7 +134,7 @@
/>
<Tool
Name="VCLinkerTool"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="false"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
@@ -257,7 +257,6 @@
RelativePath="..\..\src\twice-derivable-function.cc"
>
</File>
-
<File
RelativePath="..\..\src\util.cc"
>
diff --git a/msvc/simple/simple.vcproj b/msvc/simple/simple.vcproj
index 182cd99..d6ebb0f 100644
--- a/msvc/simple/simple.vcproj
+++ b/msvc/simple/simple.vcproj
@@ -132,7 +132,7 @@
/>
<Tool
Name="VCLinkerTool"
- GenerateDebugInformation="true"
+ GenerateDebugInformation="false"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
commit 020a3ec5f42d0138ead72c1e615bf532a9eaa8f9
Author: Francois Keith <[email protected]>
Date: Mon Apr 5 19:56:12 2010 +0900
Correct the path for the included files so as to handle the test "simple"
* msvc/simple/simple.vcproj: here
Signed-of-by: Keith Francois <[email protected]>
diff --git a/msvc/simple/simple.vcproj b/msvc/simple/simple.vcproj
index 4cbbd2c..182cd99 100644
--- a/msvc/simple/simple.vcproj
+++ b/msvc/simple/simple.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="shift_jis"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="simple"
ProjectGUID="{C2F563F8-9C86-47EB-B3A9-F687D6CF62BC}"
RootNamespace="simple"
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\src";"$(ProjectDir)\..\..\include";"$(ProjectDir)\..\..\tests";"$(ProjectDir)\..\roboptim-core";"$(ProjectDir)""
+
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\src";"$(ProjectDir)\..\..\include";"$(ProjectDir)\..\..\tests";"$(ProjectDir)\..\..\tests\shared-tests";"$(ProjectDir)\..\roboptim-core";"$(ProjectDir)""
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -115,7 +115,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
-
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\src";"$(ProjectDir)\..\..\include";"$(ProjectDir)\..\..\tests";"$(ProjectDir)\..\roboptim-core";"$(ProjectDir)""
+
AdditionalIncludeDirectories=""$(ProjectDir)\..\..\src";"$(ProjectDir)\..\..\include";"$(ProjectDir)\..\..\tests";"$(ProjectDir)\..\..\tests\shared-tests";"$(ProjectDir)\..\roboptim-core";"$(ProjectDir)""
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
commit fc4f239e5221989e655c4af9e898c7ad75d6ebf6
Author: Francois Keith <[email protected]>
Date: Mon Apr 5 19:54:23 2010 +0900
Add to the .gitignore file the files contained in the msvc folder
* .gitignore: here
Signed-of-by: Keith Francois <[email protected]>
diff --git a/.gitignore b/.gitignore
index 8c696e9..fe41d88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,8 @@ testsuite.log
libltdl/*
.version
.tarball-version
+msvc/*/Debug
+msvc/*/Release
+msvc/*/*.ncb
+msvc/*/*.suo
+msvc/*/*.vcproj.*
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 5 +++++
msvc/INSTALL/INSTALL.vcproj | 10 +++++-----
.../roboptim-core-dummy-plugin.vcproj | 4 ++--
msvc/roboptim-core/boost.vsprops | 6 +++++-
msvc/roboptim-core/roboptim-core.vcproj | 5 ++---
.../{rob_opt.vsprops => roboptim-core.vsprops} | 10 +++++++---
msvc/simple/simple.vcproj | 8 ++++----
7 files changed, 30 insertions(+), 18 deletions(-)
rename msvc/roboptim-core/{rob_opt.vsprops => roboptim-core.vsprops} (56%)
hooks/post-receive
--
roboptim-core
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
roboptim-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/roboptim-commit
