diff --git a/.gitignore b/.gitignore index b14111e..0261ce8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ publish build builds compilers +artifacts bin *.db *.crvm diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml index 9be38ac..a22ae81 100644 --- a/.onedev-buildspec.yml +++ b/.onedev-buildspec.yml @@ -48,6 +48,7 @@ jobs: image: onedev.site.tesses.net/dependencies/debbuilder/plucky:latest interpreter: !DefaultInterpreter commands: | + mkdir artifacts apt update -y apt install -y pkg-config git gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 gcc-mingw-w64-i686 g++-mingw-w64-i686 nsis cd Packaging/Linux @@ -68,7 +69,6 @@ jobs: image: onedev.site.tesses.net/dependencies/debbuilder/jammy:latest interpreter: !DefaultInterpreter commands: | - mkdir artifacts apt update -y apt install -y pkg-config git cd Packaging/Linux diff --git a/Packaging/Windows/build.sh b/Packaging/Windows/build.sh index a948216..6996ed5 100644 --- a/Packaging/Windows/build.sh +++ b/Packaging/Windows/build.sh @@ -4,13 +4,13 @@ cd build-x86 make -j`nproc` cpack -G NSIS cpack -G ZIP -cp TessesCrossLang-*-win32.exe ../../../artifacts/crosslang-win32.exe -cp TessesCrossLang-*-win32.zip ../../../artifacts/crosslang-win32.zip +mv TessesCrossLang-*-win32.exe ../../../artifacts/crosslang-win32.exe +mv TessesCrossLang-*-win32.zip ../../../artifacts/crosslang-win32.zip cd .. cmake -S ../.. -B build-x64 -DCMAKE_TOOLCHAIN_FILE=`pwd`/WindowsToolchains/x64.cmake -DTESSESFRAMEWORK_FETCHCONTENT=ON -DTESSESFRAMEWORK_ENABLE_APPS=OFF -DTESSESFRAMEWORK_ENABLE_EXAMPLES=OFF -DTESSESFRAMEWORK_ENABLE_STATIC=ON -DTESSESFRAMEWORK_ENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=tmp-x64 cd build-x64 make -j`nproc` cpack -G NSIS cpack -G ZIP -cp TessesCrossLang-*-win64.exe ../../../artifacts/crosslang-win64.exe -cp TessesCrossLang-*-win64.zip ../../../artifacts/crosslang-win64.zip +mv TessesCrossLang-*-win64.exe ../../../artifacts/crosslang-win64.exe +mv TessesCrossLang-*-win64.zip ../../../artifacts/crosslang-win64.zip