13
0
Commit Graph

163 Commits

Author SHA1 Message Date
47dabb7026 try fixing borkage caused by excluding more libs, part 2
git-svn-id: svn://localhost/ardour2/branches/3.0@12389 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-23 14:06:43 +00:00
0d82f802b7 try fixing borkage caused by excluding more libs
git-svn-id: svn://localhost/ardour2/branches/3.0@12388 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-23 13:51:48 +00:00
65574fb7b7 don't include libasound or libICE or libSM in a linux bundle
git-svn-id: svn://localhost/ardour2/branches/3.0@12387 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-23 13:35:22 +00:00
6ee23029a3 packaging tweaks for OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@12345 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-20 20:17:33 +00:00
a47cfd7f6f fix copying of templates into bundles, etc
git-svn-id: svn://localhost/ardour2/branches/3.0@12344 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-20 15:20:27 +00:00
47d6c65a1c fix addition of templates to linux bundle
git-svn-id: svn://localhost/ardour2/branches/3.0@12343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-20 15:04:31 +00:00
4a81c77361 help linux install find new location for icons
git-svn-id: svn://localhost/ardour2/branches/3.0@12342 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-20 15:01:51 +00:00
568818f061 more packaging tweaks
git-svn-id: svn://localhost/ardour2/branches/3.0@12341 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-20 14:35:07 +00:00
5bf8833fcc missing Templates mkdir
git-svn-id: svn://localhost/ardour2/branches/3.0@12340 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-20 14:27:29 +00:00
746b020d9f more tweaks to bundles, search paths and packaging
git-svn-id: svn://localhost/ardour2/branches/3.0@12339 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-20 14:23:49 +00:00
8badf7492e copy MIDNAM patchfiles into linux and OS X bundles
git-svn-id: svn://localhost/ardour2/branches/3.0@12338 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-20 14:06:21 +00:00
2430a50f82 in linux bundle, put icons and pixmaps into shared/ not /etc
git-svn-id: svn://localhost/ardour2/branches/3.0@12337 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-20 13:40:30 +00:00
813c5f0af9 major rationalization of use of search paths. ardour now has just 4 functions used to define how external resources are located: ardour_config_search_path() (for system or user specific configuration data), ardour_data_search_path() (for machine, user and system independent data), ardour_dll_directory() (base directory where shared libraries are found) and user_config_directory(). These are now used throughout the code. the config, data and dll paths/directories can be overridden by environment variables. the user config dir is added as the first element of the first two search paths, and use selectively when searching for a few other things.
This commit re-enabes ./waf install, and it is believed that it works fully at this point (more testing likely required)

git-svn-id: svn://localhost/ardour2/branches/3.0@12326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-18 17:24:06 +00:00
74c6ad4e15 define ARDOUR_{MIDIMAPS,MCP}_PATH for bundles and for ./ardev and its cousins, so that we can find MIDI and Mackie support files
git-svn-id: svn://localhost/ardour2/branches/3.0@12211 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-08 15:25:57 +00:00
6bd097cc35 fix up unexpected situation with fontconfig in our packages
git-svn-id: svn://localhost/ardour2/branches/3.0@12190 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-05 14:16:13 +00:00
7dd9582855 bundle mackie control stuff into the package
git-svn-id: svn://localhost/ardour2/branches/3.0@12187 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-04 14:35:39 +00:00
6d723920f6 fix a problem with stripping dependent libs
git-svn-id: svn://localhost/ardour2/branches/3.0@12186 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-04 13:51:32 +00:00
437ed14c45 adjust to new svn revision string format in svn_revision.cc
git-svn-id: svn://localhost/ardour2/branches/3.0@12185 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-04 13:44:27 +00:00
5def537a41 tweak how we find clearlooks when packaging
git-svn-id: svn://localhost/ardour2/branches/3.0@12182 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-04 13:05:58 +00:00
df1e19f68c re-re-tweak noderun script
git-svn-id: svn://localhost/ardour2/branches/3.0@12179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-04 03:36:47 +00:00
244b987374 re-tweak noderun script
git-svn-id: svn://localhost/ardour2/branches/3.0@12178 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-04 03:36:09 +00:00
20fa01097c tweak noderun script
git-svn-id: svn://localhost/ardour2/branches/3.0@12177 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-04 03:35:30 +00:00
Carl Hetherington
40d57d1c1e Copy for SVN revision from build script.
git-svn-id: svn://localhost/ardour2/branches/3.0@12091 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 16:56:15 +00:00
Carl Hetherington
4f29bb6046 A few tweaks to the build script for Ubuntu 11.10
git-svn-id: svn://localhost/ardour2/branches/3.0@12090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 16:55:34 +00:00
Carl Hetherington
b150474b26 Tweak to fix up linux packaging script.
git-svn-id: svn://localhost/ardour2/branches/3.0@12089 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 16:19:21 +00:00
Todd Naugle
37117e5c45 fix missing quote in disk space check failure message
git-svn-id: svn://localhost/ardour2/branches/3.0@11785 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-03 20:22:12 +00:00
Todd Naugle
a3eaff8fa3 The installer will now create a link to the program in /usr/local/bin to allow starting from the command line. If the installer or uninstaller is not running as root, they will now attempt to use both sudo and su to get root access. This means double click install now works on systems that don't have sudo installed or configured.
git-svn-id: svn://localhost/ardour2/branches/3.0@11553 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-29 17:55:13 +00:00
78b1139d35 use Primary not Meta for accel maps, having confirmed that it works
git-svn-id: svn://localhost/ardour2/branches/3.0@11514 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-23 22:39:03 +00:00
d3d8c36c54 include splash image in OS X package
git-svn-id: svn://localhost/ardour2/branches/3.0@11271 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-19 22:24:07 +00:00
28d5a263b4 adjust to new template structure in OS X packaging tool (note: this was in place for 3.0-beta2 and used during packaging but not committed)
git-svn-id: svn://localhost/ardour2/branches/3.0@11250 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-16 14:52:10 +00:00
4837b29191 fix GTK_PATH in binary bundle (not fully tested)
git-svn-id: svn://localhost/ardour2/branches/3.0@11229 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-11 17:15:54 +00:00
8bad14ff65 OS X packagin fix to pick up surfaces
git-svn-id: svn://localhost/ardour2/branches/3.0@11106 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-29 16:44:23 +00:00
1b9a9f27a2 put the UI configuration file in the right place(s) in the linux packages
git-svn-id: svn://localhost/ardour2/branches/3.0@10634 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-16 00:13:26 +00:00
c0e13ccf8d include step editing and mixer binding files in linux packages
git-svn-id: svn://localhost/ardour2/branches/3.0@10631 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 22:37:36 +00:00
f7106a20be minor fix for linux packaging
git-svn-id: svn://localhost/ardour2/branches/3.0@10611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 13:05:02 +00:00
323bd2918e clean up OSX packaging tool
git-svn-id: svn://localhost/ardour2/branches/3.0@10594 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 21:24:25 +00:00
36ac7f3e78 update OS X package build script to handle panners and other miscellany
git-svn-id: svn://localhost/ardour2/branches/3.0@10563 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-13 13:23:08 +00:00
ab53e4d1e3 fix linux packaging script for new waf convention, more
git-svn-id: svn://localhost/ardour2/branches/3.0@10559 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-12 23:08:24 +00:00
74e896f5d3 fix linux packaging script for new waf convention
git-svn-id: svn://localhost/ardour2/branches/3.0@10558 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-12 23:07:17 +00:00
68578f65e4 remove generated file from svn
git-svn-id: svn://localhost/ardour2/branches/3.0@10524 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 01:37:05 +00:00
7d65551292 OSX packaging tweaks
git-svn-id: svn://localhost/ardour2/branches/3.0@10519 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 01:28:54 +00:00
244eaa55fb provide global prelight option (its in Edit -> Preferences->Interface)
git-svn-id: svn://localhost/ardour2/branches/3.0@10514 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-09 20:10:05 +00:00
Todd Naugle
07ff18db2a Installer now handles i18n of the Desktop folder. Running the installer or uninstaller as root work correctly and does not invalidate the sanity checks. Corrected method used to detect if the installer is already running in a visable terminal.
git-svn-id: svn://localhost/ardour2/branches/3.0@10502 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-08 18:07:29 +00:00
9674867b9d switch use of Option/Alt and Control on OS X for bindings. Option/Alt is intended by Apple to be used primarily (if not entirely) for entering alternate characters. Shift would be more conventional as 2ndary modified on OS X but that might have a few more implications than we want to deal with right now
git-svn-id: svn://localhost/ardour2/branches/3.0@10481 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-07 19:19:31 +00:00
b1990cf026 update copyright info in OS X bundle
git-svn-id: svn://localhost/ardour2/branches/3.0@10480 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-07 19:18:06 +00:00
0770605242 include step editing and mixer bindings in OS X bundle
git-svn-id: svn://localhost/ardour2/branches/3.0@10453 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-04 21:33:36 +00:00
8b581d60cf delete more cruft from osx packaging folder
git-svn-id: svn://localhost/ardour2/branches/3.0@10452 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-04 21:21:39 +00:00
2b720eba22 delete cruft from osx packaging folder
git-svn-id: svn://localhost/ardour2/branches/3.0@10451 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-04 21:21:07 +00:00
9dc5c545b9 commit more files involved in the OS X package build
git-svn-id: svn://localhost/ardour2/branches/3.0@10450 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-04 21:19:21 +00:00
c5ff1fc74b commit more files involved in the OS X package build
git-svn-id: svn://localhost/ardour2/branches/3.0@10449 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-04 21:15:34 +00:00