diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d249df..dd81893 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -383,38 +383,6 @@ jobs: myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f done if: startsWith(github.ref, 'refs/tags/') -##### msvs ##### - msvs: - runs-on: windows-latest - defaults: - run: - shell: powershell - steps: - - name: git clone - uses: actions/checkout@v3 - - name: install CoAPP tools - uses: myci-actions/install-coapp-tools@main - - name: nuget update - run: | - nuget restore msvs_solution/msvs_solution.sln - nuget update msvs_solution/msvs_solution.sln - - name: add msbuild to PATH - uses: microsoft/setup-msbuild@v1.1 - - name: build - run: .\nuget\build_nuget.ps1 - - name: publish test report - uses: mikepenz/action-junit-report@v2.3.0 - with: - report_paths: 'nuget/junit_*.xml' - github_token: ${{ secrets.GITHUB_TOKEN }} - check_name: "test report: ${{ github.job }}" - fail_on_failure: true - - name: deploy - uses: myci-actions/publish-nuget@main - with: - filename: '.\nuget\*.nupkg' - api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }} - if: startsWith(github.ref, 'refs/tags/') ##### vcpkg-linux ##### vcpkg-linux: strategy: @@ -493,6 +461,10 @@ jobs: # accorging to github actions windows image docs, it should define VCPKG_INSTALLATION_ROOT env var, # but on practice it is not set, so specify vcpkg root path explicitly with: {name: VCPKG_ROOT, value: "C:/vcpkg/"} + - name: make local symbolic link to VCPKG installation directory + # this is needed at least for actions/upload-artifact to be able to find vcpkg install logs + shell: powershell + run: New-Item -ItemType SymbolicLink -Path vcpkg-installation -Target $env:VCPKG_ROOT - name: prepare vcpkg port run: myci-vcpkg-prepare.ps1 -gitref ${{ github.sha }} - name: test vcpkg port @@ -509,6 +481,63 @@ jobs: path: | vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/ build/vcpkg/**/*.log +##### vcpkg-ios ##### + vcpkg-ios: + runs-on: macos-latest + strategy: + fail-fast: false + matrix: + config: + - Debug + - Release + name: vcpkg - ios | ${{ matrix.config }} + steps: + - name: workaround python2 and python3 issue when upgrading python + run : | + rm -rf /usr/local/bin/2to3* + rm -rf /usr/local/bin/idle3* + rm -rf /usr/local/bin/pydoc3* + rm -rf /usr/local/bin/python3 + rm -rf /usr/local/bin/python3-config + rm -rf /usr/local/bin/python3* + rm -rf /usr/local/bin/python3*-config + - name: git clone + uses: myci-actions/checkout@main + with: + submodules: true # non-recursive, no remote + - name: install vcpkg + run: | + git clone https://github.com/microsoft/vcpkg.git vcpkg-installation + (cd vcpkg-installation; ./bootstrap-vcpkg.sh) + - name: set VCPKG_ROOT + uses: myci-actions/export-env-var@main + with: {name: VCPKG_ROOT, value: "$(pwd)/vcpkg-installation"} + - name: add VCPKG_ROOT to PATH + uses: myci-actions/export-env-var@main + with: {name: PATH, value: "$PATH:$VCPKG_ROOT"} + - name: add cppfw tap + run: | + brew tap cppfw/tap + brew update + - name: install ci tools + run: brew install myci cmake + - name: prepare vcpkg port + run: | + myci-vcpkg-prepare.sh --git-ref ${{ github.sha }} + - name: test vcpkg port + run: | + cd build/vcpkg/test + cmake -G Xcode -D CMAKE_SYSTEM_NAME=iOS -D VCPKG_TARGET_TRIPLET=arm64-ios-simulator . + cmake --build . --parallel --config ${{ matrix.config }} -- -sdk iphonesimulator -arch arm64 +# ./test + - name: upload vcpkg logs to artifacts + if: always() # even if previous steps fail, this one needs to be run + uses: actions/upload-artifact@v4 + with: + name: vcpkg_ios_${{ matrix.config }}_logs + path: | + vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/ + build/vcpkg/**/*.log ##### conan - linux ##### conan-linux: strategy: diff --git a/build/debian/rules b/build/debian/rules index 7d4642b..6b04fc7 100755 --- a/build/debian/rules +++ b/build/debian/rules @@ -3,7 +3,7 @@ export PREFIX := /usr dbgsrc_pkg_name := $(filter %-dbgsrc, $(shell awk '/^Package: /{print $2}' debian/control)) -debug_prefix_map_arg := -fdebug-prefix-map=$(shell pwd)/src=$(PREFIX)/src/$(patsubst %-dbgsrc,%,$(dbgsrc_pkg_name)) +debug_prefix_map_arg := -fdebug-prefix-map=$(abspath ../src)=$(PREFIX)/src/$(patsubst %-dbgsrc,%,$(dbgsrc_pkg_name)) export PRORAB_INSTALL_DBGSRC := true diff --git a/build/vcpkg/test/vcpkg-configuration.json b/build/vcpkg/test/vcpkg-configuration.json index 346cb61..35654d4 100644 --- a/build/vcpkg/test/vcpkg-configuration.json +++ b/build/vcpkg/test/vcpkg-configuration.json @@ -8,7 +8,7 @@ { "kind": "git", "repository": "https://github.com/cppfw/vcpkg-repo/", - "baseline": "a1acf70680ceccc3c04456ea763d71d662e10df1", + "baseline": "f7ce92c97495941cb2dbbe9f1e9ae1add0d7955d", "reference": "main", "packages": [ "myci", diff --git a/build/vcpkg/vcpkg.json.in b/build/vcpkg/vcpkg.json.in index 716798d..2e91546 100644 --- a/build/vcpkg/vcpkg.json.in +++ b/build/vcpkg/vcpkg.json.in @@ -15,7 +15,7 @@ }, { "name" : "myci", - "host" : true + "host" : false }, "utki", "clargs", diff --git a/msvs_solution/basic_test/basic_test.vcxproj b/msvs_solution/basic_test/basic_test.vcxproj deleted file mode 100644 index c8b056e..0000000 --- a/msvs_solution/basic_test/basic_test.vcxproj +++ /dev/null @@ -1,755 +0,0 @@ - - - - - v141_Debug - Win32 - - - v141_Debug - x64 - - - v141_Release - Win32 - - - v141_Release - x64 - - - v142_Debug_MD - Win32 - - - v142_Debug_MT - Win32 - - - v142_Debug_MT - x64 - - - v142_Release_MD - Win32 - - - v142_Debug_MD - x64 - - - v142_Release_MD - x64 - - - v142_Release_MT - Win32 - - - v142_Release_MT - x64 - - - v143_Debug_MD - Win32 - - - v143_Debug_MD - x64 - - - v143_Debug_MT - Win32 - - - v143_Debug_MT - x64 - - - v143_Release_MD - Win32 - - - v143_Release_MD - x64 - - - v143_Release_MT - Win32 - - - v143_Release_MT - x64 - - - - 16.0 - Win32Proj - {f9529845-4306-46e7-bd01-4c5f757d9bf8} - basictest - 10.0.19041.0 - - - - Application - true - v142 - MultiByte - - - Application - true - v143 - MultiByte - - - Application - true - v141 - MultiByte - - - Application - true - v142 - MultiByte - - - Application - true - v143 - MultiByte - - - Application - false - v142 - true - MultiByte - - - Application - false - v143 - true - MultiByte - - - Application - false - v141 - true - MultiByte - - - Application - false - v142 - true - MultiByte - - - Application - false - v143 - true - MultiByte - - - Application - true - v142 - MultiByte - - - Application - true - v143 - MultiByte - - - Application - true - v141 - MultiByte - - - Application - true - v142 - MultiByte - - - Application - true - v143 - MultiByte - - - Application - false - v142 - true - MultiByte - - - Application - false - v143 - true - MultiByte - - - Application - false - v141 - true - MultiByte - - - Application - false - v142 - true - MultiByte - - - Application - false - v143 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - MultiThreadedDebugDLL - - - true - MultiThreadedDebugDLL - - - true - MultiThreadedDebugDLL - - - true - MultiThreadedDebug - - - true - MultiThreadedDebug - - - false - MultiThreadedDLL - - - false - MultiThreadedDLL - - - false - MultiThreadedDLL - - - false - MultiThreaded - - - false - MultiThreaded - - - true - MultiThreadedDebugDLL - - - true - MultiThreadedDebugDLL - - - true - MultiThreadedDebugDLL - - - true - MultiThreadedDebug - - - true - MultiThreadedDebug - - - false - MultiThreadedDLL - - - false - MultiThreadedDLL - - - false - MultiThreadedDLL - - - false - MultiThreaded - - - false - MultiThreaded - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - - - Console - true - Default - - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - - - Console - true - Default - - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - - - Console - true - Default - - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - MultiThreadedDebug - - - Console - true - Default - - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - MultiThreadedDebug - - - Console - true - Default - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - false - - - Console - true - true - true - Default - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - false - - - Console - true - true - true - Default - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - false - - - Console - true - true - true - Default - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - false - MultiThreaded - - - Console - true - true - true - Default - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - false - MultiThreaded - - - Console - true - true - true - Default - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - - - Console - true - Default - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - - - Console - true - Default - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - - - Console - true - Default - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - MultiThreadedDebug - - - Console - true - Default - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - MultiThreadedDebug - - - Console - true - Default - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - false - - - Console - true - true - true - Default - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - false - - - Console - true - true - true - Default - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - false - - - Console - true - true - true - Default - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - false - MultiThreaded - - - Console - true - true - true - Default - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - OldStyle - false - MultiThreaded - - - Console - true - true - true - Default - - - - - - - - - {309b0482-b092-4fdc-beb8-008989753887} - - - - - - - - - - - - - - - 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}. - - - - - - - \ No newline at end of file diff --git a/msvs_solution/basic_test/basic_test.vcxproj.filters b/msvs_solution/basic_test/basic_test.vcxproj.filters deleted file mode 100644 index d8129d7..0000000 --- a/msvs_solution/basic_test/basic_test.vcxproj.filters +++ /dev/null @@ -1,28 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - - - - \ No newline at end of file diff --git a/msvs_solution/basic_test/basic_test.vcxproj.user b/msvs_solution/basic_test/basic_test.vcxproj.user deleted file mode 100644 index 0f14913..0000000 --- a/msvs_solution/basic_test/basic_test.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/msvs_solution/basic_test/packages.config b/msvs_solution/basic_test/packages.config deleted file mode 100644 index 50a2309..0000000 --- a/msvs_solution/basic_test/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/msvs_solution/libtst/libtst.vcxproj b/msvs_solution/libtst/libtst.vcxproj deleted file mode 100644 index 413b3d9..0000000 --- a/msvs_solution/libtst/libtst.vcxproj +++ /dev/null @@ -1,788 +0,0 @@ - - - - - v141_Debug - Win32 - - - v141_Debug - x64 - - - v141_Release - Win32 - - - v141_Release - x64 - - - v142_Debug_MD - Win32 - - - v142_Release_MD - Win32 - - - v142_Debug_MD - x64 - - - v142_Release_MD - x64 - - - v142_Debug_MT - Win32 - - - v142_Debug_MT - x64 - - - v142_Release_MT - Win32 - - - v142_Release_MT - x64 - - - v143_Debug_MD - Win32 - - - v143_Debug_MD - x64 - - - v143_Debug_MT - Win32 - - - v143_Debug_MT - x64 - - - v143_Release_MD - Win32 - - - v143_Release_MD - x64 - - - v143_Release_MT - Win32 - - - v143_Release_MT - x64 - - - - 16.0 - Win32Proj - {309b0482-b092-4fdc-beb8-008989753887} - libtst - 10.0.19041.0 - - - - StaticLibrary - true - v142 - MultiByte - - - StaticLibrary - true - v143 - MultiByte - - - StaticLibrary - true - v141 - MultiByte - - - StaticLibrary - true - v142 - MultiByte - - - StaticLibrary - true - v143 - MultiByte - - - StaticLibrary - false - v142 - false - MultiByte - - - StaticLibrary - false - v143 - false - MultiByte - - - StaticLibrary - false - v141 - false - MultiByte - - - StaticLibrary - false - v142 - false - MultiByte - - - StaticLibrary - false - v143 - false - MultiByte - - - StaticLibrary - true - v142 - MultiByte - - - StaticLibrary - true - v143 - MultiByte - - - StaticLibrary - true - v141 - MultiByte - - - StaticLibrary - true - v142 - MultiByte - - - StaticLibrary - true - v143 - MultiByte - - - StaticLibrary - false - v142 - false - MultiByte - - - StaticLibrary - false - v143 - false - MultiByte - - - StaticLibrary - false - v141 - false - MultiByte - - - StaticLibrary - false - v142 - false - MultiByte - - - StaticLibrary - false - v143 - false - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - MultiThreadedDebugDLL - - - true - MultiThreadedDebugDLL - - - true - MultiThreadedDebugDLL - - - true - MultiThreadedDebug - - - true - MultiThreadedDebug - - - false - MultiThreadedDLL - - - false - MultiThreadedDLL - - - false - MultiThreadedDLL - - - false - MultiThreaded - - - false - MultiThreaded - - - true - MultiThreadedDebugDLL - - - true - MultiThreadedDebugDLL - - - true - MultiThreadedDebugDLL - - - true - MultiThreadedDebug - - - true - MultiThreadedDebug - - - false - MultiThreadedDLL - - - false - MultiThreadedDLL - - - false - MultiThreadedDLL - - - false - MultiThreaded - - - false - MultiThreaded - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - stdcpp17 - - - Console - true - - - false - - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - stdcpp17 - - - Console - true - - - false - - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - stdcpp17 - - - Console - true - - - false - - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - MultiThreadedDebug - stdcpp17 - - - Console - true - - - false - - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - MultiThreadedDebug - stdcpp17 - - - Console - true - - - false - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - stdcpp17 - - - Console - true - true - true - - - false - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - stdcpp17 - - - Console - true - true - true - - - false - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - stdcpp17 - - - Console - true - true - true - - - false - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - MultiThreaded - stdcpp17 - - - Console - true - true - true - - - false - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - MultiThreaded - stdcpp17 - - - Console - true - true - true - - - false - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - stdcpp17 - - - Console - true - - - false - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - stdcpp17 - - - Console - true - - - false - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - stdcpp17 - - - Console - true - - - false - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - MultiThreadedDebug - stdcpp17 - - - Console - true - - - false - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - MultiThreadedDebug - stdcpp17 - - - Console - true - - - false - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - stdcpp17 - - - Console - true - true - true - - - false - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - stdcpp17 - - - Console - true - true - true - - - false - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - stdcpp17 - - - Console - true - true - true - - - false - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - MultiThreaded - stdcpp17 - - - Console - true - true - true - - - false - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - OldStyle - MultiThreaded - stdcpp17 - - - Console - true - true - true - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - 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}. - - - - - - - \ No newline at end of file diff --git a/msvs_solution/libtst/libtst.vcxproj.filters b/msvs_solution/libtst/libtst.vcxproj.filters deleted file mode 100644 index 7f2189b..0000000 --- a/msvs_solution/libtst/libtst.vcxproj.filters +++ /dev/null @@ -1,52 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - - \ No newline at end of file diff --git a/msvs_solution/libtst/libtst.vcxproj.user b/msvs_solution/libtst/libtst.vcxproj.user deleted file mode 100644 index 0f14913..0000000 --- a/msvs_solution/libtst/libtst.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/msvs_solution/libtst/packages.config b/msvs_solution/libtst/packages.config deleted file mode 100644 index 50a2309..0000000 --- a/msvs_solution/libtst/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/msvs_solution/msvs_solution.sln b/msvs_solution/msvs_solution.sln deleted file mode 100644 index a864ab3..0000000 --- a/msvs_solution/msvs_solution.sln +++ /dev/null @@ -1,121 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.4.33205.214 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtst", "libtst\libtst.vcxproj", "{309B0482-B092-4FDC-BEB8-008989753887}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_test", "basic_test\basic_test.vcxproj", "{F9529845-4306-46E7-BD01-4C5F757D9BF8}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - v141_Debug|x64 = v141_Debug|x64 - v141_Debug|x86 = v141_Debug|x86 - v141_Release|x64 = v141_Release|x64 - v141_Release|x86 = v141_Release|x86 - v142_Debug_MD|x64 = v142_Debug_MD|x64 - v142_Debug_MD|x86 = v142_Debug_MD|x86 - v142_Debug_MT|x64 = v142_Debug_MT|x64 - v142_Debug_MT|x86 = v142_Debug_MT|x86 - v142_Release_MD|x64 = v142_Release_MD|x64 - v142_Release_MD|x86 = v142_Release_MD|x86 - v142_Release_MT|x64 = v142_Release_MT|x64 - v142_Release_MT|x86 = v142_Release_MT|x86 - v143_Debug_MD|x64 = v143_Debug_MD|x64 - v143_Debug_MD|x86 = v143_Debug_MD|x86 - v143_Debug_MT|x64 = v143_Debug_MT|x64 - v143_Debug_MT|x86 = v143_Debug_MT|x86 - v143_Release_MD|x64 = v143_Release_MD|x64 - v143_Release_MD|x86 = v143_Release_MD|x86 - v143_Release_MT|x64 = v143_Release_MT|x64 - v143_Release_MT|x86 = v143_Release_MT|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {309B0482-B092-4FDC-BEB8-008989753887}.v141_Debug|x64.ActiveCfg = v141_Debug|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v141_Debug|x64.Build.0 = v141_Debug|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v141_Debug|x86.ActiveCfg = v141_Debug|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v141_Debug|x86.Build.0 = v141_Debug|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v141_Release|x64.ActiveCfg = v141_Release|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v141_Release|x64.Build.0 = v141_Release|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v141_Release|x86.ActiveCfg = v141_Release|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v141_Release|x86.Build.0 = v141_Release|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Debug_MD|x64.ActiveCfg = v142_Debug_MD|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Debug_MD|x64.Build.0 = v142_Debug_MD|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Debug_MD|x86.ActiveCfg = v142_Debug_MD|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Debug_MD|x86.Build.0 = v142_Debug_MD|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Debug_MT|x64.ActiveCfg = v142_Debug_MT|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Debug_MT|x64.Build.0 = v142_Debug_MT|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Debug_MT|x86.ActiveCfg = v142_Debug_MT|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Debug_MT|x86.Build.0 = v142_Debug_MT|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Release_MD|x64.ActiveCfg = v142_Release_MD|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Release_MD|x64.Build.0 = v142_Release_MD|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Release_MD|x86.ActiveCfg = v142_Release_MD|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Release_MD|x86.Build.0 = v142_Release_MD|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Release_MT|x64.ActiveCfg = v142_Release_MT|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Release_MT|x64.Build.0 = v142_Release_MT|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Release_MT|x86.ActiveCfg = v142_Release_MT|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v142_Release_MT|x86.Build.0 = v142_Release_MT|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Debug_MD|x64.ActiveCfg = v143_Debug_MD|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Debug_MD|x64.Build.0 = v143_Debug_MD|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Debug_MD|x86.ActiveCfg = v143_Debug_MD|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Debug_MD|x86.Build.0 = v143_Debug_MD|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Debug_MT|x64.ActiveCfg = v143_Debug_MT|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Debug_MT|x64.Build.0 = v143_Debug_MT|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Debug_MT|x86.ActiveCfg = v143_Debug_MT|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Debug_MT|x86.Build.0 = v143_Debug_MT|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Release_MD|x64.ActiveCfg = v143_Release_MD|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Release_MD|x64.Build.0 = v143_Release_MD|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Release_MD|x86.ActiveCfg = v143_Release_MD|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Release_MD|x86.Build.0 = v143_Release_MD|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Release_MT|x64.ActiveCfg = v143_Release_MT|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Release_MT|x64.Build.0 = v143_Release_MT|x64 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Release_MT|x86.ActiveCfg = v143_Release_MT|Win32 - {309B0482-B092-4FDC-BEB8-008989753887}.v143_Release_MT|x86.Build.0 = v143_Release_MT|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v141_Debug|x64.ActiveCfg = v141_Debug|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v141_Debug|x64.Build.0 = v141_Debug|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v141_Debug|x86.ActiveCfg = v141_Debug|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v141_Debug|x86.Build.0 = v141_Debug|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v141_Release|x64.ActiveCfg = v141_Release|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v141_Release|x64.Build.0 = v141_Release|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v141_Release|x86.ActiveCfg = v141_Release|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v141_Release|x86.Build.0 = v141_Release|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Debug_MD|x64.ActiveCfg = v142_Debug_MD|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Debug_MD|x64.Build.0 = v142_Debug_MD|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Debug_MD|x86.ActiveCfg = v142_Debug_MD|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Debug_MD|x86.Build.0 = v142_Debug_MD|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Debug_MT|x64.ActiveCfg = v142_Debug_MT|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Debug_MT|x64.Build.0 = v142_Debug_MT|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Debug_MT|x86.ActiveCfg = v142_Debug_MT|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Debug_MT|x86.Build.0 = v142_Debug_MT|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Release_MD|x64.ActiveCfg = v142_Release_MD|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Release_MD|x64.Build.0 = v142_Release_MD|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Release_MD|x86.ActiveCfg = v142_Release_MD|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Release_MD|x86.Build.0 = v142_Release_MD|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Release_MT|x64.ActiveCfg = v142_Release_MT|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Release_MT|x64.Build.0 = v142_Release_MT|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Release_MT|x86.ActiveCfg = v142_Release_MT|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v142_Release_MT|x86.Build.0 = v142_Release_MT|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Debug_MD|x64.ActiveCfg = v143_Debug_MD|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Debug_MD|x64.Build.0 = v143_Debug_MD|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Debug_MD|x86.ActiveCfg = v143_Debug_MD|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Debug_MD|x86.Build.0 = v143_Debug_MD|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Debug_MT|x64.ActiveCfg = v143_Debug_MT|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Debug_MT|x64.Build.0 = v143_Debug_MT|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Debug_MT|x86.ActiveCfg = v143_Debug_MT|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Debug_MT|x86.Build.0 = v143_Debug_MT|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Release_MD|x64.ActiveCfg = v143_Release_MD|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Release_MD|x64.Build.0 = v143_Release_MD|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Release_MD|x86.ActiveCfg = v143_Release_MD|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Release_MD|x86.Build.0 = v143_Release_MD|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Release_MT|x64.ActiveCfg = v143_Release_MT|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Release_MT|x64.Build.0 = v143_Release_MT|x64 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Release_MT|x86.ActiveCfg = v143_Release_MT|Win32 - {F9529845-4306-46E7-BD01-4C5F757D9BF8}.v143_Release_MT|x86.Build.0 = v143_Release_MT|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {867D7FEE-0481-40EA-8E50-8AA4C7643364} - EndGlobalSection -EndGlobal diff --git a/nuget/build_nuget.ps1 b/nuget/build_nuget.ps1 deleted file mode 100644 index 50acde0..0000000 --- a/nuget/build_nuget.ps1 +++ /dev/null @@ -1,81 +0,0 @@ -Push-Location -$scriptdir = Split-Path $MyInvocation.MyCommand.Path -cd $scriptdir - -#extract version from debian/changelog -$ver = (Get-Content ..\build\debian\changelog -Head 1) -replace ".*\((\d*\.\d*\.\d*)(\-\d+){0,1}\).*",'$1' -#Write-Host $ver - -#insert version into all *.in files -Get-ChildItem "." -Filter *.in | Foreach-Object{ - $content = Get-Content $_.FullName - - #filter and save content to the original file - #$content | Where-Object {$_ -match 'step[49]'} | Set-Content $_.FullName - - #filter and save content to a new file - ($content -replace '\$\(version\)',"$ver") | Set-Content ($_.BaseName) -} - - -"%VS142COMNTOOLS%\VsMSBuildCmd.bat" - -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v140_Debug /p:Platform=x86 /v:minimal /nologo -# If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v140_Release /p:Platform=x86 /v:minimal /nologo -# If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v140_Debug /p:Platform=x64 /v:minimal /nologo -# If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v140_Release /p:Platform=x64 /v:minimal /nologo -# If(!$?){exit 1} - -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Debug /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Release /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Debug /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Release /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} - -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} -# msbuild ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} - -msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} -msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} -msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Debug_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} -msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Release_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} -msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Debug_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} -msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Release_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1} -msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Debug_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} -msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Release_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1} - -Write-Host "running tests..." -# ../msvs_solution/v141_Debug/basic_test.exe --jobs=2 --junit-out=junit_x86_v141_debug.xml; If(!$?){exit 1} -# ../msvs_solution/v141_Release/basic_test.exe --jobs=2 --junit-out=junit_x86_v141_release.xml; If(!$?){exit 1} -# ../msvs_solution/x64/v141_Debug/basic_test.exe --jobs=2 --junit-out=junit_x64_v141_debug.xml; If(!$?){exit 1} -# ../msvs_solution/x64/v141_Release/basic_test.exe --jobs=2 --junit-out=junit_x64_v141_release.xml; If(!$?){exit 1} - -# ../msvs_solution/v142_Debug_MD/basic_test.exe --jobs=2 --junit-out=junit_x86_v142_debug_md.xml; If(!$?){exit 1} -# ../msvs_solution/v142_Debug_MT/basic_test.exe --jobs=2 --junit-out=junit_x86_v142_debug_mt.xml; If(!$?){exit 1} -# ../msvs_solution/v142_Release_MD/basic_test.exe --jobs=2 --junit-out=junit_x86_v142_release_md.xml; If(!$?){exit 1} -# ../msvs_solution/v142_Release_MT/basic_test.exe --jobs=2 --junit-out=junit_x86_v142_release_mt.xml; If(!$?){exit 1} -# ../msvs_solution/x64/v142_Debug_MD/basic_test.exe --jobs=2 --junit-out=junit_x64_v142_debug_md.xml; If(!$?){exit 1} -# ../msvs_solution/x64/v142_Debug_MT/basic_test.exe --jobs=2 --junit-out=junit_x64_v142_debug_mt.xml; If(!$?){exit 1} -# ../msvs_solution/x64/v142_Release_MD/basic_test.exe --jobs=2 --junit-out=junit_x64_v142_release_md.xml; If(!$?){exit 1} -# ../msvs_solution/x64/v142_Release_MT/basic_test.exe --jobs=2 --junit-out=junit_x64_v142_release_mt.xml; If(!$?){exit 1} - - ../msvs_solution/v143_Debug_MD/basic_test.exe --jobs=2 --junit-out=junit_x86_v143_debug_md.xml; If(!$?){exit 1} - ../msvs_solution/v143_Debug_MT/basic_test.exe --jobs=2 --junit-out=junit_x86_v143_debug_mt.xml; If(!$?){exit 1} - ../msvs_solution/v143_Release_MD/basic_test.exe --jobs=2 --junit-out=junit_x86_v143_release_md.xml; If(!$?){exit 1} - ../msvs_solution/v143_Release_MT/basic_test.exe --jobs=2 --junit-out=junit_x86_v143_release_mt.xml; If(!$?){exit 1} -../msvs_solution/x64/v143_Debug_MD/basic_test.exe --jobs=2 --junit-out=junit_x64_v143_debug_md.xml; If(!$?){exit 1} -../msvs_solution/x64/v143_Debug_MT/basic_test.exe --jobs=2 --junit-out=junit_x64_v143_debug_mt.xml; If(!$?){exit 1} -../msvs_solution/x64/v143_Release_MD/basic_test.exe --jobs=2 --junit-out=junit_x64_v143_release_md.xml; If(!$?){exit 1} -../msvs_solution/x64/v143_Release_MT/basic_test.exe --jobs=2 --junit-out=junit_x64_v143_release_mt.xml; If(!$?){exit 1} - -Write-NuGetPackage nuget.autopkg -If(!$?){exit 1} -Pop-Location diff --git a/nuget/nuget.autopkg.in b/nuget/nuget.autopkg.in deleted file mode 100644 index eab5e60..0000000 --- a/nuget/nuget.autopkg.in +++ /dev/null @@ -1,130 +0,0 @@ -configurations { - UserPlatformToolset { - // Needed because autopackage lacks VS2015+ support - key = "PlatformToolset"; - choices: "v140,v141,v142,v143"; - }; - - RuntimeLibrary { - key = "RuntimeLibrary"; // This is the key you can find in .vcxproj file - choices: "MultiThreaded,MultiThreadedDebug,MultiThreadedDLL,MultiThreadedDebugDLL"; // these choices must be valid values for .vcxproj file - }; -} - -nuget{ - nuspec{ - id = libtst; - version : $(version); - title: some C++ library; - authors: {Ivan Gagis}; - owners: {Ivan Gagis}; - licenseUrl: "https://raw.githubusercontent.com/cppfw/tst/main/LICENSE"; - projectUrl: "https://github.com/cppfw/tst"; - iconUrl: "https://github.com/cppfw/tst/blob/main/logo.svg"; - requireLicenseAcceptance:false; - summary: C++ testing framework; - - description: @"C++ testing framework"; - releaseNotes: "Initial release"; - copyright: Copyright 2021 Ivan Gagis; - tags: { native }; - } - dependencies { - packages : { - libutki/1.0.128; - libclargs/0.2.21; - libnitki/1.0.42; - }; - } - files { - // this is needed to put headers in the base folder - nestedInclude: { - #destination = ${d_include}tst; - "..\src\tst\**\*.hpp" - }; - - //==== v140 tools ==== -/* - [x86,v140,release] { - lib: ..\msvs_solution\v140_Release\libtst.lib; - } - [x86,v140,debug] { - lib: ..\msvs_solution\v140_Debug\libtst.lib; - } - [x64,v140,release] { - lib: ..\msvs_solution\x64\v140_Release\libtst.lib; - } - [x64,v140,debug] { - lib: ..\msvs_solution\x64\v140_Debug\libtst.lib; - } -*/ - //==== v141 tools ==== -/* - [x86,v141,release] { - lib: ..\msvs_solution\v141_Release\libtst.lib; - } - [x86,v141,debug] { - lib: ..\msvs_solution\v141_Debug\libtst.lib; - } - [x64,v141,release] { - lib: ..\msvs_solution\x64\v141_Release\libtst.lib; - } - [x64,v141,debug] { - lib: ..\msvs_solution\x64\v141_Debug\libtst.lib; - } -*/ - //==== v142 tools ==== -/* - [x86,v142,release,MultiThreaded] { - lib: ..\msvs_solution\v142_Release_MT\libtst.lib; - } - [x86,v142,debug,MultiThreadedDebug] { - lib: ..\msvs_solution\v142_Debug_MT\libtst.lib; - } - [x64,v142,release,MultiThreaded] { - lib: ..\msvs_solution\x64\v142_Release_MT\libtst.lib; - } - [x64,v142,debug,MultiThreadedDebug] { - lib: ..\msvs_solution\x64\v142_Debug_MT\libtst.lib; - } - [x86,v142,release,MultiThreadedDLL] { - lib: ..\msvs_solution\v142_Release_MD\libtst.lib; - } - [x86,v142,debug,MultiThreadedDebugDLL] { - lib: ..\msvs_solution\v142_Debug_MD\libtst.lib; - } - [x64,v142,release,MultiThreadedDLL] { - lib: ..\msvs_solution\x64\v142_Release_MD\libtst.lib; - } - [x64,v142,debug,MultiThreadedDebugDLL] { - lib: ..\msvs_solution\x64\v142_Debug_MD\libtst.lib; - } -*/ - //==== v143 tools ==== - - [x86,v143,release,MultiThreaded] { - lib: ..\msvs_solution\v143_Release_MT\libtst.lib; - } - [x86,v143,debug,MultiThreadedDebug] { - lib: ..\msvs_solution\v143_Debug_MT\libtst.lib; - } - [x64,v143,release,MultiThreaded] { - lib: ..\msvs_solution\x64\v143_Release_MT\libtst.lib; - } - [x64,v143,debug,MultiThreadedDebug] { - lib: ..\msvs_solution\x64\v143_Debug_MT\libtst.lib; - } - [x86,v143,release,MultiThreadedDLL] { - lib: ..\msvs_solution\v143_Release_MD\libtst.lib; - } - [x86,v143,debug,MultiThreadedDebugDLL] { - lib: ..\msvs_solution\v143_Debug_MD\libtst.lib; - } - [x64,v143,release,MultiThreadedDLL] { - lib: ..\msvs_solution\x64\v143_Release_MD\libtst.lib; - } - [x64,v143,debug,MultiThreadedDebugDLL] { - lib: ..\msvs_solution\x64\v143_Debug_MD\libtst.lib; - } - } -} diff --git a/wiki/main.adoc b/wiki/main.adoc index 57da491..1a6cd5a 100644 --- a/wiki/main.adoc +++ b/wiki/main.adoc @@ -10,8 +10,7 @@ - **conan** (multi-OS): `{package_name}` - **deb** (Linux): `lib{package_name}-dev` - **homebrew** (MacOS X): `lib{package_name}` -- **Msys2** (Windows): `mingw-w64-i686-{package_name}`, `mingw-w64-x86_64-{package_name}` -- **Nuget** (DEPRECATED!!! use `vcpkg`) (Windows, Visual Studio 2019+): `lib{package_name}` +- **msys2** (Windows): `mingw-w64-i686-{package_name}`, `mingw-w64-x86_64-{package_name}` == Documentation - link:tutorial.adoc[Getting started]