diff options
| author | Jose <jose@zeroc.com> | 2011-01-20 18:08:39 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2011-01-20 18:08:39 +0100 |
| commit | dda124d973804675e94448504a654bcc517a34fb (patch) | |
| tree | be819a992b5ec69b456cda27de65f87aec7b3b10 /cpp | |
| parent | 4761: Fixed Zeroc_VS_IceHome for 2008 and 2010 demo builds. (diff) | |
| download | ice-dda124d973804675e94448504a654bcc517a34fb.tar.bz2 ice-dda124d973804675e94448504a654bcc517a34fb.tar.xz ice-dda124d973804675e94448504a654bcc517a34fb.zip | |
VS Add-in 3.4.1.2 bug fixes:
4956 - Vs Add-in Util.fix must check that Globals isn't null
4953 - Vs Add-in getIceHome side effects
4674 - Consider to Add output-dir support to vsplugin
4820 - The add-in does not support parallel builds.
4630 - Allow using DEVPATH with projects
4968 - VS Add-in doesn't work with header-ext/source-ext
4942 - Visual Studio plug-in hangs with lots of syntax errors
4808 - Saving slice file during build crashes Studio
4964 - Util equalPath implementation is incorrect
4918 - Remove Slice builder from vsextension solution
4806 - Ice generated files not always opened read-only as expected
4442 - FxCop vs plugin COM visible
4915 - Issue with command line builds on machine with VS2008 & VS2010
4761 - Converted demo projects do not build (edit)
4119 - Reduce code duplication
4844 - Add cancel button to configuration dialog
4826 - Add timestamp to slice output
Diffstat (limited to 'cpp')
12 files changed, 48 insertions, 48 deletions
diff --git a/cpp/demo/Freeze/backup/Freeze.backup.client.vcproj b/cpp/demo/Freeze/backup/Freeze.backup.client.vcproj index 400933bb6e5..b8945958fd9 100755 --- a/cpp/demo/Freeze/backup/Freeze.backup.client.vcproj +++ b/cpp/demo/Freeze/backup/Freeze.backup.client.vcproj @@ -502,7 +502,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict IntLongMap,int,long IntLongMap
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict IntLongMap,int,long IntLongMap
"
Outputs="IntLongMap.h;IntLongMap.cpp"
/>
</FileConfiguration>
@@ -511,7 +511,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict IntLongMap,int,long IntLongMap
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict IntLongMap,int,long IntLongMap
"
Outputs="IntLongMap.h;IntLongMap.cpp"
/>
</FileConfiguration>
@@ -520,7 +520,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict IntLongMap,int,long IntLongMap
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict IntLongMap,int,long IntLongMap
"
Outputs="IntLongMap.h;IntLongMap.cpp"
/>
</FileConfiguration>
@@ -529,7 +529,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict IntLongMap,int,long IntLongMap
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict IntLongMap,int,long IntLongMap
"
Outputs="IntLongMap.h;IntLongMap.cpp"
/>
</FileConfiguration>
diff --git a/cpp/demo/Freeze/bench/Freeze.bench.client.vcproj b/cpp/demo/Freeze/bench/Freeze.bench.client.vcproj index bc6c266e40a..6e12de004ce 100755 --- a/cpp/demo/Freeze/bench/Freeze.bench.client.vcproj +++ b/cpp/demo/Freeze/bench/Freeze.bench.client.vcproj @@ -502,7 +502,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1 --dict Demo::Struct1ObjectMap,Demo::Struct1,Object --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive --dict-index Demo::IndexedStruct1Struct2Map,s1 --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1 --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1 --dict Demo::Struct1ObjectMap,Demo::Struct1,Object --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive --dict-index Demo::IndexedStruct1Struct2Map,s1 --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1 --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
"
Outputs="BenchTypes.cpp;BenchTypes.h"
/>
</FileConfiguration>
@@ -511,7 +511,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1 --dict Demo::Struct1ObjectMap,Demo::Struct1,Object --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive --dict-index Demo::IndexedStruct1Struct2Map,s1 --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1 --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1 --dict Demo::Struct1ObjectMap,Demo::Struct1,Object --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive --dict-index Demo::IndexedStruct1Struct2Map,s1 --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1 --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
"
Outputs="BenchTypes.cpp;BenchTypes.h"
/>
</FileConfiguration>
@@ -520,7 +520,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1 --dict Demo::Struct1ObjectMap,Demo::Struct1,Object --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive --dict-index Demo::IndexedStruct1Struct2Map,s1 --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1 --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1 --dict Demo::Struct1ObjectMap,Demo::Struct1,Object --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive --dict-index Demo::IndexedStruct1Struct2Map,s1 --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1 --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
"
Outputs="BenchTypes.cpp;BenchTypes.h"
/>
</FileConfiguration>
@@ -529,7 +529,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1 --dict Demo::Struct1ObjectMap,Demo::Struct1,Object --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive --dict-index Demo::IndexedStruct1Struct2Map,s1 --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1 --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1 --dict Demo::Struct1ObjectMap,Demo::Struct1,Object --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2 --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive --dict-index Demo::IndexedStruct1Struct2Map,s1 --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1 --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
"
Outputs="BenchTypes.cpp;BenchTypes.h"
/>
</FileConfiguration>
diff --git a/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.server.vcproj b/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.server.vcproj index 08d44389d2c..12d6a83b730 100755 --- a/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.server.vcproj +++ b/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.server.vcproj @@ -710,7 +710,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
"
Outputs="Database.cpp;Database.h"
/>
</FileConfiguration>
@@ -719,7 +719,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
"
Outputs="Database.cpp;Database.h"
/>
</FileConfiguration>
@@ -728,7 +728,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
"
Outputs="Database.cpp;Database.h"
/>
</FileConfiguration>
@@ -737,7 +737,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
"
Outputs="Database.cpp;Database.h"
/>
</FileConfiguration>
diff --git a/cpp/demo/Freeze/library/Freeze.library.collocated.vcproj b/cpp/demo/Freeze/library/Freeze.library.collocated.vcproj index 6ba33397a84..3fbe5056159 100755 --- a/cpp/demo/Freeze/library/Freeze.library.collocated.vcproj +++ b/cpp/demo/Freeze/library/Freeze.library.collocated.vcproj @@ -766,7 +766,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --ice -I"$(IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --ice -I"$(ZeroC_VS_IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(ZeroC_VS_IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
Outputs="LibraryTypes.cpp;LibraryTypes.h"
/>
</FileConfiguration>
@@ -775,7 +775,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --ice -I"$(IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --ice -I"$(ZeroC_VS_IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(ZeroC_VS_IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
Outputs="LibraryTypes.cpp;LibraryTypes.h"
/>
</FileConfiguration>
@@ -784,7 +784,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --ice -I"$(IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --ice -I"$(ZeroC_VS_IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(ZeroC_VS_IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
Outputs="LibraryTypes.cpp;LibraryTypes.h"
/>
</FileConfiguration>
@@ -793,7 +793,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --ice -I"$(IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --ice -I"$(ZeroC_VS_IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(ZeroC_VS_IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
Outputs="LibraryTypes.cpp;LibraryTypes.h"
/>
</FileConfiguration>
diff --git a/cpp/demo/Freeze/library/Freeze.library.server.vcproj b/cpp/demo/Freeze/library/Freeze.library.server.vcproj index cd731e0e33b..d594d8443fc 100755 --- a/cpp/demo/Freeze/library/Freeze.library.server.vcproj +++ b/cpp/demo/Freeze/library/Freeze.library.server.vcproj @@ -582,7 +582,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --ice -I"$(IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --ice -I"$(ZeroC_VS_IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(ZeroC_VS_IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
Outputs="LibraryTypes.cpp;LibraryTypes.h"
/>
</FileConfiguration>
@@ -591,7 +591,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --ice -I"$(IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --ice -I"$(ZeroC_VS_IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(ZeroC_VS_IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
Outputs="LibraryTypes.cpp;LibraryTypes.h"
/>
</FileConfiguration>
@@ -600,7 +600,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --ice -I"$(IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --ice -I"$(ZeroC_VS_IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(ZeroC_VS_IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
Outputs="LibraryTypes.cpp;LibraryTypes.h"
/>
</FileConfiguration>
@@ -609,7 +609,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --ice -I"$(IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --ice -I"$(ZeroC_VS_IceHome)"\slice --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(ZeroC_VS_IceHome)"\slice/Ice/BuiltinSequences.ice Library.ice
"
Outputs="LibraryTypes.cpp;LibraryTypes.h"
/>
</FileConfiguration>
diff --git a/cpp/demo/Freeze/phonebook/Freeze.phonebook.collocated.vcproj b/cpp/demo/Freeze/phonebook/Freeze.phonebook.collocated.vcproj index 58324907134..82161d8287e 100755 --- a/cpp/demo/Freeze/phonebook/Freeze.phonebook.collocated.vcproj +++ b/cpp/demo/Freeze/phonebook/Freeze.phonebook.collocated.vcproj @@ -766,7 +766,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
Outputs="NameIndex.cpp;NameIndex.h"
/>
</FileConfiguration>
@@ -775,7 +775,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
Outputs="NameIndex.cpp;NameIndex.h"
/>
</FileConfiguration>
@@ -784,7 +784,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
Outputs="NameIndex.cpp;NameIndex.h"
/>
</FileConfiguration>
@@ -793,7 +793,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
Outputs="NameIndex.cpp;NameIndex.h"
/>
</FileConfiguration>
diff --git a/cpp/demo/Freeze/phonebook/Freeze.phonebook.server.vcproj b/cpp/demo/Freeze/phonebook/Freeze.phonebook.server.vcproj index af76536632e..973202ffc8a 100755 --- a/cpp/demo/Freeze/phonebook/Freeze.phonebook.server.vcproj +++ b/cpp/demo/Freeze/phonebook/Freeze.phonebook.server.vcproj @@ -582,7 +582,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
Outputs="NameIndex.cpp;NameIndex.h"
/>
</FileConfiguration>
@@ -591,7 +591,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
Outputs="NameIndex.cpp;NameIndex.h"
/>
</FileConfiguration>
@@ -600,7 +600,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
Outputs="NameIndex.cpp;NameIndex.h"
/>
</FileConfiguration>
@@ -609,7 +609,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
"
Outputs="NameIndex.cpp;NameIndex.h"
/>
</FileConfiguration>
diff --git a/cpp/demo/Freeze/transform/Freeze.transform.create.vcproj b/cpp/demo/Freeze/transform/Freeze.transform.create.vcproj index 17a55186771..3c794d79067 100755 --- a/cpp/demo/Freeze/transform/Freeze.transform.create.vcproj +++ b/cpp/demo/Freeze/transform/Freeze.transform.create.vcproj @@ -502,7 +502,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
Outputs="Contacts.cpp;Contacts.h"
/>
</FileConfiguration>
@@ -511,7 +511,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
Outputs="Contacts.cpp;Contacts.h"
/>
</FileConfiguration>
@@ -520,7 +520,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
Outputs="Contacts.cpp;Contacts.h"
/>
</FileConfiguration>
@@ -529,7 +529,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
Outputs="Contacts.cpp;Contacts.h"
/>
</FileConfiguration>
diff --git a/cpp/demo/Freeze/transform/Freeze.transform.read.vcproj b/cpp/demo/Freeze/transform/Freeze.transform.read.vcproj index da9d91412bf..f678334e933 100755 --- a/cpp/demo/Freeze/transform/Freeze.transform.read.vcproj +++ b/cpp/demo/Freeze/transform/Freeze.transform.read.vcproj @@ -502,7 +502,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
Outputs="Contacts.cpp;Contacts.h"
/>
</FileConfiguration>
@@ -511,7 +511,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
Outputs="Contacts.cpp;Contacts.h"
/>
</FileConfiguration>
@@ -520,7 +520,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
Outputs="Contacts.cpp;Contacts.h"
/>
</FileConfiguration>
@@ -529,7 +529,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
"
Outputs="Contacts.cpp;Contacts.h"
/>
</FileConfiguration>
diff --git a/cpp/demo/Freeze/transform/Freeze.transform.readnew.vcproj b/cpp/demo/Freeze/transform/Freeze.transform.readnew.vcproj index 08a440da749..ad6d2710573 100755 --- a/cpp/demo/Freeze/transform/Freeze.transform.readnew.vcproj +++ b/cpp/demo/Freeze/transform/Freeze.transform.readnew.vcproj @@ -502,7 +502,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
Outputs="NewContacts.cpp;NewContacts.h"
/>
</FileConfiguration>
@@ -511,7 +511,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
Outputs="NewContacts.cpp;NewContacts.h"
/>
</FileConfiguration>
@@ -520,7 +520,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
Outputs="NewContacts.cpp;NewContacts.h"
/>
</FileConfiguration>
@@ -529,7 +529,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
Outputs="NewContacts.cpp;NewContacts.h"
/>
</FileConfiguration>
diff --git a/cpp/demo/Freeze/transform/Freeze.transform.recreate.vcproj b/cpp/demo/Freeze/transform/Freeze.transform.recreate.vcproj index bb9a2bc9986..2a2b0e08114 100755 --- a/cpp/demo/Freeze/transform/Freeze.transform.recreate.vcproj +++ b/cpp/demo/Freeze/transform/Freeze.transform.recreate.vcproj @@ -502,7 +502,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
Outputs="NewContacts.cpp;NewContacts.h"
/>
</FileConfiguration>
@@ -511,7 +511,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
Outputs="NewContacts.cpp;NewContacts.h"
/>
</FileConfiguration>
@@ -520,7 +520,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
Outputs="NewContacts.cpp;NewContacts.h"
/>
</FileConfiguration>
@@ -529,7 +529,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
"
Outputs="NewContacts.cpp;NewContacts.h"
/>
</FileConfiguration>
diff --git a/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcproj b/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcproj index 27dfb229141..9e2ee331dda 100755 --- a/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcproj +++ b/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcproj @@ -500,7 +500,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(IceHome)"\slice\Ice\Identity.ice
..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(IceHome)"\slice\Ice\Identity.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(ZeroC_VS_IceHome)"\slice\Ice\Identity.ice
"$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(ZeroC_VS_IceHome)"\slice\Ice\Identity.ice
"
Outputs="IdentityFileEntryMap.cpp;IdentityFileEntryMap.h;IdentityDirectoryEntryMap.cpp;IdentityDirectoryEntryMap.h"
/>
</FileConfiguration>
@@ -509,7 +509,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(IceHome)"\slice\Ice\Identity.ice
..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(IceHome)"\slice\Ice\Identity.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(ZeroC_VS_IceHome)"\slice\Ice\Identity.ice
"$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(ZeroC_VS_IceHome)"\slice\Ice\Identity.ice
"
Outputs="IdentityFileEntryMap.cpp;IdentityFileEntryMap.h;IdentityDirectoryEntryMap.cpp;IdentityDirectoryEntryMap.h"
/>
</FileConfiguration>
@@ -518,7 +518,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(IceHome)"\slice\Ice\Identity.ice
..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(IceHome)"\slice\Ice\Identity.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(ZeroC_VS_IceHome)"\slice\Ice\Identity.ice
"$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(ZeroC_VS_IceHome)"\slice\Ice\Identity.ice
"
Outputs="IdentityFileEntryMap.cpp;IdentityFileEntryMap.h;IdentityDirectoryEntryMap.cpp;IdentityDirectoryEntryMap.h"
/>
</FileConfiguration>
@@ -527,7 +527,7 @@ >
<Tool
Name="VCCustomBuildTool"
- CommandLine="..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(IceHome)"\slice\Ice\Identity.ice
..\..\..\bin\slice2freeze.exe -I"$(IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(IceHome)"\slice\Ice\Identity.ice
"
+ CommandLine=""$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(ZeroC_VS_IceHome)"\slice\Ice\Identity.ice
"$(ZeroC_VS_CppBinDir)\slice2freeze.exe" -I"$(ZeroC_VS_IceHome)"\slice -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(ZeroC_VS_IceHome)"\slice\Ice\Identity.ice
"
Outputs="IdentityFileEntryMap.cpp;IdentityFileEntryMap.h;IdentityDirectoryEntryMap.cpp;IdentityDirectoryEntryMap.h"
/>
</FileConfiguration>
|