13
0
Commit Graph

285 Commits

Author SHA1 Message Date
7aca3a9221 possible new naming convention, plus factor out version/DEBUG info into a sourced shell script fragment that can be shared by build+package 2013-03-25 09:49:07 -04:00
936362abc2 more packaging tweaks related to git/wscript/python 2013-03-25 09:10:38 -04:00
781ec13084 more packaging changes/debugging 2013-03-24 17:24:12 -04:00
cf98b72c23 more packaging name fixes 2013-03-24 17:01:21 -04:00
3276856105 more packaging name tweaks 2013-03-22 20:42:08 -04:00
d05f3b0a7c more tweaks to get package names right 2013-03-22 20:30:14 -04:00
e155338aa0 change extraction of revision and build from revision.cc, and use in the build, package and uninstall scripts 2013-03-22 16:54:06 -04:00
Julien de Kozak
eb7a85b8f9 Set the revision mechanism independent from the VCS name 2013-03-18 20:13:05 +01:00
b0fa3896f5 remove cruft (old cvsignore files) 2013-03-17 23:08:27 +01:00
333279ccf8 update during VM/release build via git, not svn 2013-03-14 17:14:39 -04:00
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
e1d7307056 make it possible to do an optimized package build on linux
git-svn-id: svn://localhost/ardour2/branches/3.0@14196 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 20:44:58 +00:00
b523e96586 and even more packaging changes for GTK engines on OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@14174 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-07 14:45:10 +00:00
38c0e4ab33 and more packaging changes for GTK engines on OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@14173 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-07 14:43:23 +00:00
9ae69bbecf more packaging changes for GTK engines on OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@14172 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-07 14:42:28 +00:00
3c2e8ba4ed packaging changes for GTK engines on OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@14171 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-07 14:39:27 +00:00
4c401fcdcb package mono font on OS X too
git-svn-id: svn://localhost/ardour2/branches/3.0@14141 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-05 03:49:34 +00:00
fbf7e4385b awk typo
git-svn-id: svn://localhost/ardour2/branches/3.0@14133 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-04 15:53:30 +00:00
f9d908e3a9 allow build/packaging scripts to find the right version ID for as long as we have separate designations on different platforms
git-svn-id: svn://localhost/ardour2/branches/3.0@14132 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-04 15:49:36 +00:00
90300e0155 install new 256px icon
git-svn-id: svn://localhost/ardour2/branches/3.0@14131 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-04 15:30:26 +00:00
9de5fb230c spice up OSX DMG
add background image and icon

git-svn-id: svn://localhost/ardour2/branches/3.0@14094 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-23 09:13:30 +00:00
Todd Naugle
9c4a4e8374 fix logic error in jack version check that caused it to not detect newer jack versions
git-svn-id: svn://localhost/ardour2/branches/3.0@14082 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-21 21:47:12 +00:00
0efedf3b85 remove -vx
git-svn-id: svn://localhost/ardour2/branches/3.0@14081 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-21 20:34:09 +00:00
7a73addd85 likely fix for gtk pixmap engine packaging
git-svn-id: svn://localhost/ardour2/branches/3.0@14080 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-21 20:24:58 +00:00
c84a286586 tweaks to get gtk pixmap engine packaging right, maybe
git-svn-id: svn://localhost/ardour2/branches/3.0@14079 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-21 20:13:55 +00:00
Todd Naugle
bbb8eb7b5a Check jack version during install and warn user if the version is too old.
git-svn-id: svn://localhost/ardour2/branches/3.0@14058 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-15 16:33:12 +00:00
9bbed5925d add MIDNAM (patchfiles) to child list so that they get installed
git-svn-id: svn://localhost/ardour2/branches/3.0@14057 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-13 19:38:47 +00:00
aff8612b58 don't bother packaging ArdourMono on OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@14034 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-30 12:34:10 +00:00
3fa36dab22 push ArdourMono font into OS X bundle
git-svn-id: svn://localhost/ardour2/branches/3.0@14029 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-29 16:14:22 +00:00
eb369215ae Custom Monospace font for clocks and such (no dot in zero).
ArdourMono is a renamed version of
https://www.google.com/webfonts/specimen/Droid+Sans+Mono
distributed under Apache License, version 2.0.
Since the name Droid(R) is registered by Google Inc it was
renamed to ArdourMono - otherwise the .tff is unchanged (build 112)

git-svn-id: svn://localhost/ardour2/branches/3.0@14026 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-29 15:25:30 +00:00
2f7d51344c look for GTK message catalogs in the right place
git-svn-id: svn://localhost/ardour2/branches/3.0@13990 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 15:20:01 +00:00
a8bf2e9402 more i18n fixes, this time removing a hack that broke i18n in bundles, and also only initializing NLS stuff if ENABLE_NLS is in effect. note that if translations are disabled by the user, we set the localedir used to look for message catalogs to a dir that is assumed to not exist (/this/cannot/exist) which should block all translation from happening.
git-svn-id: svn://localhost/ardour2/branches/3.0@13975 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-23 16:09:10 +00:00
8be1d088bb let's not forget that .mo suffix
git-svn-id: svn://localhost/ardour2/branches/3.0@13970 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-22 14:58:44 +00:00
2caf789125 i18n package names are suffixed with the major release, to allow parallel (normal) installation; the bundle names need to reflect this
git-svn-id: svn://localhost/ardour2/branches/3.0@13969 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-22 14:45:26 +00:00
8b259e45cb another fix for NLS copying into bundle
git-svn-id: svn://localhost/ardour2/branches/3.0@13967 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-22 03:16:13 +00:00
7b1123ea32 re-revert previous excessive debug output
git-svn-id: svn://localhost/ardour2/branches/3.0@13966 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-22 03:06:55 +00:00
bf5070aed8 revert previous excessive debug output
git-svn-id: svn://localhost/ardour2/branches/3.0@13963 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 23:12:34 +00:00
049fda91cc more info for NLS packaging
git-svn-id: svn://localhost/ardour2/branches/3.0@13961 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 22:40:41 +00:00
eabf3c31ed do not include irrelevant GTK rc "sub-files"
git-svn-id: svn://localhost/ardour2/branches/3.0@13959 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 22:18:58 +00:00
2c7f1892d5 fix package as well as build script for new svn version grepping
git-svn-id: svn://localhost/ardour2/branches/3.0@13953 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 18:44:25 +00:00
e53cf5f54f handle modified string in svn_revision.cc during build
git-svn-id: svn://localhost/ardour2/branches/3.0@13950 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-21 17:55:53 +00:00
6e80a7abc0 get path correct for ardour_system.rc when building bundles
git-svn-id: svn://localhost/ardour2/branches/3.0@13854 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-16 16:57:42 +00:00
5c847268af colin's wall clock patch update, modified to update every second, not every millisecond
git-svn-id: svn://localhost/ardour2/branches/3.0@13732 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-26 16:44:09 +00:00
53cc49ec9b update valgrind script to use suppression list
git-svn-id: svn://localhost/ardour2/branches/3.0@13712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-23 04:37:38 +00:00
Todd Naugle
d01a9599a4 Check the return status of tar since it can fail. Print out the file system that the bundle is currently stored on. It may be useful for debugging failed installs. Simplify the frequency scaling warning message
git-svn-id: svn://localhost/ardour2/branches/3.0@13705 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-21 21:40:06 +00:00
d3a06f2ddb get that last fix right
git-svn-id: svn://localhost/ardour2/branches/3.0@13675 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-18 16:20:08 +00:00
7095e48fe1 linux packaging needs to be able to find libltc in-tree
git-svn-id: svn://localhost/ardour2/branches/3.0@13674 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-18 16:16:05 +00:00
676c4e281c fix binding generation for OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@13634 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-10 22:16:27 +00:00
2a0460b150 fix fmt-bindings' handling of > and < bindings
git-svn-id: svn://localhost/ardour2/branches/3.0@13587 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-02 01:45:31 +00:00
8dc98a2935 copy ardour_system.rc into OS X bundle from (new) correct location
git-svn-id: svn://localhost/ardour2/branches/3.0@13411 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-09 13:36:22 +00:00
760ccbabfb add -Wpointer-arith -Wcast-qual -Wcast-align and others to compile flags, and fix const cast warnings generated by new flags
git-svn-id: svn://localhost/ardour2/branches/3.0@13124 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-10 15:57:09 +00:00
6805a33f82 add PREBUNDLE_ENV to startup script for OS X, so that JACK can be discovered correctly
git-svn-id: svn://localhost/ardour2/branches/3.0@13072 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-23 18:48:12 +00:00
36946dd1c2 fixes for the linux build script
git-svn-id: svn://localhost/ardour2/branches/3.0@13070 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-23 16:13:30 +00:00
Todd Naugle
0f79645be7 Correctly allow startup options to be passed to the main program when bundled. Launching a bundle in gdb now uses --debug instead of -d. This removes the confilt with the main application -d option. Also added i18n fix that forces translations off when translations are disabled
git-svn-id: svn://localhost/ardour2/branches/3.0@13062 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-20 17:05:43 +00:00
edee3c3293 more info when linux build goes wrong
git-svn-id: svn://localhost/ardour2/branches/3.0@12523 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-01 14:05:49 +00:00
72decf24cd use patchelf to reset RPATH within bundled libraries so that the runtime linker will not go looking in places set by parts of the GTK build stack
git-svn-id: svn://localhost/ardour2/branches/3.0@12521 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-01 13:27:38 +00:00
b4b7439489 fix osx build script when the path to the plugin folder contains spaces
git-svn-id: svn://localhost/ardour2/branches/3.0@12492 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-30 15:34:25 +00:00
Carl Hetherington
67953dc93b Patch from antgel to fix resampling of sessions with no
automation/ directory (#4888).


git-svn-id: svn://localhost/ardour2/branches/3.0@12454 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-27 15:45:36 +00:00
f94e66e095 quieten down linux build script
git-svn-id: svn://localhost/ardour2/branches/3.0@12442 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 22:01:47 +00:00
f8f2b888cc build script tweaks for OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@12434 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 17:59:09 +00:00
7aeff94792 more build script cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@12431 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 17:22:35 +00:00
9fa596839f more build script cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@12429 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 17:12:09 +00:00
e195a2e379 more build script cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@12428 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 16:59:58 +00:00
95e092da71 more build script cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@12427 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 16:44:39 +00:00
a06624e161 more build script cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@12426 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 16:34:46 +00:00
0a5e13189a more build script cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@12425 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 16:27:50 +00:00
74de4063c6 more build script cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@12424 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 16:21:46 +00:00
72fa409664 more build script cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@12423 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 16:19:41 +00:00
10c6490d54 build script tweaks for most consistency
git-svn-id: svn://localhost/ardour2/branches/3.0@12422 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 15:58:58 +00:00
224e6175ad Consistency is the hobgoblin of small minds.
git-svn-id: svn://localhost/ardour2/branches/3.0@12419 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 04:11:25 +00:00
72bccc40e7 build script typo
git-svn-id: svn://localhost/ardour2/branches/3.0@12415 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 02:00:12 +00:00
59d3cc258b tweaks to packaging to make SUIL (and thus LV2 UI's) work
git-svn-id: svn://localhost/ardour2/branches/3.0@12413 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 01:43:58 +00:00
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