You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ad...@apache.org on 2007/05/14 17:00:46 UTC
svn commit: r537865 - in /incubator/tuscany/cpp/das: VSExpress/tuscany_das/
VSExpress/tuscany_das/Build/ VSExpress/tuscany_das/das_runtime/
VSExpress/tuscany_das/das_test/ runtime/core/src/
Author: adrianocrestani
Date: Mon May 14 08:00:44 2007
New Revision: 537865
URL: http://svn.apache.org/viewvc?view=rev&rev=537865
Log:
- added deploy to project
Added:
incubator/tuscany/cpp/das/VSExpress/tuscany_das/Build/
incubator/tuscany/cpp/das/VSExpress/tuscany_das/Build/Build.vcproj
incubator/tuscany/cpp/das/runtime/core/src/deploy.bat
Modified:
incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_runtime/das_runtime.vcproj
incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_test/das_test.vcproj
incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.sln
incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.suo
Added: incubator/tuscany/cpp/das/VSExpress/tuscany_das/Build/Build.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/VSExpress/tuscany_das/Build/Build.vcproj?view=auto&rev=537865
==============================================================================
--- incubator/tuscany/cpp/das/VSExpress/tuscany_das/Build/Build.vcproj (added)
+++ incubator/tuscany/cpp/das/VSExpress/tuscany_das/Build/Build.vcproj Mon May 14 08:00:44 2007
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8,00"
+ Name="Build"
+ ProjectGUID="{78511C3F-18E5-44FC-928D-BFAAA4A8BCBE}"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="10"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_runtime/das_runtime.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_runtime/das_runtime.vcproj?view=diff&rev=537865&r1=537864&r2=537865
==============================================================================
--- incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_runtime/das_runtime.vcproj (original)
+++ incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_runtime/das_runtime.vcproj Mon May 14 08:00:44 2007
@@ -114,13 +114,13 @@
</Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="0"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -147,15 +147,15 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\runtime\core\include;"$(TUSCANY_SDOCPP)\include";"%LIBXML2_HOME%\include";"%ZLIB_HOME%\include";"%ICONV_HOME%\include""
- PreprocessorDefinitions="WIN32;_DEBUG"
- MinimalRebuild="false"
- BasicRuntimeChecks="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
RuntimeLibrary="3"
- PrecompiledHeaderFile=""
- AssemblerListingLocation=""
- ObjectFile="$(IntDir)\"
- ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
- WarningLevel="1"
+ PrecompiledHeaderFile=".\Debug/das_runtime.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
/>
@@ -171,25 +171,43 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
+ Name="VCLinkerTool"
+ AdditionalDependencies="tuscany_sdo.lib odbc32.lib $(NOINHERIT)"
+ OutputFile="Debug\tuscany_das.dll"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories=""$(TUSCANY_SDOCPP)/lib""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\Debug/tuscany_das.pdb"
+ ImportLibrary=".\Debug/tuscany_das.lib"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\Debug/sdo_runtime.bsc"
+ OutputFile=".\Debug/das_runtime.bsc"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
- CommandLine=""
+ Description="deploy"
+ CommandLine="..\..\..\runtime\core\src\deploy.bat ..\..\..\ Debug"
/>
</Configuration>
</Configurations>
Modified: incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_test/das_test.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_test/das_test.vcproj?view=diff&rev=537865&r1=537864&r2=537865
==============================================================================
--- incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_test/das_test.vcproj (original)
+++ incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_test/das_test.vcproj Mon May 14 08:00:44 2007
@@ -15,9 +15,11 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -37,9 +39,16 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(TUSCANY_SDOCPP)/include";..\..\..\runtime\core\include"
- PreprocessorDefinitions="_DEBUG;WIN32"
+ AdditionalIncludeDirectories=""$(TUSCANY_SDOCPP)/include";..\..\..\deploy\include"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ PrecompiledHeaderFile=".\Debug/das_test.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ BrowseInformation="1"
DebugInformationFormat="4"
/>
<Tool
@@ -53,9 +62,14 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="das_runtime.lib tuscany_sdo.lib odbc32.lib"
- AdditionalLibraryDirectories=""$(TUSCANY_SDOCPP)/lib";..\..\tuscany_das\debug"
+ AdditionalDependencies="das_runtime.lib tuscany_sdo.lib odbc32.lib $(NOINHERIT)"
+ OutputFile=".\Debug/das_test.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories=""$(TUSCANY_SDOCPP)/lib";..\..\..\deploy\lib"
GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\Debug/sdo_test.pdb"
+ SubSystem="1"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -68,6 +82,7 @@
/>
<Tool
Name="VCBscMakeTool"
+ OutputFile=".\Debug/das_test.bsc"
/>
<Tool
Name="VCFxCopTool"
Modified: incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.sln
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.sln?view=diff&rev=537865&r1=537864&r2=537865
==============================================================================
--- incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.sln (original)
+++ incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.sln Mon May 14 08:00:44 2007
@@ -8,6 +8,11 @@
{964F3F93-8D1C-46BE-9724-2313CE7380AA} = {964F3F93-8D1C-46BE-9724-2313CE7380AA}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Build", "Build\Build.vcproj", "{78511C3F-18E5-44FC-928D-BFAAA4A8BCBE}"
+ ProjectSection(ProjectDependencies) = postProject
+ {964F3F93-8D1C-46BE-9724-2313CE7380AA} = {964F3F93-8D1C-46BE-9724-2313CE7380AA}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -22,6 +27,10 @@
{277D86C4-0113-49EE-A351-0D32FF2E1EF3}.Debug|Win32.Build.0 = Debug|Win32
{277D86C4-0113-49EE-A351-0D32FF2E1EF3}.Release|Win32.ActiveCfg = Release|Win32
{277D86C4-0113-49EE-A351-0D32FF2E1EF3}.Release|Win32.Build.0 = Release|Win32
+ {78511C3F-18E5-44FC-928D-BFAAA4A8BCBE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {78511C3F-18E5-44FC-928D-BFAAA4A8BCBE}.Debug|Win32.Build.0 = Debug|Win32
+ {78511C3F-18E5-44FC-928D-BFAAA4A8BCBE}.Release|Win32.ActiveCfg = Release|Win32
+ {78511C3F-18E5-44FC-928D-BFAAA4A8BCBE}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.suo
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.suo?view=diff&rev=537865&r1=537864&r2=537865
==============================================================================
Binary files - no diff available.
Added: incubator/tuscany/cpp/das/runtime/core/src/deploy.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/deploy.bat?view=auto&rev=537865
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/deploy.bat (added)
+++ incubator/tuscany/cpp/das/runtime/core/src/deploy.bat Mon May 14 08:00:44 2007
@@ -0,0 +1,63 @@
+@echo off
+
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+
+
+setlocal
+
+if . == .%1 (
+echo das root not specified
+goto usage
+)
+set deploydir=%1\deploy
+set srcdir=%1\runtime\core\src
+set includedir=%1\runtime\core\include
+
+if . == .%2 (
+echo input directory not specified
+goto usage
+)
+set inpath=%2
+echo %inpath%
+
+
+if not exist %deploydir% mkdir %deploydir%
+if not exist %deploydir%\bin mkdir %deploydir%\bin
+if not exist %deploydir%\lib mkdir %deploydir%\lib
+if not exist %deploydir%\include mkdir %deploydir%\include
+if not exist %deploydir%\include\apache mkdir %deploydir%\include\apache
+
+if not exist %deploydir%\include\apache\das mkdir %deploydir%\include\apache\das
+
+if not exist %deploydir%\include\apache\das\rdb mkdir %deploydir%\include\apache\das
+\rdb
+
+copy %includedir%\apache\das\* %deploydir%\include\apache\das
+copy %includedir%\apache\das\rdb\* %deploydir%\include\apache\das\rdb
+
+copy %inpath%\tuscany_das.lib %deploydir%\lib
+copy %inpath%\tuscany_das.dll %deploydir%\bin
+
+if exist %inpath%\tuscany_das.pdb copy %inpath%\tuscany_das.pdb %deploydir%\bin
+
+goto end
+:usage
+echo Usage: deploy <das-root> <build-output>
+:end
+
+endlocal
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org