include UlibCpp using vcpkg, not using NuGet

vividos · May 14, 2023 · 453fa43 · 453fa43
1 parent 85570c3
commit 453fa43
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 53 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -25,7 +25,6 @@ install:
 
 before_build:
   - ps: source\Patch-BuildVersion.ps1 -version $env:appveyor_build_version
-  - cmd: nuget restore
 
 build:
   project: winlame.sln

diff --git a/build.cmd b/build.cmd
@@ -19,9 +19,6 @@ pushd source\libraries
 call CopyLibraries.cmd Release
 popd
 
-REM restore NuGet packages
-buildtools\nuget restore winlame.sln
-
 REM build solution
 msbuild /m winlame.sln /property:Configuration=Release,Platform=Win32 /target:Rebuild
 

diff --git a/buildtools/nuget.exe b/buildtools/nuget.exe
diff --git a/source/winlame/encoder/encoder.vcxproj b/source/winlame/encoder/encoder.vcxproj
@@ -176,17 +176,6 @@
       <Project>{0b3f6b1a-d78e-47db-a48c-d3daa16e17ce}</Project>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Vividos.UlibCpp.Static.4.4.0\build\native\Vividos.UlibCpp.Static.targets" Condition="Exists('..\..\..\packages\Vividos.UlibCpp.Static.4.4.0\build\native\Vividos.UlibCpp.Static.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Vividos.UlibCpp.Static.4.4.0\build\native\Vividos.UlibCpp.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Vividos.UlibCpp.Static.4.4.0\build\native\Vividos.UlibCpp.Static.targets'))" />
-  </Target>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>
diff --git a/source/winlame/encoder/encoder.vcxproj.filters b/source/winlame/encoder/encoder.vcxproj.filters
@@ -235,7 +235,4 @@
       <UniqueIdentifier>{062b159d-651e-4412-aced-487d57f2c968}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
 </Project>
diff --git a/source/winlame/encoder/packages.config b/source/winlame/encoder/packages.config
diff --git a/source/winlame/packages.config b/source/winlame/packages.config
diff --git a/source/winlame/unittest/packages.config b/source/winlame/unittest/packages.config
diff --git a/source/winlame/unittest/unittest.vcxproj b/source/winlame/unittest/unittest.vcxproj
@@ -112,7 +112,6 @@
     <ResourceCompile Include="unittest.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="res\alsa-6ch.opus" />
     <None Include="res\Jungle_S-RepaidGa-10582_hifi.mp3" />
     <None Include="res\Jungle_S-RepaidGa-10582_hifi.aac" />
@@ -125,13 +124,5 @@
     <None Include="res\Jungle_S-RepaidGa-10582_hifi.wma" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Vividos.UlibCpp.Static.4.4.0\build\native\Vividos.UlibCpp.Static.targets" Condition="Exists('..\..\..\packages\Vividos.UlibCpp.Static.4.4.0\build\native\Vividos.UlibCpp.Static.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Vividos.UlibCpp.Static.4.4.0\build\native\Vividos.UlibCpp.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Vividos.UlibCpp.Static.4.4.0\build\native\Vividos.UlibCpp.Static.targets'))" />
-  </Target>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>
diff --git a/source/winlame/unittest/unittest.vcxproj.filters b/source/winlame/unittest/unittest.vcxproj.filters
@@ -105,6 +105,5 @@
     <None Include="res\alsa-6ch.opus">
       <Filter>Resource Files\res</Filter>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
 </Project>
diff --git a/source/winlame/winlame.vcxproj b/source/winlame/winlame.vcxproj
@@ -206,7 +206,6 @@
     <Image Include="res\winlame.ico" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="res\about.html" />
     <None Include="res\MainFrameRibbon.bml" />
   </ItemGroup>
@@ -246,13 +245,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\packages\Vividos.UlibCpp.Static.4.4.0\build\native\Vividos.UlibCpp.Static.targets" Condition="Exists('..\..\packages\Vividos.UlibCpp.Static.4.4.0\build\native\Vividos.UlibCpp.Static.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Vividos.UlibCpp.Static.4.4.0\build\native\Vividos.UlibCpp.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Vividos.UlibCpp.Static.4.4.0\build\native\Vividos.UlibCpp.Static.targets'))" />
-  </Target>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>
diff --git a/source/winlame/winlame.vcxproj.filters b/source/winlame/winlame.vcxproj.filters
@@ -439,7 +439,6 @@
     <None Include="res\MainFrameRibbon.bml">
       <Filter>Modern UI Files\Resource Files\Generated Files</Filter>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="winlame.rc">

diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -0,0 +1,15 @@
+{
+  "default-registry": {
+    "kind": "git",
+    "repository": "https://github.com/Microsoft/vcpkg",
+    "baseline": "a7b6122f6b6504d16d96117336a0562693579933"
+  },
+  "registries": [
+    {
+      "kind": "git",
+      "repository": "https://github.com/vividos/vcpkg-registry",
+      "baseline": "e16bc7be0e752323175719c3051d70531dd55a98",
+      "packages": [ "vividos-ulibcpp" ]
+    }
+  ]
+}
diff --git a/vcpkg.json b/vcpkg.json
@@ -3,6 +3,7 @@
   "name": "winlame",
   "version-string": "2.23.0",
   "dependencies": [
+    "vividos-ulibcpp",
     "mpg123",
     "libogg",
     "libvorbis",

diff --git a/winlame.sln b/winlame.sln
@@ -44,6 +44,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Readme.md = Readme.md
 		source\SonarCloud.cmd = source\SonarCloud.cmd
 		TODO.txt = TODO.txt
+		vcpkg-configuration.json = vcpkg-configuration.json
 		vcpkg.json = vcpkg.json
 		source\version.h = source\version.h
 	EndProjectSection