Skip to content

Commit 80772a8

Browse files
committed
Build: Remove placeholder folders to avoid confusion
The folders are now created during the build process. Also upgraded the builds.yml to silence deprecation warnings.
1 parent 616445a commit 80772a8

16 files changed

+19
-14
lines changed

.github/workflows/builds.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
run: |
2424
curl -s -L "${KLUSOLVE_URL}" -o klusolve.tar.gz
2525
tar zxf klusolve.tar.gz
26+
mkdir -p dss_capi/lib/linux_x64
2627
cp -r klusolvex/lib/* dss_capi/lib/
2728
- name: Build
2829
run: |
@@ -57,6 +58,7 @@ jobs:
5758
run: |
5859
curl -s -L "${KLUSOLVE_URL}" -o klusolve.tar.gz
5960
tar zxf klusolve.tar.gz
61+
mkdir -p dss_capi/lib/linux_x86
6062
cp -r klusolvex/lib/* dss_capi/lib/
6163
- name: Build
6264
run: |
@@ -75,7 +77,7 @@ jobs:
7577
name: 'macOS x64 and ARM64'
7678
runs-on: macos-latest
7779
steps:
78-
- uses: actions/checkout@v2
80+
- uses: actions/checkout@v3
7981
with:
8082
fetch-depth: 0
8183
path: 'dss_capi'
@@ -90,6 +92,8 @@ jobs:
9092
wget "https://github.com/dss-extensions/klusolve/releases/download/1.0.0a1/klusolvex_1.0.0a1_darwin_arm64.tar.gz" -Oklusolve_arm64.tar.gz -q
9193
tar zxf klusolve_x64.tar.gz
9294
tar zxf klusolve_arm64.tar.gz
95+
mkdir -p dss_capi/lib/darwin_x64
96+
mkdir -p dss_capi/lib/darwin_arm64
9397
cp -r klusolvex/lib/* dss_capi/lib/
9498
- name: Build x64
9599
run: |
@@ -114,7 +118,7 @@ jobs:
114118
name: 'Windows x64'
115119
runs-on: windows-2019
116120
steps:
117-
- uses: actions/checkout@v2
121+
- uses: actions/checkout@v3
118122
with:
119123
fetch-depth: 0
120124
path: 'dss_capi'
@@ -130,6 +134,8 @@ jobs:
130134
run: |
131135
"c:\Program Files\Git\mingw64\bin\curl" -s -L https://github.com/dss-extensions/klusolve/releases/download/1.0.0a1/klusolvex_1.0.0a1_win_x64-gcc8.1.zip -o klusolve_x64.zip
132136
7z x -y -o. klusolve_x64.zip
137+
mkdir dss_capi\lib
138+
mkdir dss_capi\lib\win_x64
133139
xcopy /E klusolvex\lib dss_capi\lib
134140
- name: Build
135141
#TODO? cv2pdb (generate PDB for MSVC) and dlltool (generate lib compatible with GCC)
@@ -152,7 +158,7 @@ jobs:
152158
name: 'Windows x86'
153159
runs-on: windows-2019
154160
steps:
155-
- uses: actions/checkout@v2
161+
- uses: actions/checkout@v3
156162
with:
157163
fetch-depth: 0
158164
path: 'dss_capi'
@@ -166,6 +172,8 @@ jobs:
166172
run: |
167173
"c:\Program Files\Git\mingw64\bin\curl" -s -L https://github.com/dss-extensions/klusolve/releases/download/1.0.0a1/klusolvex_1.0.0a1_win_x86-msvc2017.zip -o klusolve_x86.zip
168174
7z x -y -o. klusolve_x86.zip
175+
mkdir dss_capi\lib
176+
mkdir dss_capi\lib\win_x86
169177
xcopy /E klusolvex\lib dss_capi\lib
170178
- name: Build
171179
#TODO? cv2pdb (generate PDB for MSVC) and dlltool (generate lib compatible with GCC)

build/build_linux_arm32.sh

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
set -e -x
77

8+
mkdir -p lib/linux_arm32/
89
python3 src/classic_to_ctx.py
910

1011
rm -rf build/units_arm32

build/build_linux_arm64.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Tested with a Raspberry Pi 4 Model B
44
set -e -x
55

6+
mkdir -p lib/linux_arm64/
67
python3 src/classic_to_ctx.py
78

89
rm -rf build/units_arm64

build/build_linux_x64.sh

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
set -e -x
44

5+
mkdir -p lib/linux_x64/
56
python3 src/classic_to_ctx.py
67

78
rm -rf build/units_x64

build/build_linux_x86.sh

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
set -e -x
44

5+
mkdir -p lib/linux_x86/
56
python3 src/classic_to_ctx.py
67

78
rm -rf build/units_x86

build/build_macos_arm64.sh

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
set -e -x
44

5+
mkdir -p lib/darwin_arm64/
56
python3 src/classic_to_ctx.py
67

78
export LDFLAGS=-L`pwd`/lib/darwin_arm64/

build/build_macos_x64.sh

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
set -e -x
44

5+
mkdir -p lib/darwin_x64/
56
python3 src/classic_to_ctx.py
67

78
export LDFLAGS=-L`pwd`/lib/darwin_x64/

build/build_win_x64.bat

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@echo off
22
@SETLOCAL
33

4+
mkdir lib\win_x64
45
python src\classic_to_ctx.py
56

67
where /q fpc

build/build_win_x86.bat

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@echo off
22
@SETLOCAL
33

4+
mkdir lib\win_x86
45
python src\classic_to_ctx.py
56

67
where /q fpc

lib/darwin_x64/README

-1
This file was deleted.

lib/linux_arm32/README

-1
This file was deleted.

lib/linux_arm64/README

-1
This file was deleted.

lib/linux_x64/README

-1
This file was deleted.

lib/linux_x86/README

-1
This file was deleted.

lib/win_x64/README

-3
This file was deleted.

lib/win_x86/README

-3
This file was deleted.

0 commit comments

Comments
 (0)