Skip to content

Commit d8cb525

Browse files
hohonghohong
committed
change reg keys for codeplex release
1 parent 8c83b96 commit d8cb525

17 files changed

+53
-53
lines changed

‎Build/Common.Build.settings

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<!-- paths can be overridden by configuration -->
3636
<PropertyGroup>
37-
<OutputPath Condition="'$(OutputPath)' == ''">$(BuildRoot)\Binaries\$(Platform)\$(Configuration)\</OutputPath>
37+
<OutputPath>$(BuildRoot)\Binaries\$(Platform)\$(Configuration)\</OutputPath>
3838
<!-- $(Configuration) below is added to place Debug/Release Casablanca bits into different folders when compiled in razzle.
3939
It does not affect NativeCloud build, because environment.casablanca.settings overrides OutDir unconditionally -->
4040
<OutDir>$(OutputPath)$(Configuration)</OutDir>

‎Release/collateral/Samples/BingRequest/VC10/BingRequest.vcxproj

+9-9
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@
8080
<PrecompiledHeader>NotUsing</PrecompiledHeader>
8181
<Optimization>Disabled</Optimization>
8282
<PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE</PreprocessorDefinitions>
83-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\100\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
83+
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8484
<ExceptionHandling>Async</ExceptionHandling>
8585
</ClCompile>
8686
<Link>
8787
<SubSystem>Console</SubSystem>
8888
<GenerateDebugInformation>true</GenerateDebugInformation>
8989
<AdditionalDependencies>casablanca100.lib;%(AdditionalDependencies)</AdditionalDependencies>
90-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\100\SDK`, `InstallDir`))\lib\x86\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
90+
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x86\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9191
</Link>
9292
<PostBuildEvent>
9393
<Command>"$(ProjectDir)\copydlls.bat" x86\Debug "$(TargetDir)"</Command>
@@ -98,15 +98,15 @@
9898
<PrecompiledHeader>NotUsing</PrecompiledHeader>
9999
<Optimization>Disabled</Optimization>
100100
<PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE</PreprocessorDefinitions>
101-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\100\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
101+
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
102102
<ExceptionHandling>Async</ExceptionHandling>
103103
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
104104
</ClCompile>
105105
<Link>
106106
<SubSystem>Console</SubSystem>
107107
<GenerateDebugInformation>true</GenerateDebugInformation>
108108
<AdditionalDependencies>casablanca100.lib;%(AdditionalDependencies)</AdditionalDependencies>
109-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\100\SDK`, `InstallDir`))\lib\x64\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
109+
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x64\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
110110
</Link>
111111
<PostBuildEvent>
112112
<Command>"$(ProjectDir)\copydlls.bat" x64\Debug "$(TargetDir)"</Command>
@@ -119,7 +119,7 @@
119119
<FunctionLevelLinking>true</FunctionLevelLinking>
120120
<IntrinsicFunctions>true</IntrinsicFunctions>
121121
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
122-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\100\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
122+
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
123123
<ExceptionHandling>Async</ExceptionHandling>
124124
</ClCompile>
125125
<Link>
@@ -128,7 +128,7 @@
128128
<EnableCOMDATFolding>true</EnableCOMDATFolding>
129129
<OptimizeReferences>true</OptimizeReferences>
130130
<AdditionalDependencies>casablanca100.lib;%(AdditionalDependencies)</AdditionalDependencies>
131-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\100\SDK`, `InstallDir`))\lib\x86\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
131+
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x86\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
132132
</Link>
133133
<PostBuildEvent>
134134
<Command>"$(ProjectDir)\copydlls.bat" x86\Release "$(TargetDir)"</Command>
@@ -141,7 +141,7 @@
141141
<FunctionLevelLinking>true</FunctionLevelLinking>
142142
<IntrinsicFunctions>true</IntrinsicFunctions>
143143
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
144-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\100\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
144+
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
145145
<ExceptionHandling>Async</ExceptionHandling>
146146
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
147147
</ClCompile>
@@ -151,7 +151,7 @@
151151
<EnableCOMDATFolding>true</EnableCOMDATFolding>
152152
<OptimizeReferences>true</OptimizeReferences>
153153
<AdditionalDependencies>casablanca100.lib;%(AdditionalDependencies)</AdditionalDependencies>
154-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\100\SDK`, `InstallDir`))\lib\x64\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
154+
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x64\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155155
</Link>
156156
<PostBuildEvent>
157157
<Command>"$(ProjectDir)\copydlls.bat" x64\Release "$(TargetDir)"</Command>
@@ -164,4 +164,4 @@
164164
<None Include="copydlls.bat" />
165165
</ItemGroup>
166166
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
167-
</Project>
167+
</Project>

‎Release/collateral/Samples/BingRequest/VC10/copydlls.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@setlocal
22
@SET CASABLANCA_SDK=
3-
@for /F "tokens=1,2*" %%i in ('reg query "HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\100\SDK" /v "InstallDir"') DO (
3+
@for /F "tokens=1,2*" %%i in ('reg query "HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK" /v "InstallDir"') DO (
44
if "%%i"=="InstallDir" (
55
SET "CASABLANCA_SDK=%%k"
66
)
77
)
88

99
@copy "%CASABLANCA_SDK%\bin\%1\casablanca100.dll" %2
10-
@copy "%CASABLANCA_SDK%\bin\%1\casablanca100.pdb" %2
10+
@copy "%CASABLANCA_SDK%\bin\%1\casablanca100.pdb" %2

‎Release/collateral/Samples/BingRequest/VC11/BingRequest.vcxproj

+9-9
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@
8585
<PrecompiledHeader>NotUsing</PrecompiledHeader>
8686
<Optimization>Disabled</Optimization>
8787
<PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE</PreprocessorDefinitions>
88-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\110\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
88+
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8989
<ExceptionHandling>Async</ExceptionHandling>
9090
</ClCompile>
9191
<Link>
9292
<SubSystem>Console</SubSystem>
9393
<GenerateDebugInformation>true</GenerateDebugInformation>
9494
<AdditionalDependencies>casablanca110.lib;%(AdditionalDependencies)</AdditionalDependencies>
95-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\110\SDK`, `InstallDir`))\lib\x86\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
95+
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x86\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9696
</Link>
9797
<PostBuildEvent>
9898
<Command>"$(ProjectDir)\copydlls.bat" x86\Debug "$(TargetDir)"</Command>
@@ -103,15 +103,15 @@
103103
<PrecompiledHeader>NotUsing</PrecompiledHeader>
104104
<Optimization>Disabled</Optimization>
105105
<PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE</PreprocessorDefinitions>
106-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\110\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
106+
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107107
<ExceptionHandling>Async</ExceptionHandling>
108108
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
109109
</ClCompile>
110110
<Link>
111111
<SubSystem>Console</SubSystem>
112112
<GenerateDebugInformation>true</GenerateDebugInformation>
113113
<AdditionalDependencies>casablanca110.lib;%(AdditionalDependencies)</AdditionalDependencies>
114-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\110\SDK`, `InstallDir`))\lib\x64\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
114+
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x64\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
115115
</Link>
116116
<PostBuildEvent>
117117
<Command>"$(ProjectDir)\copydlls.bat" x64\Debug "$(TargetDir)"</Command>
@@ -124,7 +124,7 @@
124124
<FunctionLevelLinking>true</FunctionLevelLinking>
125125
<IntrinsicFunctions>true</IntrinsicFunctions>
126126
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
127-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\110\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127+
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
128128
<ExceptionHandling>Async</ExceptionHandling>
129129
</ClCompile>
130130
<Link>
@@ -133,7 +133,7 @@
133133
<EnableCOMDATFolding>true</EnableCOMDATFolding>
134134
<OptimizeReferences>true</OptimizeReferences>
135135
<AdditionalDependencies>casablanca110.lib;%(AdditionalDependencies)</AdditionalDependencies>
136-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\110\SDK`, `InstallDir`))\lib\x86\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
136+
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x86\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
137137
</Link>
138138
<PostBuildEvent>
139139
<Command>"$(ProjectDir)\copydlls.bat" x86\Release "$(TargetDir)"</Command>
@@ -146,7 +146,7 @@
146146
<FunctionLevelLinking>true</FunctionLevelLinking>
147147
<IntrinsicFunctions>true</IntrinsicFunctions>
148148
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
149-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\110\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
149+
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
150150
<ExceptionHandling>Async</ExceptionHandling>
151151
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
152152
</ClCompile>
@@ -156,7 +156,7 @@
156156
<EnableCOMDATFolding>true</EnableCOMDATFolding>
157157
<OptimizeReferences>true</OptimizeReferences>
158158
<AdditionalDependencies>casablanca110.lib;%(AdditionalDependencies)</AdditionalDependencies>
159-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\110\SDK`, `InstallDir`))\lib\x64\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
159+
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x64\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
160160
</Link>
161161
<PostBuildEvent>
162162
<Command>"$(ProjectDir)\copydlls.bat" x64\Release "$(TargetDir)"</Command>
@@ -169,4 +169,4 @@
169169
<None Include="copydlls.bat" />
170170
</ItemGroup>
171171
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
172-
</Project>
172+
</Project>

‎Release/collateral/Samples/BingRequest/VC11/copydlls.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@setlocal
22
@SET CASABLANCA_SDK=
3-
@for /F "tokens=1,2*" %%i in ('reg query "HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\110\SDK" /v "InstallDir"') DO (
3+
@for /F "tokens=1,2*" %%i in ('reg query "HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK" /v "InstallDir"') DO (
44
if "%%i"=="InstallDir" (
55
SET "CASABLANCA_SDK=%%k"
66
)
77
)
88

99
@copy "%CASABLANCA_SDK%\bin\%1\casablanca110.dll" %2
10-
@copy "%CASABLANCA_SDK%\bin\%1\casablanca110.pdb" %2
10+
@copy "%CASABLANCA_SDK%\bin\%1\casablanca110.pdb" %2

0 commit comments

Comments
 (0)