Fix(Make) - Fixed the makefile for windows
This commit is contained in:
parent
021d42c2fd
commit
b15d971c75
|
|
@ -553,7 +553,7 @@ checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
|
|||
|
||||
[[package]]
|
||||
name = "xiv_craft_solver"
|
||||
version = "0.1.3"
|
||||
version = "0.1.4"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"lazy_static",
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ dependencies = ["remove_tmp"]
|
|||
|
||||
[tasks.remove_tmp]
|
||||
script_runner = "@shell"
|
||||
ignore_errors = true
|
||||
script = '''
|
||||
rm -rf releases
|
||||
rm -rf python/build
|
||||
|
|
@ -37,6 +38,10 @@ script = '''
|
|||
'''
|
||||
|
||||
[tasks.zip]
|
||||
windows_alias = 'zip_win'
|
||||
linux_alias = 'zip_linux'
|
||||
|
||||
[tasks.zip_linux]
|
||||
script_runner = "@shell"
|
||||
script = '''
|
||||
mkdir -p releases # Add version as an arg and things
|
||||
|
|
@ -45,8 +50,18 @@ script = '''
|
|||
cd python/dist/ && zip -q ../../releases/ffcraft_solver_gui.zip -r ffcraft_solver_gui/
|
||||
'''
|
||||
|
||||
[tasks.zip_win]
|
||||
script_runner = "@shell"
|
||||
script = '''
|
||||
mkdir -p releases # Add version as an arg and things
|
||||
cp target/wheels/*.whl releases/
|
||||
tar acvf releases/ff_craft_solver_cli_win.zip .\craft.toml -C .\target\release\ ffcraft_solver_cli.exe libxiv_craft_solver.d
|
||||
tar acvf releases/ff_craft_solver_gui_win.zip -C .\python\dist\ .\ffcraft_solver_gui_win\*
|
||||
'''
|
||||
|
||||
[tasks.pip]
|
||||
script_runner = "@shell"
|
||||
ignore_errors = true
|
||||
script = '''
|
||||
cd python
|
||||
rm -rf build dist
|
||||
|
|
@ -63,14 +78,13 @@ linux_alias = "linux_pyinstaller"
|
|||
script_runner = "@shell"
|
||||
script = '''
|
||||
cd python
|
||||
pyinstaller src/ffcraft_solver/__main__.py -i "src/ffcraft_solver/ressources/ffcraft_solver.ico" --add-data "src/ffcraft_solver/configs/:ffcraft_solver/configs" --add-data "src/ffcraft_solver/ressources/:ffcraft_solver/ressources" --name ffcraft_solver_gui -y > /dev/null
|
||||
pyinstaller src/ffcraft_solver/__main__.py -i "src/ffcraft_solver/ressources/ffcraft_solver.ico" --add-data "src/ffcraft_solver/configs/:ffcraft_solver/configs" --add-data "src/ffcraft_solver/ressources/:ffcraft_solver/ressources" --name ffcraft_solver_gui_linux -y
|
||||
'''
|
||||
|
||||
[tasks.windows_pyinstaller]
|
||||
script_runner = "@shell"
|
||||
script = '''
|
||||
cd python
|
||||
pyinstaller src/ffcraft_solver/__main__.py -i "src/ffcraft_solver/ressources/ffcraft_solver.ico" --add-data "src/ffcraft_solver/configs/;ffcraft_solver/configs" --add-data "src/ffcraft_solver/ressources/;ffcraft_solver/ressources" --name ffcraft_solver_gui -y > /dev/null 2>pyinstaller_log.txt
|
||||
cd python && pyinstaller src\ffcraft_solver\__main__.py --add-data "src\ffcraft_solver\configs\;ffcraft_solver\configs" --add-data "src\ffcraft_solver\ressources\;ffcraft_solver\ressources" --name ffcraft_solver_gui_win -y
|
||||
'''
|
||||
|
||||
[tasks.build]
|
||||
|
|
|
|||
27
makefile
27
makefile
|
|
@ -1,27 +0,0 @@
|
|||
clean:
|
||||
@echo "[MAKE] Cleaning last release"
|
||||
cargo clean
|
||||
rm -rf releases
|
||||
rm -rf python/build
|
||||
rm -rf python/dist
|
||||
|
||||
rust:
|
||||
@echo "[MAKE] Building the libraries"
|
||||
maturin develop --release -q
|
||||
cargo build --release -q # --features="no_python"
|
||||
|
||||
python:
|
||||
@echo "[MAKE] Building the python project"
|
||||
cd python && rm -rf build dist
|
||||
cd python && pip install -q -r requirements_dev.txt
|
||||
cd python && pip install -q -e .
|
||||
cd python && pyinstaller src/ffcraft_solver/__main__.py -i "src/ffcraft_solver/ressources/ffcraft_solver.ico" --add-data "src/ffcraft_solver/configs/:ffcraft_solver/configs" --add-data "src/ffcraft_solver/ressources/:ffcraft_solver/ressources" --name ffcraft_solver_gui -y > /dev/null 2>pyinstaller_log.txt
|
||||
|
||||
|
||||
|
||||
.PHONY: clean rust python
|
||||
release: clean rust python
|
||||
mkdir -p releases # Add version as an arg and things
|
||||
@echo "[MAKE] Copying releases in the releases/ directory"
|
||||
zip releases/ffcraft_solver_cli.zip -q -j target/release/ffcraft_solver_cli craft.toml -j target/release/libxiv_craft_solver.so
|
||||
cd python/dist/ && zip -q ../../releases/ffcraft_solver_gui.zip -r ffcraft_solver_gui/
|
||||
Reference in New Issue