Skip to content

Commit 29f7b08

Browse files
committed
move build stuff to build dir
1 parent 38ed555 commit 29f7b08

65 files changed

Lines changed: 81 additions & 57 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@ jobs:
6161
- name: install deps
6262
run: myci-deb-install-build-deps.sh
6363
- name: build
64-
run: dpkg-buildpackage --unsigned-source --unsigned-changes
64+
run: |
65+
cd build
66+
dpkg-buildpackage --unsigned-source --unsigned-changes
6567
- name: deploy deb packages
6668
run: |
6769
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
68-
myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo cppfw/${{ matrix.os }} --distro ${{ matrix.codename }} --component main ../lib$(cat name.txt)*_${PACKAGE_VERSION}_*.*deb
70+
myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo cppfw/${{ matrix.os }} --distro ${{ matrix.codename }} --component main lib$(cat name.txt)*_${PACKAGE_VERSION}_*.*deb
6971
if: startsWith(github.ref, 'refs/tags/')
7072
##### archlinux #####
7173
# archlinux:
@@ -104,12 +106,12 @@ jobs:
104106
# run: |
105107
# # provide write access to user nobody
106108
# chmod --recursive 777 .
107-
# cd archlinux
109+
# cd build/archlinux
108110
# sudo --user=nobody --preserve-env=PACKAGE_VERSION makepkg --syncdeps --noconfirm --skipinteg --noprogressbar
109111
# - name: deploy
110112
# run: |
111113
# echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
112-
# myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/archlinux/${{ matrix.arch }} --database cppfw archlinux/$PACKAGE_NAME-*.pkg.*
114+
# myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/archlinux/${{ matrix.arch }} --database cppfw build/archlinux/$PACKAGE_NAME-*.pkg.*
113115
# if: startsWith(github.ref, 'refs/tags/')
114116
##### macosx #####
115117
macosx:
@@ -197,7 +199,7 @@ jobs:
197199
- name: deploy
198200
run: |
199201
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
200-
myci-deploy-cocoapods-ssh.sh --repo cppfw --version $PACKAGE_VERSION --server gagis.hopto.org --key repo_key_rsa --generic-repo cppfw/cocoapods --package $PACKAGE_NAME-$PACKAGE_VERSION.zip cocoapods/$PACKAGE_NAME.podspec.in
202+
myci-deploy-cocoapods-ssh.sh --repo cppfw --version $PACKAGE_VERSION --server gagis.hopto.org --key repo_key_rsa --generic-repo cppfw/cocoapods --package $PACKAGE_NAME-$PACKAGE_VERSION.zip build/cocoapods/$PACKAGE_NAME.podspec.in
201203
if: startsWith(github.ref, 'refs/tags/')
202204
##### android #####
203205
android:
@@ -218,12 +220,12 @@ jobs:
218220
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
219221
- name: build
220222
run: |
221-
cd android
223+
cd build/android
222224
./gradlew copy_aar --warning-mode all
223225
myci-apply-version.sh --version $PACKAGE_VERSION *.pom.in
224226
myci-apply-version.sh --version $PACKAGE_VERSION *.aar.in --filename-only
225227
- name: deploy
226-
run: myci-deploy-maven-nexus.sh --base-url https://gagis.hopto.org/nexus --repo android android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
228+
run: myci-deploy-maven-nexus.sh --base-url https://gagis.hopto.org/nexus --repo android build/android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
227229
if: startsWith(github.ref, 'refs/tags/')
228230
##### msys2 #####
229231
msys2:
@@ -265,17 +267,17 @@ jobs:
265267
- name: git clone
266268
uses: myci-actions/checkout@main
267269
- name: prepare pacman package
268-
run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
270+
run: myci-apply-version.sh build/msys2/PKGBUILD.in
269271
- name: build
270272
# to make makepkg-mingw build only one architecture we need to set the MINGW_ARCH
271273
env: {MINGW_ARCH: '${{ matrix.repo }}'}
272274
run: |
273-
cd msys2
275+
cd build/msys2
274276
PKGEXT='.pkg.tar.xz' makepkg-mingw --syncdeps --noconfirm --skipinteg
275277
- name: deploy
276278
run: |
277279
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
278-
for f in $(find msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
280+
for f in $(find build/msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
279281
myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
280282
done
281283
if: startsWith(github.ref, 'refs/tags/')
@@ -439,7 +441,7 @@ jobs:
439441
- name: build
440442
run: |
441443
conan remote add cppfw $MYCI_CONAN_REMOTE
442-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
444+
conan create build/conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
443445
- name: deploy conan package
444446
run: |
445447
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -488,7 +490,7 @@ jobs:
488490
- name: build
489491
run: |
490492
conan remote add cppfw $MYCI_CONAN_REMOTE
491-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
493+
conan create build/conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
492494
- name: deploy conan package
493495
run: |
494496
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -534,9 +536,9 @@ jobs:
534536
run: |
535537
conan remote add cppfw $MYCI_CONAN_REMOTE
536538
# NOTE: specifying empty test folder to skip the test stage
537-
conan create conan --profile:build default --profile:host emscripten/conan.profile --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --test-folder ""
539+
conan create build/conan --profile:build default --profile:host build/emscripten/conan.profile --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --test-folder ""
538540
- name: deploy conan package
539541
run: |
540542
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
541543
conan upload --check --remote cppfw $PACKAGE_NAME/$PACKAGE_VERSION@$MYCI_CONAN_USER/main
542-
if: startsWith(github.ref, 'refs/tags/')
544+
if: startsWith(github.ref, 'refs/tags/')

README.adoc

Lines changed: 1 addition & 1 deletion

android/agg/CMakeLists.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

build/android/agg/CMakeLists.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
cmake_minimum_required(VERSION 3.4.1)
2+
set(name agg)
3+
project(${name})
4+
5+
file(GLOB srcs "../../../src/agg/src/*.cpp")
6+
7+
include(${ANDROID_GRADLE_NATIVE_BUNDLE_PLUGIN_MK})
8+
9+
include_directories(../../../src/agg/include/agg)
10+
11+
add_library(
12+
${name}
13+
STATIC
14+
${srcs}
15+
)
16+
17+
target_link_libraries(
18+
${name}
19+
android log ${ANDROID_GRADLE_NATIVE_MODULES}
20+
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222
}
2323

2424
nativeBundleExport {
25-
headerDir = "${project.projectDir}/../../src/agg/include/"
25+
headerDir = "${project.projectDir}/../../../src/agg/include/"
2626
bundleStatic = true
2727
includeHeaderFilter.add("**/*.h")
2828
excludeHeaderFilter.add("agg/ctrl/**/*.h")

0 commit comments

Comments
 (0)