From e9e0c5b6b1a17af7844f4ab49576cc434515885e Mon Sep 17 00:00:00 2001 From: Hugh Bellamy Date: Sat, 31 Mar 2018 22:39:45 +0100 Subject: [PATCH 1/3] Convert to vckpg --- .jenkins-windows.sh | 13 +++++-------- README.md | 12 +++--------- src/.DS_Store | Bin 0 -> 6148 bytes src/libgdiplus.vcxproj | 43 ++++------------------------------------- src/packages.config | 12 ------------ 5 files changed, 12 insertions(+), 68 deletions(-) create mode 100644 src/.DS_Store delete mode 100644 src/packages.config diff --git a/.jenkins-windows.sh b/.jenkins-windows.sh index ec7ff2a2a..dc41c87c9 100755 --- a/.jenkins-windows.sh +++ b/.jenkins-windows.sh @@ -2,16 +2,13 @@ export PATH=/usr/bin:/usr/local/bin:$PATH -# NOTE: update README.md too when updating these urls -wget "https://dl.hexchat.net/gtk/gtk-win32-2018-03-13.7z" -O gtk-Win32.7z -wget "https://dl.hexchat.net/gtk/gtk-x64-2018-03-13.7z" -O gtk-x64.7z -wget "https://dist.nuget.org/win-x86-commandline/v4.1.0/nuget.exe" -O nuget.exe +git clone https://github.com/Microsoft/vcpkg.git +bootstrap-vcpkg.bat +vcpkg integrate install -7z x gtk-Win32.7z -ogtk -7z x gtk-x64.7z -ogtk -chmod +x nuget.exe +vcpkg install giflib libjpeg-turbo libpng cairo glib tiff libexif glib +vcpkg install giflib libjpeg-turbo libpng cairo glib tiff libexif glib --triplet x64-windows -./nuget.exe restore /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=Win32 /p:Configuration=Debug libgdiplus.sln /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=Win32 /p:Configuration=Release libgdiplus.sln /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=x64 /p:Configuration=Debug libgdiplus.sln diff --git a/README.md b/README.md index d561b432d..26007a458 100644 --- a/README.md +++ b/README.md @@ -22,16 +22,10 @@ On **Debian-based Linux distributions** you can use `apt-get` to install the dep sudo apt-get install libgif-dev autoconf libtool automake build-essential gettext libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev -On **Windows** you can use [Chocolatey](https://chocolatey.org) to install the dependencies. Run the following commands from the root of the repository from an admin command prompt: +On **Windows** you can use [Vckpg](https://github.com/Microsoft/vcpkg) to install the dependencies. Run the following commands from the root of the repository from an admin command prompt: - choco install wget 7zip nuget.commandline - wget "https://dl.hexchat.net/gtk/gtk-win32-2018-03-13.7z" -O gtk-Win32.7z - wget "https://dl.hexchat.net/gtk/gtk-x64-2018-03-13.7z" -O gtk-x64.7z - - 7z x gtk-Win32.7z -ogtk - 7z x gtk-x64.7z -ogtk - - nuget restore + vcpkg install giflib libjpeg-turbo libpng cairo glib tiff libexif glib + vcpkg install giflib libjpeg-turbo libpng cairo glib tiff libexif glib --triplet x64-windows ### Build instructions diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0libgdiplus 8.1 DynamicLibrary - v140 + v141 MultiByte $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ @@ -87,28 +87,17 @@ - $(ProjectDir)\..;$(ProjectDir)\..\gtk\$(Platform)\release\include;$(ProjectDir)\..\gtk\$(Platform)\release\include\glib-2.0;$(ProjectDir)\..\gtk\$(Platform)\release\lib\glib-2.0\include;$(ProjectDir)\..\gtk\$(Platform)\release\include\cairo;%(AdditionalIncludeDirectories) - HAVE_LIBGIF;HAVE_LIBJPEG;HAVE_LIBTIFF;HAVE_LIBPNG;HAVE_FCFINI;_WINDLL;WIN32;%(PreprocessorDefinitions) + HAVE_LIBGIF;HAVE_LIBJPEG;HAVE_LIBTIFF;HAVE_LIBPNG;_WINDLL;WIN32;%(PreprocessorDefinitions) Cdecl + $(ProjectDir)..\;%AdditionalIncludeDirectories% - libpng16.lib;freetype.lib;fontconfig.lib;glib-2.0.lib;cairo.lib;shcore.lib;%(AdditionalDependencies) - $(ProjectDir)\..\gtk\$(Platform)\release\lib + shcore.lib;%(AdditionalDependencies) %windir%\system32\WindowsPowerShell\v1.0\powershell.exe -NonInteractive -Command "(Get-Content \"$(ProjectDir)\..\winconfig.h.in\") -replace '#LIBGDIPLUS_VERSION#', (Select-String -path \"$(ProjectDir)\..\configure.ac\" -pattern 'AC_INIT\(libgdiplus, \[(.*)\]').Matches[0].Groups[1].Value | Set-Content \"$(ProjectDir)\..\config.h\"" 2>&1 - - copy "$(ProjectDir)..\gtk\$(Platform)\release\bin\cairo.*" "$(OutDir)" -copy "$(ProjectDir)..\gtk\$(Platform)\release\bin\fontconfig.*" "$(OutDir)" -copy "$(ProjectDir)..\gtk\$(Platform)\release\bin\glib-2.0.*" "$(OutDir)" -copy "$(ProjectDir)..\gtk\$(Platform)\release\bin\iconv.*" "$(OutDir)" -copy "$(ProjectDir)..\gtk\$(Platform)\release\bin\intl.*" "$(OutDir)" -copy "$(ProjectDir)..\gtk\$(Platform)\release\bin\libpng16.*" "$(OutDir)" -copy "$(ProjectDir)..\gtk\$(Platform)\release\bin\libxml2.*" "$(OutDir)" -copy "$(ProjectDir)..\gtk\$(Platform)\release\bin\zlib1.*" "$(OutDir)" - @@ -119,30 +108,6 @@ copy "$(ProjectDir)..\gtk\$(Platform)\release\bin\zlib1.*" "$(OutDir)" - - - - - - - - - - - - - - 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/src/packages.config b/src/packages.config deleted file mode 100644 index 7a01f56a6..000000000 --- a/src/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file From c213b4c9b2cd708bc084b91c64ac56408765e409 Mon Sep 17 00:00:00 2001 From: Hugh Bellamy Date: Mon, 2 Apr 2018 16:24:17 +0100 Subject: [PATCH 2/3] Fix jenkins --- .jenkins-windows.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.jenkins-windows.sh b/.jenkins-windows.sh index dc41c87c9..f8dd51744 100755 --- a/.jenkins-windows.sh +++ b/.jenkins-windows.sh @@ -3,15 +3,15 @@ export PATH=/usr/bin:/usr/local/bin:$PATH git clone https://github.com/Microsoft/vcpkg.git -bootstrap-vcpkg.bat -vcpkg integrate install +vcpkg/bootstrap-vcpkg.bat +vcpkg/vcpkg integrate install -vcpkg install giflib libjpeg-turbo libpng cairo glib tiff libexif glib -vcpkg install giflib libjpeg-turbo libpng cairo glib tiff libexif glib --triplet x64-windows +vcpkg/vcpkg install giflib libjpeg-turbo libpng cairo glib tiff libexif glib pango +vcpkg/vcpkg install giflib libjpeg-turbo libpng cairo glib tiff libexif glib pango --triplet x64-windows -/cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=Win32 /p:Configuration=Debug libgdiplus.sln -/cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=Win32 /p:Configuration=Release libgdiplus.sln -/cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=x64 /p:Configuration=Debug libgdiplus.sln -/cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=x64 /p:Configuration=Release libgdiplus.sln +/cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:Platform=Win32 /p:Configuration=Debug libgdiplus.sln +/cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:Platform=Win32 /p:Configuration=Release libgdiplus.sln +/cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:Platform=x64 /p:Configuration=Debug libgdiplus.sln +/cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:Platform=x64 /p:Configuration=Release libgdiplus.sln 7z a -tzip libgdiplus.zip Win32 x64 From 03332fe596f5a2d2ff8cdac726a3990c6edb0b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 4 Apr 2018 15:10:24 +0200 Subject: [PATCH 3/3] Add .jenkins-windows.ps1 and fix vcpkg install --- .jenkins-windows.ps1 | 17 +++++++++++++++++ .jenkins-windows.sh | 17 ----------------- src/.DS_Store | Bin 6148 -> 0 bytes src/libgdiplus.vcxproj | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) create mode 100755 .jenkins-windows.ps1 delete mode 100755 .jenkins-windows.sh delete mode 100644 src/.DS_Store diff --git a/.jenkins-windows.ps1 b/.jenkins-windows.ps1 new file mode 100755 index 000000000..c8f328f40 --- /dev/null +++ b/.jenkins-windows.ps1 @@ -0,0 +1,17 @@ +if (-not (Test-Path vcpkg)) { + git clone https://github.com/Microsoft/vcpkg.git + cd vcpkg + .\bootstrap-vcpkg.bat + .\vcpkg.exe integrate install + # NOTE: update README.md too when updating these packages + .\vcpkg.exe install giflib libjpeg-turbo libpng cairo glib tiff libexif glib pango + .\vcpkg.exe install giflib libjpeg-turbo libpng cairo glib tiff libexif glib pango --triplet x64-windows + cd .. +} + +& "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" -p:PlatformToolset=v140 -p:Platform=Win32 -p:Configuration=Debug libgdiplus.sln +& "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" -p:PlatformToolset=v140 -p:Platform=Win32 -p:Configuration=Release libgdiplus.sln +& "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" -p:PlatformToolset=v140 -p:Platform=x64 -p:Configuration=Debug libgdiplus.sln +& "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" -p:PlatformToolset=v140 -p:Platform=x64 -p:Configuration=Release libgdiplus.sln + +Compress-Archive -DestinationPath libgdiplus.zip -Path Win32,x64 diff --git a/.jenkins-windows.sh b/.jenkins-windows.sh deleted file mode 100755 index f8dd51744..000000000 --- a/.jenkins-windows.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -xe - -export PATH=/usr/bin:/usr/local/bin:$PATH - -git clone https://github.com/Microsoft/vcpkg.git -vcpkg/bootstrap-vcpkg.bat -vcpkg/vcpkg integrate install - -vcpkg/vcpkg install giflib libjpeg-turbo libpng cairo glib tiff libexif glib pango -vcpkg/vcpkg install giflib libjpeg-turbo libpng cairo glib tiff libexif glib pango --triplet x64-windows - -/cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:Platform=Win32 /p:Configuration=Debug libgdiplus.sln -/cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:Platform=Win32 /p:Configuration=Release libgdiplus.sln -/cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:Platform=x64 /p:Configuration=Debug libgdiplus.sln -/cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:Platform=x64 /p:Configuration=Release libgdiplus.sln - -7z a -tzip libgdiplus.zip Win32 x64 diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 - HAVE_LIBGIF;HAVE_LIBJPEG;HAVE_LIBTIFF;HAVE_LIBPNG;_WINDLL;WIN32;%(PreprocessorDefinitions) + HAVE_LIBGIF;HAVE_LIBJPEG;HAVE_LIBTIFF;HAVE_LIBPNG;HAVE_FCFINI;_WINDLL;WIN32;%(PreprocessorDefinitions) Cdecl - $(ProjectDir)..\;%AdditionalIncludeDirectories% + $(ProjectDir)..\;%(AdditionalIncludeDirectories) shcore.lib;%(AdditionalDependencies)