Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8193017: Import freetype sources into OpenJDK source tree #318

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

8193017: Import freetype sources into OpenJDK source tree #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
03d00ee
Backport 58ff4ee8c4ec399528338b59eadea996110366a0
gdams May 24, 2023
3061d5f
further required changes
gdams May 24, 2023
300d36d
and more changes
gdams May 24, 2023
7eea8f2
remove freetype from actions
gdams May 24, 2023
ca2dd55
move libfreetype to correct src directory
gdams May 24, 2023
9eb567e
Merge remote-tracking branch 'upstream/master' into freetype
gdams Aug 13, 2024
220528e
Merge remote-tracking branch 'upstream/master' into freetype
gdams Aug 13, 2024
0d2a004
rerun autoconf
gdams Aug 13, 2024
5960219
changes from review
gdams Aug 14, 2024
40869c5
remove make/conf/jib-profiles.js
gdams Aug 14, 2024
ed02416
remove top level make changes
gdams Aug 15, 2024
7be05c5
Merge remote-tracking branch 'upstream/master' into freetype
gdams Aug 15, 2024
4eab0b0
move freetype license to THIRD_PARTY_README
gdams Aug 16, 2024
279fb6f
fix comment
gdams Aug 16, 2024
7f84ed1
test removal of common/autoconf/toolchain_windows.m4 changes
gdams Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1,733 changes: 0 additions & 1,733 deletions .github/workflows/freetype.vcxproj
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/submit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,13 +725,6 @@ jobs:
with:
path: jdk

- name: Checkout the FreeType source
uses: actions/checkout@v4
with:
repository: "freetype/freetype"
ref: VER-2-8-1
path: freetype

- name: Restore boot JDK from cache
id: bootjdk
uses: actions/cache@v4
Expand Down Expand Up @@ -798,18 +791,11 @@ jobs:
- name: Fix OpenJDK permissions
run: bash -c "chmod -R 0777 jdk"

- name: Copy FreeType project file
run: >
Remove-Item "$env:GITHUB_WORKSPACE\freetype\builds\windows\vc2010\freetype.vcxproj" ;
Copy-Item -Path "$env:GITHUB_WORKSPACE\jdk\.github\workflows\freetype.vcxproj"
-Destination "$env:GITHUB_WORKSPACE\freetype\builds\windows\vc2010\freetype.vcxproj" ;

- name: Configure
run: >
$env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ;
$env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ;
$env:BOOT_JDK = cygpath "$HOME/bootjdk/$env:BOOT_JDK_VERSION" ;
$env:FREETYPE_HOME = "$env:GITHUB_WORKSPACE\freetype" ;
$env:JT_HOME = cygpath "$HOME/jtreg" ;
& bash configure
--with-toolchain-version=2017
Expand All @@ -818,7 +804,6 @@ jobs:
--with-user-release-suffix="$env:GITHUB_ACTOR-$env:GITHUB_SHA"
--with-build-number=b00
--with-boot-jdk="$env:BOOT_JDK"
--with-freetype-src="$env:FREETYPE_HOME"
--with-jtreg="$env:JT_HOME" ;
bash -c "cat $(find -name config.log)"
working-directory: jdk
Expand Down Expand Up @@ -906,13 +891,6 @@ jobs:
with:
path: jdk

- name: Checkout the FreeType source
uses: actions/checkout@v4
with:
repository: "freetype/freetype"
ref: VER-2-8-1
path: freetype

- name: Restore boot JDK from cache
id: bootjdk
uses: actions/cache@v4
Expand Down Expand Up @@ -970,18 +948,11 @@ jobs:
- name: Fix OpenJDK permissions
run: bash -c "chmod -R 0777 jdk"

- name: Copy FreeType project file
run: >
Remove-Item "$env:GITHUB_WORKSPACE\freetype\builds\windows\vc2010\freetype.vcxproj" ;
Copy-Item -Path "$env:GITHUB_WORKSPACE\jdk\.github\workflows\freetype.vcxproj"
-Destination "$env:GITHUB_WORKSPACE\freetype\builds\windows\vc2010\freetype.vcxproj" ;

- name: Configure
run: >
$env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ;
$env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ;
$env:BOOT_JDK = cygpath "$HOME/bootjdk/$env:BOOT_JDK_VERSION" ;
$env:FREETYPE_HOME = "$env:GITHUB_WORKSPACE\freetype" ;
$env:JT_HOME = cygpath "$HOME/jtreg" ;
& bash configure
--with-conf-name=windows-x86
Expand All @@ -992,7 +963,6 @@ jobs:
--with-user-release-suffix="$env:GITHUB_ACTOR-$env:GITHUB_SHA"
--with-build-number=b00
--with-boot-jdk="$env:BOOT_JDK"
--with-freetype-src="$env:FREETYPE_HOME"
--with-jtreg="$env:JT_HOME" ;
bash -c "cat $(find -name config.log)"
working-directory: jdk
Expand Down
Loading