Skip to content

Commit

Permalink
Build - rename and tidy qt build scripts
Browse files Browse the repository at this point in the history
We are moving to using cmake as the primary build system.

Move the many old (and often incomplete) build script into an `old` directory. The aim is to delete this directory at some point in the future. However, these scripts may have some useful information at this stage and should only be deleted when the new approach works on all platforms and is fully documented.

Also rename the windows scripts to have a `win-` prefix and the shell scripts to have a `unix-` prefix.

We should perhaps consider creating a `scripts` directory for these. Also we might consider putting the GUI source files  and directorys `.cpp`, `.h` etc into a `src` directory.
  • Loading branch information
samaaron committed Feb 2, 2020
1 parent 79f2eb4 commit af91611
Show file tree
Hide file tree
Showing 25 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions INSTALL-WINDOWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ mklink /d ruby c:\Ruby25-x64
4) Build the Application by running the prebuild first, then config. These tools are in the app/gui/qt folder. Note: If you have previously installed libaubio5-dll, or set the AUBIO_LIB environment variable, now is the time to remove the dll and remove the variable; the prebuild on windows will make and install the correct library for you.
```
cd app/gui/qt
prebuild.bat OR prebuild32.bat (to make the external components and translations from ruby)
config.bat OR config32.bat (to make a project file)
win-prebuild.bat OR win-prebuild32.bat (to make the translations from ruby)
win-config.bat OR win-config32.bat (to make a project file)
cd build OR build32
EITHER:
cmake --build . --config Release
Expand Down Expand Up @@ -73,7 +74,7 @@ Run C:\dev\sonic-pi\app\gui\qt\build\Release\sonic-pi.exe or build32\Release\son

## Tips
- Error logs are written to %USERPROFILE%/.sonic-pi/logs, and are useful to diagnose any startup problems.
- If a rebuild errors at the final stage of copying files, or you are otherwise having trouble starting sonic pi, there is killprocess.bat to remove sonic pi from memory. This will also kill supercollider if it has been left running.- 32bit and 64bit don't mix. Build the one you want in a clean tree. Make sure you also install all the right 32/64 bit components to match your build. 64 bit is recommended on modern machines.
- If a rebuild errors at the final stage of copying files, or you are otherwise having trouble starting sonic pi, there is win-killprocess.bat to remove sonic pi from memory. This will also kill supercollider if it has been left running.- 32bit and 64bit don't mix. Build the one you want in a clean tree. Make sure you also install all the right 32/64 bit components to match your build. 64 bit is recommended on modern machines.
- `cd %QT_INSTALL_LOCATION%` will take you to the directory you have set for that environment variable - a good way to check you have set it up correctly
- You should find a libaubio-5.dll in your native/ruby/bin folder, if the prebuild has worked correctly. This is required for the onset feature.

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions app/gui/qt/prebuild.sh → app/gui/qt/unix-prebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
rm -r "${SCRIPT_DIR}/../../server/ruby/vendor/ruby-aubio-prerelease" | true

echo "Translating tutorial..."
ruby "${SCRIPT_DIR}/../../server/ruby/bin/i18n-tool.rb" -t
../../server/native/ruby/bin/ruby "${SCRIPT_DIR}/../../server/ruby/bin/i18n-tool.rb" -t

echo "Generating docs for the Qt GUI..."
cp "${SCRIPT_DIR}/utils/ruby_help.tmpl" "${SCRIPT_DIR}/utils/ruby_help.h"
ruby "${SCRIPT_DIR}/../../server/ruby/bin/qt-doc.rb" -o "${SCRIPT_DIR}/utils/ruby_help.h"
../../server/native/ruby/bin/ruby "${SCRIPT_DIR}/../../server/ruby/bin/qt-doc.rb" -o "${SCRIPT_DIR}/utils/ruby_help.h"

echo "Updating GUI translation files..."
lrelease "${SCRIPT_DIR}"/lang/*.ts
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit af91611

Please sign in to comment.