langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
00cf4fc585
anki/rspy/Makefile

99 lines
2.4 KiB
Makefile
Raw Normal View History

Fixed development compilation with Windows 10 1. Documented on README.development how to setup the environment for Windows. 2. Fixed qt/ts/package.json not working due usage of ; instead of && 3. Fixed copy-qt-files rsync using Windows paths instead of Unix ones 4. Fixed Makefile's using Windows Linux Subsystem bash instead of the Cygwin one. 5. Ensured running the correct pip module by using python -m pip instead of just pip. 6. Fixed Makefiles using Windows `find` command, instead of the Cygwin's one (POSIX find). 7. Fixed pyenv sourcing/activate using /pyevn/bin/ instead of /python/Scripts/ on Windows. 8. Fixed pyaudio not installing/linking with portaudio on Windows by installing for a patched fork at evandroforks/pyaudio 9. Forked and fixed portaudio not building with Visual Studio 2017 or superior and added the reference for the patched fork on README.development at evandroforks/portaudio.
2020-02-24 18:58:07 +01:00
SHELL := /bin/bash
Created the .github/workflows/windows.yml # Conflicts: # .github/scripts/trailing-newlines.sh # Makefile # qt/tools/typecheck-setup.sh # react/Makefile # rspy/Makefile # svelte/Makefile # tslib/Makefile
2020-03-22 19:52:56 +01:00
ifndef SHELLFLAGS
SHELLFLAGS :=
endif
.SHELLFLAGS := -eu -o pipefail ${SHELLFLAGS} -c
MAKEFLAGS += --warn-undefined-variables
MAKEFLAGS += --no-builtin-rules
Renamed FIND_EXEC to FIND, replaced IS_WINDOWS by specific commands as PYTHON_BIN, ACTIVE_SCRIPT and INSTALL_PYAUDIO. Fixed echo statements not using @ to suppress double message output. Deprecated the usage of ECHOCMD := /bin/echo -e because it has no effect: https://stackoverflow.com/questions/60387684/how-to-make-the-makefile-echos-to-use-bin-echo-e # Conflicts: # Makefile
2020-02-25 06:32:17 +01:00
FIND := $(if $(wildcard /bin/find),/bin/find,/usr/bin/find)
Fixed development compilation with Windows 10 1. Documented on README.development how to setup the environment for Windows. 2. Fixed qt/ts/package.json not working due usage of ; instead of && 3. Fixed copy-qt-files rsync using Windows paths instead of Unix ones 4. Fixed Makefile's using Windows Linux Subsystem bash instead of the Cygwin one. 5. Ensured running the correct pip module by using python -m pip instead of just pip. 6. Fixed Makefiles using Windows `find` command, instead of the Cygwin's one (POSIX find). 7. Fixed pyenv sourcing/activate using /pyevn/bin/ instead of /python/Scripts/ on Windows. 8. Fixed pyaudio not installing/linking with portaudio on Windows by installing for a patched fork at evandroforks/pyaudio 9. Forked and fixed portaudio not building with Visual Studio 2017 or superior and added the reference for the patched fork on README.development at evandroforks/portaudio.
2020-02-24 18:58:07 +01:00
Fixed "Makefile:4: warning: undefined variable 'OS'" due the usage of MAKEFLAGS += --warn-undefined-variables
2020-03-04 00:51:24 +01:00
ifndef OS
OS := unknown
endif
Created the .github/workflows/windows.yml # Conflicts: # .github/scripts/trailing-newlines.sh # Makefile # qt/tools/typecheck-setup.sh # react/Makefile # rspy/Makefile # svelte/Makefile # tslib/Makefile
2020-03-22 19:52:56 +01:00
ifeq (${OS},Windows_NT)
ifndef PYTHON_FILE
PYTHON_FILE := $(shell which python)
USE_CYGPATH_COMMAND := case "$$(uname -s)" in CYGWIN*|MINGW*|MSYS*) printf "yes";; esac;
USE_CYGPATH := $(shell ${USE_CYGPATH_COMMAND})
ifneq (,${USE_CYGPATH})
PYTHON_FILE := $(shell cygpath -w "${PYTHON_FILE}")
endif
Allow to define a externally PYTHON_BIN and ACTIVATE_SCRIPT
2020-03-02 00:49:45 +01:00
endif
Fixed rspy/Makefile trying to use python3 on Windows
2020-03-01 17:18:30 +01:00
else
Created the .github/workflows/windows.yml # Conflicts: # .github/scripts/trailing-newlines.sh # Makefile # qt/tools/typecheck-setup.sh # react/Makefile # rspy/Makefile # svelte/Makefile # tslib/Makefile
2020-03-22 19:52:56 +01:00
ifndef PYTHON_FILE
PYTHON_FILE := $(shell which python3)
Allow to define a externally PYTHON_BIN and ACTIVATE_SCRIPT
2020-03-02 00:49:45 +01:00
endif
Fixed rspy/Makefile trying to use python3 on Windows
2020-03-01 17:18:30 +01:00
endif
move the separate components back into this monorepo Earlier today I pushed a change that split this code up into multiple repos, but that has proved to complicate things too much. So we're back to a single repo, except the individual submodules are better separated than they were before. The README files need updating again; I will push them out soon. Aside from splitting out the different modules, the sound code has moved from from anki to aqt.
2020-01-02 10:43:19 +01:00
.DELETE_ON_ERROR:
output into dist/
2020-01-03 05:32:26 +01:00
$(shell mkdir -p .build ../dist)
move the separate components back into this monorepo Earlier today I pushed a change that split this code up into multiple repos, but that has proved to complicate things too much. So we're back to a single repo, except the individual submodules are better separated than they were before. The README files need updating again; I will push them out soon. Aside from splitting out the different modules, the sound code has moved from from anki to aqt.
2020-01-02 10:43:19 +01:00
output into dist/
2020-01-03 05:32:26 +01:00
OUTDIR := ../dist
move the separate components back into this monorepo Earlier today I pushed a change that split this code up into multiple repos, but that has proved to complicate things too much. So we're back to a single repo, except the individual submodules are better separated than they were before. The README files need updating again; I will push them out soon. Aside from splitting out the different modules, the sound code has moved from from anki to aqt.
2020-01-02 10:43:19 +01:00
BUILDFLAGS := --release --strip
add DEVFLAGS for performance testing
2020-03-06 00:33:53 +01:00
DEVFLAGS :=
allow setting specific target dir for rspy when using CARGO_TARGET_DIR to define a common build location on macOS, maturin forces a rebuild every time as the link args for the Python lib don't match those used when building the tests
2020-02-24 12:22:02 +01:00
RSPY_TARGET_DIR ?= target
move the separate components back into this monorepo Earlier today I pushed a change that split this code up into multiple repos, but that has proved to complicate things too much. So we're back to a single repo, except the individual submodules are better separated than they were before. The README files need updating again; I will push them out soon. Aside from splitting out the different modules, the sound code has moved from from anki to aqt.
2020-01-02 10:43:19 +01:00
add support for embedding the qt translations
2020-02-27 11:38:34 +01:00
QT_FTL_TEMPLATES := ../qt/ftl
QT_FTL_LOCALES := ../qt/ftl/repo/desktop
support aqt-specific FTL files
2020-02-23 09:00:13 +01:00
move the separate components back into this monorepo Earlier today I pushed a change that split this code up into multiple repos, but that has proved to complicate things too much. So we're back to a single repo, except the individual submodules are better separated than they were before. The README files need updating again; I will push them out soon. Aside from splitting out the different modules, the sound code has moved from from anki to aqt.
2020-01-02 10:43:19 +01:00
.PHONY: all develop build check fix clean
all: develop
support aqt-specific FTL files
2020-02-23 09:00:13 +01:00
develop: .build/develop
add support for embedding the qt translations
2020-02-27 11:38:34 +01:00
DEPS := .build/tools .build/vernum ../meta/buildhash \
$(wildcard $(QT_FTL_TEMPLATES)/*.ftl) \
$(wildcard $(QT_FTL_LOCALES)/*/*.ftl) \
Fixed make clean rule not working on Windows
2020-04-26 08:02:02 +02:00
$(shell "${FIND}" ../rslib/src -name '*.rs') $(wildcard ../proto/*) \
$(shell "${FIND}" ../rslib/ftl -type f) \
$(shell "${FIND}" ./src -type f)
make sure rslib changes trigger rspy rebuild
2020-02-24 10:02:12 +01:00
.build/develop: $(DEPS)
support aqt-specific FTL files
2020-02-23 09:00:13 +01:00
touch ../proto/backend.proto
add support for embedding the qt translations
2020-02-27 11:38:34 +01:00
FTL_TEMPLATE_DIRS="$(QT_FTL_TEMPLATES)" FTL_LOCALE_DIRS="$(QT_FTL_LOCALES)" \
add DEVFLAGS for performance testing
2020-03-06 00:33:53 +01:00
CARGO_TARGET_DIR="$(RSPY_TARGET_DIR)" maturin develop $(DEVFLAGS)
support aqt-specific FTL files
2020-02-23 09:00:13 +01:00
touch $@
move the separate components back into this monorepo Earlier today I pushed a change that split this code up into multiple repos, but that has proved to complicate things too much. So we're back to a single repo, except the individual submodules are better separated than they were before. The README files need updating again; I will push them out soon. Aside from splitting out the different modules, the sound code has moved from from anki to aqt.
2020-01-02 10:43:19 +01:00
avoid unnecessary work in 'make build'
2020-04-07 02:56:41 +02:00
build: .build/build
.build/build: $(DEPS)
support aqt-specific FTL files
2020-02-23 09:00:13 +01:00
touch ../proto/backend.proto
add support for embedding the qt translations
2020-02-27 11:38:34 +01:00
FTL_TEMPLATE_DIRS="$(QT_FTL_TEMPLATES)" FTL_LOCALE_DIRS="$(QT_FTL_LOCALES)" \
use same cargo rspy target dir for wheel build
2020-04-25 02:08:24 +02:00
CARGO_TARGET_DIR="$(RSPY_TARGET_DIR)" maturin build -i "${PYTHON_FILE}" -o "$(OUTDIR)" $(BUILDFLAGS)
avoid unnecessary work in 'make build'
2020-04-07 02:56:41 +02:00
touch $@
move the separate components back into this monorepo Earlier today I pushed a change that split this code up into multiple repos, but that has proved to complicate things too much. So we're back to a single repo, except the individual submodules are better separated than they were before. The README files need updating again; I will push them out soon. Aside from splitting out the different modules, the sound code has moved from from anki to aqt.
2020-01-02 10:43:19 +01:00
check: .build/check
fix:
cargo fmt
clean:
rm -rf .build target
# nightly currently required for ignoring files in rustfmt.toml
RUST_TOOLCHAIN := $(shell cat rust-toolchain)
.build/tools: requirements.txt rust-toolchain
Fixed development compilation with Windows 10 1. Documented on README.development how to setup the environment for Windows. 2. Fixed qt/ts/package.json not working due usage of ; instead of && 3. Fixed copy-qt-files rsync using Windows paths instead of Unix ones 4. Fixed Makefile's using Windows Linux Subsystem bash instead of the Cygwin one. 5. Ensured running the correct pip module by using python -m pip instead of just pip. 6. Fixed Makefiles using Windows `find` command, instead of the Cygwin's one (POSIX find). 7. Fixed pyenv sourcing/activate using /pyevn/bin/ instead of /python/Scripts/ on Windows. 8. Fixed pyaudio not installing/linking with portaudio on Windows by installing for a patched fork at evandroforks/pyaudio 9. Forked and fixed portaudio not building with Visual Studio 2017 or superior and added the reference for the patched fork on README.development at evandroforks/portaudio.
2020-02-24 18:58:07 +01:00
python -m pip install -r requirements.txt
move the separate components back into this monorepo Earlier today I pushed a change that split this code up into multiple repos, but that has proved to complicate things too much. So we're back to a single repo, except the individual submodules are better separated than they were before. The README files need updating again; I will push them out soon. Aside from splitting out the different modules, the sound code has moved from from anki to aqt.
2020-01-02 10:43:19 +01:00
rustup toolchain install $(RUST_TOOLCHAIN)
rustup component add rustfmt-preview --toolchain $(RUST_TOOLCHAIN)
rustup component add clippy-preview --toolchain $(RUST_TOOLCHAIN)
@touch $@
.build/check: build
cargo fmt -- --check
cargo clippy -- -D warnings
@touch $@
use proper version number in build outputs
2020-01-03 05:36:14 +01:00
VER := $(shell cat ../meta/version)
.build/vernum: ../meta/version
Created the GitHub Actions step Upload to PyPi to run only on tagged releases of anki: https://anki.tenderapp.com/discussions/ankidesktop/40025-anki-in-python-package-index
2020-04-02 04:01:48 +02:00
sed -i.bak 's/.*automatically updated.*/version = "$(VER)" # automatically updated/' Cargo.toml
BSD wants -i '', GNU wants -i''
2020-01-03 07:02:06 +01:00
rm Cargo.toml.bak
use proper version number in build outputs
2020-01-03 05:36:14 +01:00
@touch $@
Reference in New Issue Copy Permalink