-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into changelog/1.14.0
- Loading branch information
Showing
110 changed files
with
1,818 additions
and
706 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,29 @@ | ||
| param( | ||
| [Parameter(Mandatory)] [string] $BuildTree, | ||
| [Parameter(Mandatory)] [string] $Version, | ||
| [switch] $Dynamic | ||
| ) | ||
|
|
||
| . "$(Split-Path -Parent $MyInvocation.MyCommand.Path)\setup.ps1" | ||
|
|
||
| [void](New-Item -Name (Split-Path -Parent $BuildTree) -ItemType Directory -Force) | ||
| Setup-Git -Path $BuildTree -Url https://github.com/pffang/libiconv-for-Windows.git -Ref 1353455a6c4e15c9db6865fd9c2bf7203b59c0ec # master@{2022-10-11} | ||
| Invoke-WebRequest "https://ftp.gnu.org/pub/gnu/libiconv/libiconv-${Version}.tar.gz" -OutFile libiconv.tar.gz | ||
| tar -xzf libiconv.tar.gz | ||
| mv libiconv-* $BuildTree | ||
| rm libiconv.tar.gz | ||
|
|
||
| Run-InDirectory $BuildTree { | ||
| Replace-Text libiconv\include\iconv.h '__declspec (dllimport) ' '' | ||
|
|
||
| echo '<Project> | ||
| <PropertyGroup> | ||
| <ForceImportAfterCppTargets>$(MsbuildThisFileDirectory)\Override.props</ForceImportAfterCppTargets> | ||
| </PropertyGroup> | ||
| </Project>' > 'Directory.Build.props' | ||
|
|
||
| echo "<Project> | ||
| <PropertyGroup> | ||
| <WholeProgramOptimization>false</WholeProgramOptimization> | ||
| </PropertyGroup> | ||
| <ItemDefinitionGroup> | ||
| <ClCompile> | ||
| <DebugInformationFormat>None</DebugInformationFormat> | ||
| <WholeProgramOptimization>false</WholeProgramOptimization> | ||
| </ClCompile> | ||
| <Link> | ||
| <GenerateDebugInformation>false</GenerateDebugInformation> | ||
| </Link> | ||
| </ItemDefinitionGroup> | ||
| <ItemDefinitionGroup Condition=`"'`$(Configuration)'=='Release'`"> | ||
| <ClCompile> | ||
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| </ClCompile> | ||
| </ItemDefinitionGroup> | ||
| </Project>" > 'Override.props' | ||
|
|
||
| if ($Dynamic) { | ||
| MSBuild.exe /p:Platform=x64 /p:Configuration=Release libiconv.vcxproj | ||
| } else { | ||
| MSBuild.exe /p:Platform=x64 /p:Configuration=ReleaseStatic libiconv.vcxproj | ||
| } | ||
| $env:CHERE_INVOKING = 1 | ||
| & 'C:\cygwin64\bin\bash.exe' --login "$PSScriptRoot\cygwin-build-iconv.sh" "$Version" "$(if ($Dynamic) { 1 })" | ||
| if (-not $?) { | ||
| Write-Host "Error: Failed to build libiconv" -ForegroundColor Red | ||
| Exit 1 | ||
| } | ||
| } | ||
|
|
||
| if ($Dynamic) { | ||
| mv -Force $BuildTree\output\x64\Release\libiconv.lib libs\iconv-dynamic.lib | ||
| mv -Force $BuildTree\output\x64\Release\libiconv.dll dlls\ | ||
| mv -Force $BuildTree\iconv\lib\iconv.dll.lib libs\iconv-dynamic.lib | ||
| mv -Force $BuildTree\iconv\bin\iconv-2.dll dlls\ | ||
| } else { | ||
| mv -Force $BuildTree\output\x64\ReleaseStatic\libiconvStatic.lib libs\iconv.lib | ||
| mv -Force $BuildTree\iconv\lib\iconv.lib libs\ | ||
| } |
Oops, something went wrong.