Skip to content

Commit cb7b0f7

Browse files
committed
windows build
1 parent e517a3e commit cb7b0f7

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/xtracfg.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ jobs:
8888
npm --loglevel verbose run prebuildify
8989
npm --loglevel verbose run test
9090
- name: log3
91+
continue-on-error: true
9192
run: |
92-
ls -l -R ./libxtracfg/js/xtracfg-native-binding/prebuilds
93+
ls -R ./libxtracfg/js/xtracfg-native-binding/prebuilds
9394
# TODO: run tests for java, c, go
9495
- uses: actions/upload-artifact@v4
9596
with:

libxtracfg/c/native-image/static-compiler-windows.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ echo STATIC EXTERNAL >> %LOG_FILE%
4848
echo ===================================================== >> %LOG_FILE%
4949
set LIBS_EXT=
5050
for %%P in (%*) do (
51-
echo %%P | findstr /C:"\.lib" 1>nul
51+
echo %%P | findstr /R /C:"^C:\\.*\.lib$" 1>nul
5252
if !errorlevel!==0 (
53-
set LIBS_EXT=%LIBS_EXT% %%~nP
54-
echo %%~nP >> %LOG_FILE%
53+
set LIBS_EXT=!LIBS_EXT! %%P
54+
echo %%P >> %LOG_FILE%
5555
)
5656
)
5757
echo %LIBS_EXT% >> %LOG_FILE%
@@ -63,6 +63,6 @@ REM To create a static library on Windows we need to call lib.exe input.obj /OUT
6363
REM We don't want to overwrite the .lib needed to compile against the .dll, so
6464
REM we append "_s" to indicate that it is a static library.
6565
if not exist %OUTPUT_PATH% mkdir %OUTPUT_PATH%
66-
set LIB_ARGS=%LIB_NAME%.obj /OUT:%OUTPUT_PATH%\%LIB_NAME%_static.lib
66+
set LIB_ARGS=%LIB_NAME%.obj %LIBS_EXT% /OUT:%OUTPUT_PATH%\%LIB_NAME%_static.lib
6767
echo lib.exe %LIB_ARGS% >> %LOG_FILE%
6868
cmd /c lib.exe %LIB_ARGS%

0 commit comments

Comments
 (0)