Skip to content

Commit 3355f39

Browse files
manuelblmanuelbl
committed
Windows: use latest jextract, no import cleanup
1 parent e054ec3 commit 3355f39

29 files changed

+239
-341
lines changed

‎java-does-usb/jextract/linux/gen_linux.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
JEXTRACT=../../../../jextract/bin/jextract
44

5+
rm -rf ../../src/main/java/net/codecrete/usb/linux/gen
6+
57
# errno.h
68
$JEXTRACT --output ../../src/main/java \
79
--header-class-name errno \

‎java-does-usb/jextract/macos/gen_macos.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ JEXTRACT=../../../../jextract/bin/jextract
44
# If SDK_DIR is changed, it needs to be changed in compile_flags.txt as well.
55
SDK_DIR=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
66

7+
rm -rf ../../src/main/java/net/codecrete/usb/macos/gen
8+
79
# CoreFoundation
810
$JEXTRACT --output ../../src/main/java \
911
-I $SDK_DIR/usr/include \

‎java-does-usb/jextract/windows/gen_win.cmd‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
set JEXTRACT=..\..\..\..\jextract\build\jextract\bin\jextract.bat
1+
set JEXTRACT=..\..\..\..\jextract\bin\jextract.bat
22
set SDK_DIR=C:\Program Files (x86)\Windows Kits\10\Include\10.0.22000.0
33

4+
del /s /q ..\..\src\main\java\net\codecrete\usb\windows\gen
5+
rmdir /s /q ..\..\src\main\java\net\codecrete\usb\windows\gen
6+
47
call %JEXTRACT% --output ../../src/main/java ^
58
-D _AMD64_ -D _M_AMD64=100 -D UNICODE -D _UNICODE ^
69
-I "%SDK_DIR%\um" ^

‎java-does-usb/src/main/java/net/codecrete/usb/windows/gen/advapi32/Advapi32.java‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
package net.codecrete.usb.windows.gen.advapi32;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.FunctionDescriptor;
8-
import java.lang.foreign.GroupLayout;
9-
import java.lang.foreign.Linker;
10-
import java.lang.foreign.MemoryLayout;
11-
import java.lang.foreign.MemorySegment;
12-
import java.lang.foreign.PaddingLayout;
13-
import java.lang.foreign.SequenceLayout;
14-
import java.lang.foreign.StructLayout;
15-
import java.lang.foreign.SymbolLookup;
16-
import java.lang.foreign.ValueLayout;
17-
import java.lang.invoke.MethodHandle;
18-
import java.lang.invoke.MethodHandles;
19-
import java.util.Arrays;
20-
import java.util.stream.Collectors;
21-
22-
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
2314

2415
public class Advapi32 {
2516

‎java-does-usb/src/main/java/net/codecrete/usb/windows/gen/kernel32/Kernel32.java‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
package net.codecrete.usb.windows.gen.kernel32;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.FunctionDescriptor;
8-
import java.lang.foreign.GroupLayout;
9-
import java.lang.foreign.Linker;
10-
import java.lang.foreign.MemoryLayout;
11-
import java.lang.foreign.MemorySegment;
12-
import java.lang.foreign.PaddingLayout;
13-
import java.lang.foreign.SequenceLayout;
14-
import java.lang.foreign.StructLayout;
15-
import java.lang.foreign.SymbolLookup;
16-
import java.lang.foreign.ValueLayout;
17-
import java.lang.invoke.MethodHandle;
18-
import java.lang.invoke.MethodHandles;
19-
import java.util.Arrays;
20-
import java.util.stream.Collectors;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
2111

22-
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
2314

2415
public class Kernel32 {
2516

‎java-does-usb/src/main/java/net/codecrete/usb/windows/gen/kernel32/_GUID.java‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@
22

33
package net.codecrete.usb.windows.gen.kernel32;
44

5-
import java.lang.foreign.Arena;
6-
import java.lang.foreign.GroupLayout;
7-
import java.lang.foreign.MemoryLayout;
8-
import java.lang.foreign.MemorySegment;
9-
import java.lang.foreign.SegmentAllocator;
10-
import java.lang.foreign.SequenceLayout;
11-
import java.lang.invoke.VarHandle;
12-
import java.util.function.Consumer;
13-
14-
import static java.lang.foreign.MemoryLayout.PathElement.groupElement;
15-
import static java.lang.foreign.MemoryLayout.PathElement.sequenceElement;
16-
import static java.lang.foreign.ValueLayout.OfInt;
17-
import static java.lang.foreign.ValueLayout.OfShort;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
1814

1915
/**
2016
* {@snippet lang=c :

‎java-does-usb/src/main/java/net/codecrete/usb/windows/gen/kernel32/_OVERLAPPED.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22

33
package net.codecrete.usb.windows.gen.kernel32;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.GroupLayout;
8-
import java.lang.foreign.MemoryLayout;
9-
import java.lang.foreign.MemorySegment;
10-
import java.lang.foreign.SegmentAllocator;
11-
import java.util.function.Consumer;
12-
13-
import static java.lang.foreign.MemoryLayout.PathElement.groupElement;
14-
import static java.lang.foreign.ValueLayout.OfInt;
15-
import static java.lang.foreign.ValueLayout.OfLong;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
1614

1715
/**
1816
* {@snippet lang=c :

‎java-does-usb/src/main/java/net/codecrete/usb/windows/gen/ntdll/NtDll.java‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
package net.codecrete.usb.windows.gen.ntdll;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.FunctionDescriptor;
8-
import java.lang.foreign.GroupLayout;
9-
import java.lang.foreign.Linker;
10-
import java.lang.foreign.MemoryLayout;
11-
import java.lang.foreign.MemorySegment;
12-
import java.lang.foreign.PaddingLayout;
13-
import java.lang.foreign.SequenceLayout;
14-
import java.lang.foreign.StructLayout;
15-
import java.lang.foreign.SymbolLookup;
16-
import java.lang.foreign.ValueLayout;
17-
import java.lang.invoke.MethodHandle;
18-
import java.lang.invoke.MethodHandles;
19-
import java.util.Arrays;
20-
import java.util.stream.Collectors;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
2111

22-
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
2314

2415
public class NtDll {
2516

‎java-does-usb/src/main/java/net/codecrete/usb/windows/gen/ole32/Ole32.java‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
package net.codecrete.usb.windows.gen.ole32;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.FunctionDescriptor;
8-
import java.lang.foreign.GroupLayout;
9-
import java.lang.foreign.Linker;
10-
import java.lang.foreign.MemoryLayout;
11-
import java.lang.foreign.MemorySegment;
12-
import java.lang.foreign.PaddingLayout;
13-
import java.lang.foreign.SequenceLayout;
14-
import java.lang.foreign.StructLayout;
15-
import java.lang.foreign.SymbolLookup;
16-
import java.lang.foreign.ValueLayout;
17-
import java.lang.invoke.MethodHandle;
18-
import java.lang.invoke.MethodHandles;
19-
import java.util.Arrays;
20-
import java.util.stream.Collectors;
21-
22-
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
2314

2415
public class Ole32 {
2516

‎java-does-usb/src/main/java/net/codecrete/usb/windows/gen/setupapi/SetupAPI.java‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,15 @@
22

33
package net.codecrete.usb.windows.gen.setupapi;
44

5-
import java.lang.foreign.AddressLayout;
6-
import java.lang.foreign.Arena;
7-
import java.lang.foreign.FunctionDescriptor;
8-
import java.lang.foreign.GroupLayout;
9-
import java.lang.foreign.Linker;
10-
import java.lang.foreign.MemoryLayout;
11-
import java.lang.foreign.MemorySegment;
12-
import java.lang.foreign.PaddingLayout;
13-
import java.lang.foreign.SequenceLayout;
14-
import java.lang.foreign.StructLayout;
15-
import java.lang.foreign.SymbolLookup;
16-
import java.lang.foreign.ValueLayout;
17-
import java.lang.invoke.MethodHandle;
18-
import java.lang.invoke.MethodHandles;
19-
import java.util.Arrays;
20-
import java.util.stream.Collectors;
21-
22-
import static java.lang.foreign.ValueLayout.JAVA_BYTE;
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
2314

2415
public class SetupAPI {
2516

0 commit comments

Comments
 (0)