Merge pull request #532 from ikvmnet/lbuild

Linux CI Build
ikvmnet · Jun 13, 2024 · a21e265 · a21e265
2 parents a3327e6 + cbfa614
commit a21e265
Show file tree

Hide file tree

Showing 17 changed files with 192 additions and 215 deletions.
diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml
diff --git a/openjdk b/openjdk
diff --git a/src/libawt/libawt.clangproj b/src/libawt/libawt.clangproj
@@ -194,20 +194,20 @@
         <AdditionalLinkOptions Include="-framework" Value="AudioToolbox" Separator=" " />
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('win-'))">
-        <Dependencies Include="User32" />
-        <Dependencies Include="Gdi32" />
-        <Dependencies Include="WinSpool" />
-        <Dependencies Include="Imm32" />
-        <Dependencies Include="Ole32" />
-        <Dependencies Include="OleAut32" />
-        <Dependencies Include="Uuid" />
+        <Dependencies Include="user32" />
+        <Dependencies Include="gdi32" />
+        <Dependencies Include="winspool" />
+        <Dependencies Include="imm32" />
+        <Dependencies Include="ole32" />
+        <Dependencies Include="oleaut32" />
+        <Dependencies Include="uuid" />
         <Dependencies Include="shell32" />
-        <Dependencies Include="ComDlg32" />
+        <Dependencies Include="comdlg32" />
         <Dependencies Include="winmm" />
-        <Dependencies Include="ComCtl32" />
-        <Dependencies Include="ShLwApi" />
+        <Dependencies Include="comctl32" />
+        <Dependencies Include="shlwapi" />
         <Dependencies Include="delayimp" />
-        <Dependencies Include="AdvAPI32" />
+        <Dependencies Include="advapi32" />
         <Dependencies Include="comsuppw" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('linux-'))">

diff --git a/src/libfontmanager/libfontmanager.clangproj b/src/libfontmanager/libfontmanager.clangproj
@@ -39,9 +39,9 @@
         <PreprocessorDefinitions Include="stricmp" Value="_stricmp" />
         <PreprocessorDefinitions Include="wcsicmp" Value="_wcsicmp" />
         <IncludeDirectories Include="$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\sun\windows" />
-        <Dependencies Include="AdvAPI32" />
-        <Dependencies Include="User32" />
-        <Dependencies Include="Gdi32" />
+        <Dependencies Include="advapi32" />
+        <Dependencies Include="user32" />
+        <Dependencies Include="gdi32" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('linux-'))">
         <IncludeDirectories Include="$(LinuxSdkDir)\include\freetype2" />
@@ -59,4 +59,4 @@
     </ItemGroup>
     <Import Sdk="IKVM.Clang.Sdk" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\..\targets\openjdk.lib.targets" />
-</Project>
+</Project>
diff --git a/src/libiava/libiava.clangproj b/src/libiava/libiava.clangproj
@@ -70,7 +70,7 @@
         <LibJavaExclude Include="java_props_macosx.c" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('win-'))">
-        <Dependencies Include="shell32;delayimp;AdvAPI32;version" />
+        <Dependencies Include="shell32;delayimp;advapi32;version" />
         <AdditionalLinkOptions Include="-Wl,/FORCE" />
         <AdditionalLinkOptions Include="-Wl,-export:winFileHandleOpen" />
         <AdditionalLinkOptions Include="-Wl,-export:handleLseek" />

diff --git a/src/libjaas/libjaas.clangproj b/src/libjaas/libjaas.clangproj
@@ -20,10 +20,10 @@
         <Compile Include="*.c" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('win-'))">
-        <Dependencies Include="NetAPI32" />
-        <Dependencies Include="User32" />
-        <Dependencies Include="Mpr" />
-        <Dependencies Include="AdvAPI32" />
+        <Dependencies Include="netapi32" />
+        <Dependencies Include="user32" />
+        <Dependencies Include="mpr" />
+        <Dependencies Include="advapi32" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('linux-'))">
         <AdditionalLinkOptions Include="-Wl,--version-script=$(OpenJdkDir)jdk\make\mapfiles\libjaas\mapfile-vers" />

diff --git a/src/libjawt/libjawt.clangproj b/src/libjawt/libjawt.clangproj
@@ -22,7 +22,7 @@
         <IncludeDirectories Include="$(OpenJdkDir)jdk\src\share\native\sun\awt\image\cvutils" />
         <IncludeDirectories Include="$(OpenJdkDir)jdk\src\windows\native\sun\java2d\windows" />
         <PreprocessorDefinitions Include="UNICODE;_UNICODE" />
-        <Dependencies Include="AdvAPI32" />
+        <Dependencies Include="advapi32" />
         <Compile Include="$(OpenJdkDir)jdk\src\windows\native\sun\windows\jawt.cpp" LanguageStandard="c++11" />
         <Header Include="$(OpenJdkDir)jdk\src\windows\native\sun\windows\*.h" />
     </ItemGroup>

diff --git a/src/libjsound/libjsound.clangproj b/src/libjsound/libjsound.clangproj
@@ -41,7 +41,7 @@
         <PreprocessorDefinitions Include="USE_PORTS" Value="TRUE" />
         <PreprocessorDefinitions Include="EXTRA_SOUND_JNI_LIBS" Value="&quot;jsoundds&quot;" />
 
-        <Dependencies Include="AdvAPI32;winmm" />
+        <Dependencies Include="advapi32;winmm" />
 
         <!-- LIBJSOUND_SRC_FILES -->
         <Compile Include="$(OpenJdkDir)jdk\src\windows\native\com\sun\media\sound\PLATFORM_API_WinOS_MidiIn.cpp" LanguageStandard="c++11" />

diff --git a/src/libjsoundds/libjsoundds.clangproj b/src/libjsoundds/libjsoundds.clangproj
@@ -19,7 +19,7 @@
         <PreprocessorDefinitions Include="USE_PLATFORM_MIDI_IN" Value="TRUE" />
         <PreprocessorDefinitions Include="USE_PORTS" Value="TRUE" />
         <PreprocessorDefinitions Include="USE_DAUDIO" Value="TRUE" />
-        <Dependencies Include="dsound;winmm;User32;Ole32" />
+        <Dependencies Include="dsound;winmm;user32;ole32" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.EndsWith('-x86'))">
         <PreprocessorDefinitions Include="X_ARCH" Value="X_I586" />

diff --git a/src/libjvm/libjvm.clangproj b/src/libjvm/libjvm.clangproj
@@ -38,7 +38,7 @@
         <PreprocessorDefinitions Include="close" Value="_close" />
         <PreprocessorDefinitions Include="open" Value="_open" />
         <IncludeDirectories Include="$(OpenJdkDir)hotspot\src\os\windows\vm" />
-        <Dependencies Include="WS2_32" />
+        <Dependencies Include="ws2_32" />
         <AdditionalLinkOptions Include="-Wl,-export:JNI_GetDefaultJavaVMInitArgs" />
         <AdditionalLinkOptions Include="-Wl,-export:JNI_CreateJavaVM" />
         <AdditionalLinkOptions Include="-Wl,-export:JNI_GetCreatedJavaVMs" />
@@ -82,4 +82,4 @@
     </ItemGroup>
     <Import Sdk="IKVM.Clang.Sdk" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\..\targets\openjdk.lib.targets" />
-</Project>
+</Project>
diff --git a/src/libkrb5/libkrb5.clangproj b/src/libkrb5/libkrb5.clangproj
@@ -20,21 +20,21 @@
         <Compile Include="*.c" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('win-'))">
-        <Dependencies Include="AdvAPI32" />
-        <Dependencies Include="Secur32" />
-        <Dependencies Include="NetAPI32" />
+        <Dependencies Include="advapi32" />
+        <Dependencies Include="secur32" />
+        <Dependencies Include="netapi32" />
         <Dependencies Include="kernel32" />
-        <Dependencies Include="User32" />
-        <Dependencies Include="Gdi32" />
-        <Dependencies Include="WinSpool" />
-        <Dependencies Include="ComDlg32" />
+        <Dependencies Include="user32" />
+        <Dependencies Include="gdi32" />
+        <Dependencies Include="winspool" />
+        <Dependencies Include="comdlg32" />
         <Dependencies Include="shell32" />
-        <Dependencies Include="Ole32" />
-        <Dependencies Include="OleAut32" />
-        <Dependencies Include="Uuid" />
+        <Dependencies Include="ole32" />
+        <Dependencies Include="oleaut32" />
+        <Dependencies Include="uuid" />
         <Dependencies Include="odbc32" />
         <Dependencies Include="odbccp32" />
-        <Dependencies Include="WSock32" />
+        <Dependencies Include="wsock32" />
         <Compile Include="$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\sun\security\krb5\*.c" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('osx-'))">

diff --git a/src/libmanagement/libmanagement.clangproj b/src/libmanagement/libmanagement.clangproj
@@ -18,9 +18,9 @@
         <Compile Include="*.c" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('win-'))">
-        <Dependencies Include="Psapi" />
-        <Dependencies Include="AdvAPI32" />
-        <Dependencies Include="ShLwApi" />
+        <Dependencies Include="psapi" />
+        <Dependencies Include="advapi32" />
+        <Dependencies Include="shlwapi" />
         <PreprocessorDefinitions Include="strdup" Value="_strdup" />
         <PreprocessorDefinitions Include="itoa" Value="_itoa" />
         <Compile Include="$(OpenJdkDir)jdk\src\windows\native\sun\management\FileSystemImpl.c" />
@@ -39,4 +39,4 @@
     </ItemGroup>
     <Import Sdk="IKVM.Clang.Sdk" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\..\targets\openjdk.lib.targets" />
-</Project>
+</Project>
diff --git a/src/libnet/libnet.clangproj b/src/libnet/libnet.clangproj
@@ -26,7 +26,7 @@
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('win-'))">
         <AdditionalCompileOptions Include="-Wno-implicit-function-declaration" />
         <PreprocessorDefinitions Include="_WINSOCK_DEPRECATED_NO_WARNINGS" />
-        <Dependencies Include="WS2_32;Secur32;iphlpapi;delayimp;AdvAPI32" />
+        <Dependencies Include="ws2_32;secur32;iphlpapi;delayimp;advapi32" />
         <LibNetDirs Include="$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\sun\net\www\protocol\http\ntlm" />
     </ItemGroup>
     <ItemGroup Condition="!$(TargetIdentifier.StartsWith('win-'))">

diff --git a/src/libnio/libnio.clangproj b/src/libnio/libnio.clangproj
@@ -42,7 +42,7 @@
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('win-'))">
         <PreprocessorDefinitions Include="_WINSOCK_DEPRECATED_NO_WARNINGS" />
-        <Dependencies Include="WS2_32;AdvAPI32;Mswsock" />
+        <Dependencies Include="ws2_32;advapi32;mswsock" />
         <AdditionalCompileOptions Include="-fms-extensions" />
         <LibNioFile Include="Iocp.c" />
         <LibNioFile Include="RegistryFileTypeDetector.c" />
@@ -149,4 +149,4 @@ public class JoinPathsAndFiles : Task
 
     <Import Sdk="IKVM.Clang.Sdk" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\..\targets\openjdk.lib.targets" />
-</Project>
+</Project>
diff --git a/src/libsunec/libsunec.clangproj b/src/libsunec/libsunec.clangproj
@@ -19,7 +19,7 @@
         <Compile Include="**\*.c" LanguageStandard="c99" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('win-'))">
-        <Dependencies Include="ShLwApi" />
+        <Dependencies Include="shlwapi" />
         <PreprocessorDefinitions Include="strdup" Value="_strdup" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('linux-'))">

diff --git a/src/libsunmscapi/libsunmscapi.clangproj b/src/libsunmscapi/libsunmscapi.clangproj
@@ -14,7 +14,9 @@
         <ProjectReference Include="..\libjvm\libjvm.clangproj" />
     </ItemGroup>
     <ItemGroup>
-        <Dependencies Include="Crypt32;AdvAPI32;Ncrypt" />
+        <Dependencies Include="crypt32" />
+        <Dependencies Include="advapi32" />
+        <Dependencies Include="ncrypt" />
         <AdditionalCompileOptions Include="-Wno-c++11-narrowing" />
         <AdditionalCompileOptions Include="-Wno-writable-strings" />
         <AdditionalCompileOptions Include="-Wno-pointer-to-int-cast" />

diff --git a/targets/lib.props b/targets/lib.props
@@ -63,14 +63,15 @@
     </PropertyGroup>
 
     <ItemGroup Condition="!$([MSBuild]::IsOSPlatform('Windows')) And $(TargetIdentifier.StartsWith('win-'))">
-        <SystemIncludeDirectories Include="$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)\crt\include" />
-        <SystemIncludeDirectories Include="$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)\sdk\include\shared" />
-        <SystemIncludeDirectories Include="$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)\sdk\include\ucrt" />
-        <SystemIncludeDirectories Include="$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)\sdk\include\um" />
-        <SystemIncludeDirectories Include="$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)-local\crt\include" />
-        <SystemIncludeDirectories Include="$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)-local\sdk\include\shared" />
-        <SystemIncludeDirectories Include="$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)-local\sdk\include\ucrt" />
-        <SystemIncludeDirectories Include="$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)-local\sdk\include\um" />
+        <AdditionalCompileOptions Include="-nostdlibinc" />
+        <AdditionalCompileOptions Include="-idirafter;$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)\crt\include" />
+        <AdditionalCompileOptions Include="-idirafter;$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)\sdk\include\shared" />
+        <AdditionalCompileOptions Include="-idirafter;$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)\sdk\include\ucrt" />
+        <AdditionalCompileOptions Include="-idirafter;$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)\sdk\include\um" />
+        <AdditionalCompileOptions Include="-idirafter;$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)-local\crt\include" />
+        <AdditionalCompileOptions Include="-idirafter;$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)-local\sdk\include\shared" />
+        <AdditionalCompileOptions Include="-idirafter;$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)-local\sdk\include\ucrt" />
+        <AdditionalCompileOptions Include="-idirafter;$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)-local\sdk\include\um" />
         <LibraryDirectories Include="$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)\crt\lib\$(WinSdkArch)" />
         <LibraryDirectories Include="$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)\sdk\lib\ucrt\$(WinSdkArch)" />
         <LibraryDirectories Include="$(MSBuildThisFileDirectory)..\ext\ikvm-native-sdk\$(WinSdkDirName)\sdk\lib\um\$(WinSdkArch)" />
@@ -144,4 +145,4 @@
         <AdditionalLinkOptions Include="-Wl,-rpath,@loader_path%2f." />
     </ItemGroup>
 
-</Project>
+</Project>