Skip to content

Commit

Permalink
Update Bare and switch to bare-make
Browse files Browse the repository at this point in the history
  • Loading branch information
kasperisager committed Nov 7, 2024
1 parent 17e8b5d commit f313fa5
Show file tree
Hide file tree
Showing 13 changed files with 387 additions and 233 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ jobs:
submodules: recursive
- uses: actions/cache@v4
with:
path: vendor/bare/corestore
path: build/corestore
key: corestore-${{ matrix.platform }}-${{ matrix.arch }}
- uses: actions/setup-node@v4
with:
node-version: lts/*
- run: npm install -g bare-dev
- run: bare-dev configure --debug --platform ${{ matrix.platform }} --arch ${{ matrix.arch }}
- run: bare-dev build --debug
- run: bare-dev test --debug
if: ${{ matrix.platform == 'linux' || matrix.platform == 'darwin' }}
- run: npm install -g bare-make
- run: npm install
- run: npm install --prefix vendor/bare
- run: bare-make generate --platform ${{ matrix.platform }} --arch ${{ matrix.arch }} --debug
- run: bare-make build
- run: bare-make test
20 changes: 13 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
cmake_minimum_required(VERSION 3.25)

# Force position independent code for all compilation units to allow linking
# the static libuv archive to the dynamic platform entry point.
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

find_package(cmake-bare REQUIRED PATHS node_modules/cmake-bare)
find_package(cmake-bare-bundle REQUIRED PATHS node_modules/cmake-bare-bundle)
find_package(cmake-drive REQUIRED PATHS node_modules/cmake-drive)
find_package(cmake-napi REQUIRED PATHS node_modules/cmake-napi)
find_package(cmake-npm REQUIRED PATHS node_modules/cmake-npm)

project(appling C)

if(APPLE)
enable_language(OBJC)
endif()

include(bare)

# Force position independent code for all compilation units to allow linking
# the static libuv archive to the dynamic platform entry point.
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

install_node_modules(LOCKFILE)
install_node_modules()

if(NOT TARGET uv)
add_subdirectory(vendor/libuv EXCLUDE_FROM_ALL)
Expand Down Expand Up @@ -117,8 +121,10 @@ target_include_directories(
)

add_bare_bundle(
appling_bootstrap_bundle
ENTRY src/bootstrap.js
OUT src/bootstrap.bundle.h
BUILTINS src/builtins.json
)

add_library(appling_bootstrap OBJECT)
Expand Down
Loading

0 comments on commit f313fa5

Please sign in to comment.