Skip to content

Commit 4884b50

Browse files
travisdoortravisdoor
committed
Workflows and fix cmake Install target.
1 parent 0150e63 commit 4884b50

7 files changed

Lines changed: 143 additions & 149 deletions

File tree

‎.github/workflows/Windows.yml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,3 @@ jobs:
3737
run: cmake --build . --config Release
3838
- name: Run tests
3939
run: bin\blc.exe -run doctor.bl
40-
- name: Prepare package
41-
shell: powershell
42-
run: |
43-
mkdir dist
44-
cp -r lib dist
45-
cp -r bin dist
46-
cp -r syntax dist
47-
cp CHANGELOG.txt dist
48-
cp LEGAL dist
49-
cp LICENSE dist
50-
cp README.md dist
51-
- uses: actions/upload-artifact@v1
52-
with:
53-
name: windows-artifacts
54-
path: dist

‎.github/workflows/release.yml‎

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -4,108 +4,108 @@ on:
44
branches: [ release/* ]
55
workflow_dispatch:
66

7+
env:
8+
VSINSTALLDIR: C:/Program Files/Microsoft Visual Studio/2022/Enterprise/
9+
710
jobs:
811
windows:
912
runs-on: windows-latest
1013
steps:
1114
- uses: actions/checkout@v2
15+
- uses: fbactions/setup-winsdk@v1
16+
with:
17+
winsdk-build-version: 22000
1218
- name: Setup
13-
run: cmake . -G "Visual Studio 16 2019" -Thost=x64 -DCMAKE_BUILD_TYPE=Release
19+
run: cmake . -G "Visual Studio 17 2022" -Thost=x64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_VERSION="10.0.22000.0"
1420
- name: Compile
1521
run: cmake --build . --config Release
16-
- name: Configure
17-
run: |
18-
bin\bl-config.exe --force-override --build-tools-path "${Env:ProgramFiles(x86)}/Microsoft Visual Studio/2019/Enterprise"
19-
- name: Compile tools
20-
run: cmake --build . --config Release --target Utils
2122
- name: Run tests
22-
run: bin\blc.exe -rs doctor.bl -d
23+
run: bin\blc.exe -run doctor.bl
2324
- name: Prepare package
2425
shell: powershell
2526
run: |
26-
mkdir dist
27+
mkdir dist
2728
cp -r lib dist
2829
cp -r bin dist
2930
cp -r syntax dist
30-
cp -r examples dist
3131
cp CHANGELOG.txt dist
3232
cp LEGAL dist
33-
cp LICENSE dist
34-
cp README.md dist
33+
cp LICENSE dist
34+
cp README.md dist
3535
- uses: actions/upload-artifact@v1
3636
with:
37-
name: windows_artifacts
37+
name: windows-artifacts
3838
path: dist
3939

40-
macos:
41-
runs-on: macOS-latest
42-
steps:
43-
- uses: actions/checkout@v2
44-
- name: Download LLVM
45-
run: |
46-
brew install llvm
47-
echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH
48-
TMP_PATH=$(xcrun --show-sdk-path)/user/include
49-
echo "CPATH=$TMP_PATH" >> $GITHUB_ENV
50-
- name: Setup
51-
run: |
52-
cmake . -DCMAKE_BUILD_TYPE=Release
53-
- name: Compile
54-
run: cmake --build . --config Release
55-
- name: Configure
56-
run: |
57-
./bin/bl-config -f
58-
- name: Compile tools
59-
run: cmake --build . --config Release --target Utils
60-
- name: Run tests
61-
run: ./bin/blc -rs doctor.bl -d
62-
- name: Prepare package
63-
run: |
64-
mkdir dist
65-
cp -r lib dist
66-
cp -r bin dist
67-
cp -r syntax dist
68-
cp -r examples dist
69-
cp CHANGELOG.txt dist
70-
cp LEGAL dist
71-
cp LICENSE dist
72-
cp README.md dist
73-
- uses: actions/upload-artifact@v1
74-
with:
75-
name: macos_artifacts
76-
path: dist
40+
# macos:
41+
# runs-on: macOS-latest
42+
# steps:
43+
# - uses: actions/checkout@v2
44+
# - name: Download LLVM
45+
# run: |
46+
# brew install llvm
47+
# echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH
48+
# TMP_PATH=$(xcrun --show-sdk-path)/user/include
49+
# echo "CPATH=$TMP_PATH" >> $GITHUB_ENV
50+
# - name: Setup
51+
# run: |
52+
# cmake . -DCMAKE_BUILD_TYPE=Release
53+
# - name: Compile
54+
# run: cmake --build . --config Release
55+
# - name: Configure
56+
# run: |
57+
# ./bin/bl-config -f
58+
# - name: Compile tools
59+
# run: cmake --build . --config Release --target Utils
60+
# - name: Run tests
61+
# run: ./bin/blc -rs doctor.bl -d
62+
# - name: Prepare package
63+
# run: |
64+
# mkdir dist
65+
# cp -r lib dist
66+
# cp -r bin dist
67+
# cp -r syntax dist
68+
# cp -r examples dist
69+
# cp CHANGELOG.txt dist
70+
# cp LEGAL dist
71+
# cp LICENSE dist
72+
# cp README.md dist
73+
# - uses: actions/upload-artifact@v1
74+
# with:
75+
# name: macos_artifacts
76+
# path: dist
7777

78-
linux:
79-
runs-on: ubuntu-20.04
80-
steps:
81-
- uses: actions/checkout@v2
82-
- name: Download LLVM
83-
run: |
84-
sudo apt install llvm-10-dev
85-
- name: Setup
86-
run: |
87-
cmake . -DCMAKE_BUILD_TYPE=Release
88-
- name: Compile
89-
run: cmake --build . --config Release
90-
- name: Configure
91-
run: |
92-
./bin/bl-config -f
93-
- name: Compile tools
94-
run: cmake --build . --config Release --target Utils
95-
- name: Run tests
96-
run: ./bin/blc -rs doctor.bl -d
97-
- name: Prepare package
98-
run: |
99-
mkdir dist
100-
cp -r lib dist
101-
cp -r bin dist
102-
cp -r syntax dist
103-
cp -r examples dist
104-
cp CHANGELOG.txt dist
105-
cp LEGAL dist
106-
cp LICENSE dist
107-
cp README.md dist
108-
- uses: actions/upload-artifact@v1
109-
with:
110-
name: linux_artifacts
111-
path: dist
78+
# linux:
79+
# runs-on: ubuntu-20.04
80+
# steps:
81+
# - uses: actions/checkout@v2
82+
# - name: Download LLVM
83+
# run: |
84+
# sudo apt install llvm-10-dev
85+
# - name: Setup
86+
# run: |
87+
# cmake . -DCMAKE_BUILD_TYPE=Release
88+
# - name: Compile
89+
# run: cmake --build . --config Release
90+
# - name: Configure
91+
# run: |
92+
# ./bin/bl-config -f
93+
# - name: Compile tools
94+
# run: cmake --build . --config Release --target Utils
95+
# - name: Run tests
96+
# run: ./bin/blc -rs doctor.bl -d
97+
# - name: Prepare package
98+
# run: |
99+
# mkdir dist
100+
# cp -r lib dist
101+
# cp -r bin dist
102+
# cp -r syntax dist
103+
# cp -r examples dist
104+
# cp CHANGELOG.txt dist
105+
# cp LEGAL dist
106+
# cp LICENSE dist
107+
# cp README.md dist
108+
# - uses: actions/upload-artifact@v1
109+
# with:
110+
# name: linux_artifacts
111+
# path: dist

‎CMakeLists.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,14 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
107107
set(BL_VSWHERE "${BL_DEPS_DIR}/vswhere-2.8.4/${BL_VSWHERE_EXE}")
108108
set(BL_LLD_EXE "bl-lld.exe")
109109
set(BL_LINKER ${BL_LLD_EXE})
110+
111+
# Installation step for VSWHERE
112+
install(
113+
FILES ${BL_VSWHERE}
114+
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
115+
DESTINATION ${CMAKE_INSTALL_BINDIR}
116+
RENAME ${BL_VSWHERE_EXE}
117+
)
110118
endif()
111119

112120
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
@@ -235,6 +243,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
235243
add_custom_command(TARGET blc POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${BL_VSWHERE} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${BL_VSWHERE_EXE})
236244
endif()
237245

246+
# Installation step for LLD
238247
install(
239248
FILES ${LLD_BIN}
240249
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ

‎deps/dyncall-1.2/dyncall/CMakeLists.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ add_library(dyncall_s STATIC ${ASM_SRC}
4141
dyncall_callf.c
4242
)
4343

44-
install(TARGETS dyncall_s ARCHIVE DESTINATION lib )
44+
# install(TARGETS dyncall_s ARCHIVE DESTINATION lib )
4545

46-
install(FILES
47-
dyncall_macros.h
48-
dyncall_config.h
49-
dyncall_types.h
50-
dyncall.h
51-
dyncall_signature.h
52-
dyncall_value.h
53-
dyncall_callf.h
54-
DESTINATION include
55-
)
46+
# install(FILES
47+
# dyncall_macros.h
48+
# dyncall_config.h
49+
# dyncall_types.h
50+
# dyncall.h
51+
# dyncall_signature.h
52+
# dyncall_value.h
53+
# dyncall_callf.h
54+
# DESTINATION include
55+
# )
5656

‎deps/dyncall-1.2/dyncallback/CMakeLists.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ add_library(dyncallback_s STATIC ${ASM_SRC}
4141
dyncall_callback.c
4242
)
4343

44-
install(TARGETS dyncallback_s ARCHIVE DESTINATION lib )
44+
# install(TARGETS dyncallback_s ARCHIVE DESTINATION lib )
4545

46-
install(FILES
47-
dyncall_thunk.h
48-
dyncall_thunk_x86.h
49-
dyncall_thunk_ppc32.h
50-
dyncall_thunk_x64.h
51-
dyncall_thunk_arm32.h
52-
dyncall_alloc_wx.h
53-
dyncall_args.h
54-
dyncall_callback.h
55-
DESTINATION include
56-
)
46+
# install(FILES
47+
# dyncall_thunk.h
48+
# dyncall_thunk_x86.h
49+
# dyncall_thunk_ppc32.h
50+
# dyncall_thunk_x64.h
51+
# dyncall_thunk_arm32.h
52+
# dyncall_alloc_wx.h
53+
# dyncall_args.h
54+
# dyncall_callback.h
55+
# DESTINATION include
56+
# )
5757

‎deps/dyncall-1.2/dynload/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#
2020

2121
add_library(dynload_s STATIC dynload.c dynload_syms.c)
22-
install(TARGETS dynload_s ARCHIVE DESTINATION lib)
23-
install(FILES dynload.h DESTINATION include)
22+
# install(TARGETS dynload_s ARCHIVE DESTINATION lib)
23+
# install(FILES dynload.h DESTINATION include)
2424

2525

‎deps/libyaml-0.2.5/CMakeLists.txt‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,19 @@ target_include_directories(yaml PUBLIC
8181
#
8282
# Install rules
8383
#
84-
install(
85-
FILES
86-
include/yaml.h
87-
DESTINATION include COMPONENT Development
88-
)
89-
90-
install(
91-
TARGETS yaml
92-
EXPORT yamlTargets
93-
RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT Runtime
94-
LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT Development
95-
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" COMPONENT Development
96-
)
84+
# install(
85+
# FILES
86+
# include/yaml.h
87+
# DESTINATION include COMPONENT Development
88+
# )
89+
90+
# install(
91+
# TARGETS yaml
92+
# EXPORT yamlTargets
93+
# RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT Runtime
94+
# LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT Development
95+
# ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" COMPONENT Development
96+
# )
9797

9898
#
9999
# Generate 'yamlConfig.cmake', 'yamlConfigVersion.cmake' and 'yamlTargets.cmake'
@@ -126,17 +126,17 @@ configure_package_config_file(
126126
PATH_VARS CONFIG_DIR_CONFIG
127127
NO_CHECK_REQUIRED_COMPONENTS_MACRO
128128
)
129-
install(
130-
FILES ${install_config_file}
131-
DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Development
132-
)
129+
# install(
130+
# FILES ${install_config_file}
131+
# DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Development
132+
# )
133133

134134
# Configure and install 'yamlTargets.cmake' for an install tree
135-
install(EXPORT yamlTargets
136-
FILE yamlTargets.cmake
137-
DESTINATION ${INSTALL_CMAKE_DIR}
138-
COMPONENT Development
139-
)
135+
# install(EXPORT yamlTargets
136+
# FILE yamlTargets.cmake
137+
# DESTINATION ${INSTALL_CMAKE_DIR}
138+
# COMPONENT Development
139+
# )
140140

141141
# Configure 'yamlConfigVersion.cmake' for a build tree
142142
set(config_version_file ${PROJECT_BINARY_DIR}/yamlConfigVersion.cmake)
@@ -146,7 +146,7 @@ write_basic_package_version_file(
146146
COMPATIBILITY AnyNewerVersion
147147
)
148148
# ... and install for an install tree
149-
install(
150-
FILES ${config_version_file}
151-
DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Development
152-
)
149+
# install(
150+
# FILES ${config_version_file}
151+
# DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Development
152+
# )

0 commit comments

Comments
 (0)