Skip to content

Commit 620f1f3

Browse files
igagisigagis
committed
mode build stuff to build dir
1 parent b64bbdb commit 620f1f3

59 files changed

Lines changed: 160 additions & 123 deletions

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: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -151,17 +151,19 @@ jobs:
151151
uses: myci-actions/checkout@main
152152
- name: set PACKAGE_VERSION
153153
uses: myci-actions/export-env-var@main
154-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
154+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
155155
- name: prepare debian package
156156
run: myci-deb-prepare.sh
157157
- name: install deps
158158
run: myci-deb-install-build-deps.sh
159159
- name: build
160-
run: dpkg-buildpackage --unsigned-source --unsigned-changes
160+
run: |
161+
cd build
162+
dpkg-buildpackage --unsigned-source --unsigned-changes
161163
- name: deploy deb packages
162164
run: |
163165
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
164-
myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo cppfw/${{ matrix.os }} --distro ${{ matrix.codename }} --component main ../lib${PACKAGE_NAME}*_${PACKAGE_VERSION}_*.*deb
166+
myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo cppfw/${{ matrix.os }} --distro ${{ matrix.codename }} --component main lib${PACKAGE_NAME}*_${PACKAGE_VERSION}_*.*deb
165167
if: startsWith(github.ref, 'refs/tags/')
166168
##### archlinux #####
167169
# archlinux:
@@ -191,7 +193,7 @@ jobs:
191193
# uses: myci-actions/checkout@main
192194
# - name: set PACKAGE_VERSION
193195
# uses: myci-actions/export-env-var@main
194-
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
196+
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
195197
# # makepkg needs to install dependency packages, so nobody user needs sudo rights
196198
# - name: add nobody to sudoers
197199
# run: |
@@ -200,12 +202,12 @@ jobs:
200202
# run: |
201203
# # provide write access to user nobody
202204
# chmod --recursive 777 .
203-
# cd archlinux
205+
# cd build/archlinux
204206
# sudo --user=nobody --preserve-env=PACKAGE_VERSION makepkg --syncdeps --noconfirm --skipinteg --noprogressbar
205207
# - name: deploy
206208
# run: |
207209
# echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
208-
# myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/archlinux/${{ matrix.arch }} --database cppfw archlinux/$PACKAGE_NAME-*.pkg.*
210+
# 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.*
209211
# if: startsWith(github.ref, 'refs/tags/')
210212
##### macosx #####
211213
macosx:
@@ -278,7 +280,7 @@ jobs:
278280
uses: myci-actions/checkout@main
279281
- name: set PACKAGE_VERSION
280282
uses: myci-actions/export-env-var@main
281-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
283+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
282284
- name: add cocoapods repo
283285
run: pod repo add --silent cppfw https://$MYCI_GIT_USERNAME@github.com/cppfw/cocoapods-repo.git
284286
- name: install deps
@@ -300,7 +302,7 @@ jobs:
300302
- name: deploy
301303
run: |
302304
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
303-
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
305+
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
304306
if: startsWith(github.ref, 'refs/tags/')
305307
##### android #####
306308
android:
@@ -318,15 +320,15 @@ jobs:
318320
install: myci
319321
- name: set PACKAGE_VERSION
320322
uses: myci-actions/export-env-var@main
321-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
323+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
322324
- name: build
323325
run: |
324-
cd android
326+
cd build/android
325327
./gradlew copy_aar --warning-mode all
326328
myci-apply-version.sh --version $PACKAGE_VERSION *.pom.in
327329
myci-apply-version.sh --version $PACKAGE_VERSION *.aar.in --filename-only
328330
- name: deploy
329-
run: myci-deploy-maven-nexus.sh --base-url https://gagis.hopto.org/nexus --repo android android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
331+
run: myci-deploy-maven-nexus.sh --base-url https://gagis.hopto.org/nexus --repo android build/android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
330332
if: startsWith(github.ref, 'refs/tags/')
331333
##### msys2 #####
332334
msys2:
@@ -368,17 +370,17 @@ jobs:
368370
- name: git clone
369371
uses: myci-actions/checkout@main
370372
- name: prepare pacman package
371-
run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
373+
run: myci-apply-version.sh build/msys2/PKGBUILD.in
372374
- name: build
373375
# to make makepkg-mingw build only one architecture we need to set the MINGW_ARCH
374376
env: {MINGW_ARCH: '${{ matrix.repo }}'}
375377
run: |
376-
cd msys2
378+
cd build/msys2
377379
PKGEXT='.pkg.tar.xz' makepkg-mingw --syncdeps --noconfirm --skipinteg
378380
- name: deploy
379381
run: |
380382
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
381-
for f in $(find msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
383+
for f in $(find build/msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
382384
myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
383385
done
384386
if: startsWith(github.ref, 'refs/tags/')
@@ -542,12 +544,12 @@ jobs:
542544
uses: myci-actions/checkout@main
543545
- name: set PACKAGE_VERSION
544546
uses: myci-actions/export-env-var@main
545-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
547+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
546548
if: startsWith(github.ref, 'refs/tags/')
547549
- name: build
548550
run: |
549551
conan remote add cppfw $MYCI_CONAN_REMOTE
550-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
552+
conan create build/conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
551553
- name: deploy conan package
552554
run: |
553555
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -595,12 +597,12 @@ jobs:
595597
sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
596598
- name: set PACKAGE_VERSION
597599
uses: myci-actions/export-env-var@main
598-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
600+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
599601
if: startsWith(github.ref, 'refs/tags/')
600602
- name: build
601603
run: |
602604
conan remote add cppfw $MYCI_CONAN_REMOTE
603-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
605+
conan create build/conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
604606
- name: deploy conan package
605607
run: |
606608
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -641,13 +643,13 @@ jobs:
641643
submodules: false
642644
- name: set PACKAGE_VERSION
643645
uses: myci-actions/export-env-var@main
644-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
646+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
645647
if: startsWith(github.ref, 'refs/tags/')
646648
- name: build
647649
run: |
648650
conan remote add cppfw $MYCI_CONAN_REMOTE
649651
# NOTE: specifying empty test folder to skip the test stage
650-
conan create conan --profile:build default --profile:host emscripten/conan.profile --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --test-folder ""
652+
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 ""
651653
- name: deploy conan package
652654
run: |
653655
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER

‎android/r4/CMakeLists.txt‎

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

android/.gitignore renamed to build/android/.gitignore

File renamed without changes.

android/app/.gitignore renamed to build/android/app/.gitignore

File renamed without changes.

android/app/CMakeLists.txt renamed to build/android/app/CMakeLists.txt

File renamed without changes.

android/app/build.gradle renamed to build/android/app/build.gradle

File renamed without changes.

android/app/proguard-rules.pro renamed to build/android/app/proguard-rules.pro

File renamed without changes.

android/app/src/main/AndroidManifest.xml renamed to build/android/app/src/main/AndroidManifest.xml

File renamed without changes.

android/app/src/main/res/mipmap-hdpi/ic_launcher.png renamed to build/android/app/src/main/res/mipmap-hdpi/ic_launcher.png

File renamed without changes.

android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png renamed to build/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png

File renamed without changes.

0 commit comments

Comments
 (0)