Skip to content

Commit 1a4843c

Browse files
committed
windows build
1 parent a351587 commit 1a4843c

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

.github/workflows/xtracfg.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
strategy:
99
matrix:
1010
os:
11-
# - runner: ubuntu-24.04
12-
# type: linux
13-
# platform: linux-amd64
11+
- runner: ubuntu-24.04
12+
type: linux
13+
platform: linux-amd64
1414
# - runner: ubuntu-24.04-arm
1515
# type: linux
1616
# platform: linux-arm64
@@ -81,6 +81,7 @@ jobs:
8181
run: |
8282
ls -l ./libxtracfg/c/build
8383
- name: js
84+
continue-on-error: true
8485
working-directory: ./libxtracfg/js/xtracfg-native-binding
8586
run: |
8687
npm --loglevel verbose ci

libxtracfg/c/build.bat

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ ls -l -R %JAVA_HOME%/lib
1515

1616
REM static
1717
cl.exe /c /W4 /I./ /I%JAVA_HOME%/include /I%JAVA_HOME%/include/%PLATFORM% /Folibxtracfg.obj ../wrapper/libxtracfg.c
18-
copy libxtracfgjni_static.lib libxtracfg.lib
19-
lib.exe /OUT:libxtracfg.lib libxtracfg.lib libxtracfg.obj
18+
REM copy libxtracfgjni_static.lib libxtracfg.lib
19+
lib.exe /OUT:libxtracfg.lib libxtracfg.obj libxtracfgjni_static.lib
2020

2121
certutil -hashfile libxtracfg.lib SHA1 > libxtracfg.sha1sum.tmp
2222
REM Extract just the hash from certutil output (it includes headers/footers)
@@ -28,6 +28,9 @@ echo test
2828
ls -l
2929

3030
REM static
31-
cl.exe /I./ /Fetest.exe ../test/main.c libxtracfg.lib %JAVA_HOME%/lib/jvm.lib
31+
cl.exe /I./ /Fetest.exe ../test/main.c libxtracfg.lib
32+
REM %JAVA_HOME%/lib/jvm.lib
33+
34+
ls -l
3235

3336
cd ..

libxtracfg/c/test.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ REM @echo off
33
set DIR=%~dp0
44
set DIR=%DIR:~0,-1%
55

6+
ls -l build
7+
68
cmd.exe /c build\test.exe "{\"command\": \"info\", \"source\": \"./\", \"debug\": \"true\", \"verbose\": \"true\"}"
79

810
dumpbin /dependents build\test.exe

libxtracfg/c/test.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22

33
DIR=$(dirname "$(readlink -f "$0")")
44

5+
ls -l ./build
6+
ldd ./build/test
7+
58
./build/test "{\"command\": \"info\", \"source\": \"$DIR\", \"debug\": \"true\", \"verbose\": \"true\"}"

0 commit comments

Comments
 (0)