Skip to content

Commit d8049ee

Browse files
igagisigagis
committed
move build stuff to build dir
1 parent 06a73a3 commit d8049ee

Some content is hidden

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

63 files changed

+123
-85
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,19 @@ jobs:
9999
uses: myci-actions/checkout@main
100100
- name: set PACKAGE_VERSION
101101
uses: myci-actions/export-env-var@main
102-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
102+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
103103
- name: prepare debian package
104104
run: myci-deb-prepare.sh
105105
- name: install deps
106106
run: myci-deb-install-build-deps.sh
107107
- name: build
108-
run: dpkg-buildpackage --unsigned-source --unsigned-changes
108+
run: |
109+
cd build
110+
dpkg-buildpackage --unsigned-source --unsigned-changes
109111
- name: deploy deb packages
110112
run: |
111113
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
112-
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
114+
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
113115
if: startsWith(github.ref, 'refs/tags/')
114116
##### archlinux #####
115117
# archlinux:
@@ -139,7 +141,7 @@ jobs:
139141
# uses: myci-actions/checkout@main
140142
# - name: set PACKAGE_VERSION
141143
# uses: myci-actions/export-env-var@main
142-
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
144+
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
143145
# # makepkg needs to install dependency packages, so nobody user needs sudo rights
144146
# - name: add nobody to sudoers
145147
# run: |
@@ -148,7 +150,7 @@ jobs:
148150
# run: |
149151
# # provide write access to user nobody
150152
# chmod --recursive 777 .
151-
# cd archlinux
153+
# cd build/archlinux
152154
# sudo --user=nobody --preserve-env=PACKAGE_VERSION makepkg --syncdeps --noconfirm --skipinteg --noprogressbar
153155
# - name: deploy
154156
# run: |
@@ -226,7 +228,7 @@ jobs:
226228
uses: myci-actions/checkout@main
227229
- name: set PACKAGE_VERSION
228230
uses: myci-actions/export-env-var@main
229-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
231+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
230232
- name: add cocoapods repo
231233
run: pod repo add --silent cppfw https://[email protected]/cppfw/cocoapods-repo.git
232234
- name: install deps
@@ -248,7 +250,7 @@ jobs:
248250
- name: deploy
249251
run: |
250252
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
251-
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
253+
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
252254
if: startsWith(github.ref, 'refs/tags/')
253255
##### android #####
254256
android:
@@ -266,15 +268,15 @@ jobs:
266268
install: myci
267269
- name: set PACKAGE_VERSION
268270
uses: myci-actions/export-env-var@main
269-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
271+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
270272
- name: build
271273
run: |
272-
cd android
274+
cd build/android
273275
./gradlew copy_aar --warning-mode all
274276
myci-apply-version.sh --version $PACKAGE_VERSION *.pom.in
275277
myci-apply-version.sh --version $PACKAGE_VERSION *.aar.in --filename-only
276278
- name: deploy
277-
run: myci-deploy-maven-nexus.sh --base-url https://gagis.hopto.org/nexus --repo android android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
279+
run: myci-deploy-maven-nexus.sh --base-url https://gagis.hopto.org/nexus --repo android build/android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
278280
if: startsWith(github.ref, 'refs/tags/')
279281
##### msys2 #####
280282
msys2:
@@ -316,17 +318,17 @@ jobs:
316318
- name: git clone
317319
uses: myci-actions/checkout@main
318320
- name: prepare pacman package
319-
run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
321+
run: myci-apply-version.sh --version $(myci-deb-version.sh) build/msys2/PKGBUILD.in
320322
- name: build
321323
# to make makepkg-mingw build only one architecture we need to set the MINGW_INSTALLS
322324
env: {MINGW_ARCH: '${{ matrix.repo }}'}
323325
run: |
324-
cd msys2
326+
cd build/msys2
325327
PKGEXT='.pkg.tar.xz' makepkg-mingw --syncdeps --noconfirm --skipinteg
326328
- name: deploy
327329
run: |
328330
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
329-
for f in $(find msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
331+
for f in $(find build/msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
330332
myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
331333
done
332334
if: startsWith(github.ref, 'refs/tags/')
@@ -492,12 +494,12 @@ jobs:
492494
submodules: false
493495
- name: set PACKAGE_VERSION
494496
uses: myci-actions/export-env-var@main
495-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
497+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
496498
if: startsWith(github.ref, 'refs/tags/')
497499
- name: build
498500
run: |
499501
conan remote add cppfw $MYCI_CONAN_REMOTE
500-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
502+
conan create build/conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
501503
- name: deploy conan package
502504
run: |
503505
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -548,12 +550,12 @@ jobs:
548550
sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
549551
- name: set PACKAGE_VERSION
550552
uses: myci-actions/export-env-var@main
551-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
553+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
552554
if: startsWith(github.ref, 'refs/tags/')
553555
- name: build
554556
run: |
555557
conan remote add cppfw $MYCI_CONAN_REMOTE
556-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
558+
conan create build/conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
557559
- name: deploy conan package
558560
run: |
559561
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -593,13 +595,13 @@ jobs:
593595
submodules: false
594596
- name: set PACKAGE_VERSION
595597
uses: myci-actions/export-env-var@main
596-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
598+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
597599
if: startsWith(github.ref, 'refs/tags/')
598600
- name: build
599601
run: |
600602
conan remote add cppfw $MYCI_CONAN_REMOTE
601603
# NOTE: specifying empty test folder to skip the test stage
602-
conan create conan --profile:build default --profile:host emscripten/conan.profile --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --test-folder ""
604+
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 ""
603605
- name: deploy conan package
604606
run: |
605607
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER

‎android/papki/CMakeLists.txt‎

Lines changed: 0 additions & 37 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/cpp/native-lib.cpp‎ renamed to ‎build/android/app/src/main/cpp/native-lib.cpp‎

File renamed without changes.

‎android/app/src/main/java/org/cppfw/papki/MainActivity.java‎ renamed to ‎build/android/app/src/main/java/org/cppfw/papki/MainActivity.java‎

File renamed without changes.

0 commit comments

Comments
 (0)