X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=DEVELOP.md;h=c89fe160147994aa1d525ce06da05e9a86169bb3;hp=78231b89e72a5b9fd91688477baab88a2906e498;hb=HEAD;hpb=abcd6c9182507e6336a1839661dac856d5bea553

diff --git a/DEVELOP.md b/DEVELOP.md
index 78231b89e..51b63ff5c 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -4,12 +4,42 @@ This file collects a few notes relevant to DCP-o-matic developers.  There is als
 [on the web site](https://dcpomatic.com/development).
 
 
+## Building on macOS/arm64
+
+Build `osx-environment` in `$HOME`
+```
+bash platform/osx/copy_resources.sh
+source platform/osx/set_paths.sh
+./waf configure --target-macos-arm64
+```
+
+
+## Disk writer logging
+
+As we have no `film' folder to log to during disk writes, the logs end up:
+
+### macOS
+
+* Disk writer backend: `/var/log/dcpomatic_disk_writer_{out,err}.log`
+* Disk writer frontend: `/Users/$USER/Library/Preferences/com.dcpomatic/2/2.16/disk.log`
+
+### Windows
+
+* Disk writer backend: `c:\Users\$USER\AppData\Local\dcpomatic\2.16.0\disk_writer.log`
+* Disk writer frontend: `c:\Users\$USER\AppData\Local\dcpomatic\2.16.0\disk.log`
+
+### Linux
+
+* Disk writer backend: `/home/$USER/.config/dcpomatic/2.16.0/disk_writer.log`
+* Disk writer frontend: `/home/$USER/.config/dcpomatic/2.16.0/disk.log`
+
+
 ## Branches
 
 The main dcpomatic repo has the following branches:
 
 * `main` - the main development branch; contains 2.16.x versions
-* `v2.17.x` - development branch for v2.17.x versions; periodically rebased onto `main`
+* `v2.17.x` - development branch for v2.17.x versions; `main` is merged into this branch.
 
 The `test/data` submodule has the following branches:
 
@@ -71,7 +101,7 @@ to load a script file called `stress` and start executing it.
 - ./waf pot
 - cp build/src/lib/libdcpomatic.pot src/lib/po/$LANG.po
 - cp build/src/wx/libdcpomatic-wx.pot src/wx/po/$LANG.po
-- cp build/src/tools/libdcpomatic-wx.pot src/tools/po/$LANG.po
+- cp build/src/tools/dcpomatic.pot src/tools/po/$LANG.po
 - sed -i "s/CHARSET/UTF-8/" src/{lib,wx,tools}/po/$LANG.po
 - Commit / push
 - Add credit to `src/wx/about_dialog.cc` and database.