Skip to content

Commit 8657ac1

Browse files
judovanagdams
andcommitted
8193017: Import freetype sources into OpenJDK source tree
Co-authored-by: George Adams <[email protected]>
1 parent 652f7a7 commit 8657ac1

File tree

324 files changed

+162983
-6030
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

324 files changed

+162983
-6030
lines changed

.github/workflows/freetype.vcxproj

Lines changed: 0 additions & 1733 deletions
This file was deleted.

.github/workflows/submit.yml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -731,13 +731,6 @@ jobs:
731731
with:
732732
path: jdk
733733

734-
- name: Checkout the FreeType source
735-
uses: actions/checkout@v4
736-
with:
737-
repository: "freetype/freetype"
738-
ref: VER-2-8-1
739-
path: freetype
740-
741734
- name: Restore boot JDK from cache
742735
id: bootjdk
743736
uses: actions/cache@v4
@@ -804,18 +797,11 @@ jobs:
804797
- name: Fix OpenJDK permissions
805798
run: bash -c "chmod -R 0777 jdk"
806799

807-
- name: Copy FreeType project file
808-
run: >
809-
Remove-Item "$env:GITHUB_WORKSPACE\freetype\builds\windows\vc2010\freetype.vcxproj" ;
810-
Copy-Item -Path "$env:GITHUB_WORKSPACE\jdk\.github\workflows\freetype.vcxproj"
811-
-Destination "$env:GITHUB_WORKSPACE\freetype\builds\windows\vc2010\freetype.vcxproj" ;
812-
813800
- name: Configure
814801
run: >
815802
$env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ;
816803
$env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ;
817804
$env:BOOT_JDK = cygpath "$HOME/bootjdk/$env:BOOT_JDK_VERSION" ;
818-
$env:FREETYPE_HOME = "$env:GITHUB_WORKSPACE\freetype" ;
819805
$env:JT_HOME = cygpath "$HOME/jtreg" ;
820806
& bash configure
821807
--with-toolchain-version=2017
@@ -824,7 +810,6 @@ jobs:
824810
--with-user-release-suffix="$env:GITHUB_ACTOR-$env:GITHUB_SHA"
825811
--with-build-number=b00
826812
--with-boot-jdk="$env:BOOT_JDK"
827-
--with-freetype-src="$env:FREETYPE_HOME"
828813
--with-jtreg="$env:JT_HOME" ;
829814
bash -c "cat $(find -name config.log)"
830815
working-directory: jdk
@@ -912,13 +897,6 @@ jobs:
912897
with:
913898
path: jdk
914899

915-
- name: Checkout the FreeType source
916-
uses: actions/checkout@v4
917-
with:
918-
repository: "freetype/freetype"
919-
ref: VER-2-8-1
920-
path: freetype
921-
922900
- name: Restore boot JDK from cache
923901
id: bootjdk
924902
uses: actions/cache@v4
@@ -976,18 +954,11 @@ jobs:
976954
- name: Fix OpenJDK permissions
977955
run: bash -c "chmod -R 0777 jdk"
978956

979-
- name: Copy FreeType project file
980-
run: >
981-
Remove-Item "$env:GITHUB_WORKSPACE\freetype\builds\windows\vc2010\freetype.vcxproj" ;
982-
Copy-Item -Path "$env:GITHUB_WORKSPACE\jdk\.github\workflows\freetype.vcxproj"
983-
-Destination "$env:GITHUB_WORKSPACE\freetype\builds\windows\vc2010\freetype.vcxproj" ;
984-
985957
- name: Configure
986958
run: >
987959
$env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ;
988960
$env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ;
989961
$env:BOOT_JDK = cygpath "$HOME/bootjdk/$env:BOOT_JDK_VERSION" ;
990-
$env:FREETYPE_HOME = "$env:GITHUB_WORKSPACE\freetype" ;
991962
$env:JT_HOME = cygpath "$HOME/jtreg" ;
992963
& bash configure
993964
--with-conf-name=windows-x86
@@ -998,7 +969,6 @@ jobs:
998969
--with-user-release-suffix="$env:GITHUB_ACTOR-$env:GITHUB_SHA"
999970
--with-build-number=b00
1000971
--with-boot-jdk="$env:BOOT_JDK"
1001-
--with-freetype-src="$env:FREETYPE_HOME"
1002972
--with-jtreg="$env:JT_HOME" ;
1003973
bash -c "cat $(find -name config.log)"
1004974
working-directory: jdk

0 commit comments

Comments
 (0)