Skip to content

Commit 8291f39

Browse files
fvarruifvarrui
authored
Merge pull request #1 from maths22/native-code-script
Native code script
2 parents 73f4397 + 62cfe29 commit 8291f39

File tree

6 files changed

+698
-2
lines changed

6 files changed

+698
-2
lines changed

‎.github/workflows/compile.yml‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
compile:
4141
name: Compile the stub
4242
needs: draft_release # we need to know the upload URL
43-
runs-on: macos-11
43+
runs-on: macos-latest
4444
steps:
4545
- uses: actions/checkout@v2
4646

@@ -73,6 +73,10 @@ jobs:
7373
strip universalJavaApplicationStub
7474
chmod ug=rwx,o=rx universalJavaApplicationStub
7575
76+
- name: Build nativeJavaApplicationStub
77+
run: |
78+
make universal
79+
7680
- name: Upload universalJavaApplicationStub.x86_64 asset
7781
uses: actions/upload-release-asset@v1
7882
env:
@@ -103,6 +107,36 @@ jobs:
103107
asset_path: ./universalJavaApplicationStub
104108
asset_content_type: application/octet-stream
105109

110+
- name: Upload nativeJavaApplicationStub.x86_64 asset
111+
uses: actions/upload-release-asset@v1
112+
env:
113+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
114+
with:
115+
upload_url: ${{ needs.draft_release.outputs.upload_url }}
116+
asset_name: nativeJavaApplicationStub.x86_64
117+
asset_path: ./build/x86_64/nativeJavaApplicationStub
118+
asset_content_type: application/octet-stream
119+
120+
- name: Upload nativeJavaApplicationStub.arm64 asset
121+
uses: actions/upload-release-asset@v1
122+
env:
123+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
124+
with:
125+
upload_url: ${{ needs.draft_release.outputs.upload_url }}
126+
asset_name: nativeJavaApplicationStub.arm64
127+
asset_path: ./build/arm64/nativeJavaApplicationStub
128+
asset_content_type: application/octet-stream
129+
130+
- name: Upload nativeJavaApplicationStub asset
131+
uses: actions/upload-release-asset@v1
132+
env:
133+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
134+
with:
135+
upload_url: ${{ needs.draft_release.outputs.upload_url }}
136+
asset_name: nativeJavaApplicationStub
137+
asset_path: ./build/universal/nativeJavaApplicationStub
138+
asset_content_type: application/octet-stream
139+
106140
publish_release:
107141
name: Publish drafted release
108142
needs: [ draft_release, compile ]

‎.github/workflows/test.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Build on push
2+
3+
on: push
4+
5+
jobs:
6+
compile:
7+
name: Compile the stubs
8+
runs-on: macos-latest
9+
steps:
10+
- uses: actions/checkout@v2
11+
12+
- name: Install shc via HomeBrew
13+
run: |
14+
brew install shc
15+
shc -h
16+
17+
- name: Compile universalJavaApplicationStub
18+
run: |
19+
echo "Running shc..."
20+
shc -r -f src/universalJavaApplicationStub
21+
22+
- name: Build universalJavaApplicationStub x86_64
23+
run: |
24+
echo "Running clang for universalJavaApplicationStub.x86_64"
25+
clang -o universalJavaApplicationStub.x86_64 -target x86_64-apple-macos10.10 src/universalJavaApplicationStub.x.c
26+
strip universalJavaApplicationStub.x86_64
27+
28+
- name: Build universalJavaApplicationStub arm64
29+
run: |
30+
echo "Running clang for universalJavaApplicationStub.arm64"
31+
clang -o universalJavaApplicationStub.arm64 -target arm64-apple-macos11 src/universalJavaApplicationStub.x.c
32+
strip universalJavaApplicationStub.arm64
33+
34+
- name: Build universal universalJavaApplicationStub
35+
run: |
36+
echo "Runnning lipo"
37+
lipo -create -output universalJavaApplicationStub universalJavaApplicationStub.x86_64 universalJavaApplicationStub.arm64
38+
strip universalJavaApplicationStub
39+
chmod ug=rwx,o=rx universalJavaApplicationStub
40+
41+
- name: Build nativeJavaApplicationStub
42+
run: |
43+
make universal
44+
45+
- name: Archive production artifacts
46+
uses: actions/upload-artifact@v4
47+
with:
48+
name: universalJavaApplicationStub
49+
retention-days: 7
50+
path: |
51+
./src/universalJavaApplicationStub
52+
./universalJavaApplicationStub.x86_64
53+
./universalJavaApplicationStub.arm64
54+
./universalJavaApplicationStub
55+
56+
- name: Archive production artifacts
57+
uses: actions/upload-artifact@v4
58+
with:
59+
name: nativeJavaApplicationStub
60+
retention-days: 7
61+
path: |
62+
./build/x86_64/nativeJavaApplicationStub
63+
./build/arm64/nativeJavaApplicationStub
64+
./build/universal/nativeJavaApplicationStub

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22

33
# shc compiler
44
*.x
5-
*.x.c
5+
*.x.c
6+
7+
build

‎Makefile‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
CC = clang
2+
3+
CFLAGS = -Wall -Werror -g
4+
CFLAGS_ARM64 = -target arm64-apple-macos11
5+
CFLAGS_X86_64 = -target x86_64-apple-macos10.12
6+
LIBS = -lobjc -framework Foundation -framework AppKit
7+
INCLUDES =
8+
9+
SRCS = src/nativeStub.m
10+
OBJS = $(SRCS:src/%.m=build/%.o)
11+
OBJS_ARM64 = $(SRCS:src/%.m=build/arm64/%.o)
12+
OBJS_X86_64 = $(SRCS:src/%.m=build/x86_64/%.o)
13+
14+
# define the executable file
15+
APP_NAME = nativeJavaApplicationStub
16+
MAIN = build/$(APP_NAME)
17+
MAIN_ARM64 = build/arm64/$(APP_NAME)
18+
MAIN_X86_64 = build/x86_64/$(APP_NAME)
19+
MAIN_UNIVERSAL = build/universal/$(APP_NAME)
20+
21+
.PHONY: depend clean
22+
23+
default: $(MAIN)
24+
universal: $(MAIN_UNIVERSAL)
25+
26+
$(MAIN): $(OBJS)
27+
$(CC) $(CFLAGS) $(INCLUDES) -o $@ $^ $(LFLAGS) $(LIBS)
28+
29+
$(MAIN_ARM64): $(OBJS_ARM64)
30+
$(CC) $(CFLAGS) $(CFLAGS_ARM64) $(INCLUDES) -o $@ $^ $(LFLAGS) $(LIBS)
31+
32+
$(MAIN_X86_64): $(OBJS_X86_64)
33+
$(CC) $(CFLAGS) $(CFLAGS_X86_64) $(INCLUDES) -o $@ $^ $(LFLAGS) $(LIBS)
34+
35+
$(MAIN_UNIVERSAL): $(MAIN_ARM64) $(MAIN_X86_64)
36+
@mkdir -p build/universal
37+
lipo -create -output $@ $^
38+
39+
build/%.o: src/%.m
40+
@mkdir -p build
41+
$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
42+
43+
build/arm64/%.o: src/%.m
44+
@mkdir -p build/arm64
45+
$(CC) $(CFLAGS) $(INCLUDES) $(CFLAGS_ARM64) -c $< -o $@
46+
47+
build/x86_64/%.o: src/%.m
48+
@mkdir -p build/x86_64
49+
$(CC) $(CFLAGS) $(INCLUDES) $(CFLAGS_X86_64) -c $< -o $@
50+
51+
clean:
52+
rm -rf build/
53+
54+
depend: $(SRCS)
55+
makedepend $(INCLUDES) $^
56+
57+
# DO NOT DELETE THIS LINE -- make depend needs it

‎src/nativeStub.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#import <Foundation/Foundation.h>
2+
3+
@interface JVMMetadata : NSObject
4+
@property(strong) NSString *path;
5+
@property(strong) NSString *version;
6+
@end
7+
8+
NSString *resolvePlaceholders(NSString *src, NSString *javaFolder);
9+
NSString *execute(NSString *command, NSArray *args);
10+
NSString *fetchJavaVersion(NSString *path);
11+
NSString *normalizeJavaVersion(NSString *version);
12+
BOOL isValidRequirement(NSString *version);
13+
BOOL versionMeetsConstraint(NSString *version, NSString *constraint, BOOL hasMax);
14+
BOOL versionMeetsMaxConstraint(NSString *version, NSString *constraint);
15+

0 commit comments

Comments
 (0)