diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 8139bf2..67036b1 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4 - run: make - name: Package tar.xz archive - run: tar -cf - -C ${GITHUB_WORKSPACE}/PathOfBuilding $(ls -A ${GITHUB_WORKSPACE}"/PathOfBuilding") | xz -c > PathOfBuilding.linux.amd64.tar.xz + run: tar -cf - -C ${GITHUB_WORKSPACE}/PathOfBuilding $(ls -A ${GITHUB_WORKSPACE}"/linux") | xz -c > PathOfBuilding.linux.amd64.tar.xz - name: Cheking GUI env: IMGUR_CLIENT_ID: ${{ secrets.IMGUR_CLIENT_ID }} diff --git a/Makefile b/Makefile index f86519f..159b118 100644 --- a/Makefile +++ b/Makefile @@ -20,8 +20,9 @@ Darwin: pob Linux: pob meson setup --buildtype=release build + meson setup --buildtype=release --prefix=${DIR}/linux build meson compile -C build - mv build/PathOfBuilding PathOfBuilding/ + meson install -C build echo "Finished $(OS_NAME)" pob: clear tools_$(OS_NAME) load_pob luacurl diff --git a/meson.build b/meson.build index 9aba4f5..276afef 100644 --- a/meson.build +++ b/meson.build @@ -2,6 +2,8 @@ project('POB Frontend', 'cpp', default_options : ['cpp_std=c++17']) qt5_dep = dependency('qt5', modules : ['Gui','Core','Widgets']) lua_dep = dependency('luajit') +zlib_dep = dependency('zlib') + # NB on OSX you also need to invoke meson like so, because luajit: # LDFLAGS="-pagezero_size 10000 -image_base 100000000" meson pobfrontend build if build_machine.system() == 'darwin' @@ -10,7 +12,7 @@ if build_machine.system() == 'darwin' else gl_dep = dependency('gl') endif -zlib_dep = dependency('zlib') + # Import the extension module that knows how # to invoke Qt tools. @@ -29,11 +31,34 @@ else install : true) endif +exclude_dir = [ + '.github', + 'docs', + 'runtime', + 'tests', +] + +exclude_file = [ + 'runtime-win32.zip', + '.busted', + '.gitattributes', + '.gitignore', +] + if build_machine.system() == 'darwin' install_data('pobLogo.icns', install_dir : 'Contents/Resources') install_data('Info.plist', install_dir : 'Contents') install_data('pobWrapper.sh', install_dir : 'Contents/MacOS') - install_subdir('PathOfBuilding', install_dir : 'Contents/MacOS', strip_directory : true) + install_subdir('PathOfBuilding', install_dir : 'Contents/MacOS', + exclude_directories: exclude_dir, + exclude_files: exclude_file, + strip_directory : true) install_subdir('Frameworks', install_dir: 'Contents') meson.add_install_script('bash', '-xc', 'cd ${MESON_INSTALL_PREFIX}/Contents && dylibbundler --overwrite-dir --create-dir --bundle-deps --fix-file MacOS/lcurl.so') +else + install_data('pobWrapper.sh') + install_subdir('PathOfBuilding', + exclude_directories: exclude_dir, + exclude_files: exclude_file, + strip_directory : true) endif