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
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
9244503c21
commit files involved in the OS X package build
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-04 21:14:47 +00:00
20de2657a4
fix bindings generation process for OS X
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10226 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-18 22:36:00 +00:00
c1ef7b14a3
Remove use of waf compat15 tool.
...
Always load waf tools first (prevent smashing of --debug, DATADIR, etc).
git-svn-id: svn://localhost/ardour2/branches/3.0@10163 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-29 19:58:05 +00:00
723ab60b39
Upgrade to waf 1.6.7 and autowaf r52.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-29 19:17:54 +00:00
e09e0035a6
check INSTALL_DEST_BASE exists earlier rather than later
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10100 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-20 20:28:44 +00:00
Todd Naugle
10e12dc287
Add another test to detect a non interactive shell. This may be the best method. Fixes double click install on AVLinux 5
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9776 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-29 18:24:07 +00:00
2dd40def0b
build script fix
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9732 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-14 19:18:28 +00:00
39c30e1747
tweak for recent linux packaging change
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9728 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-14 00:21:41 +00:00
25b79d5647
search for i18n files in more places and rationalize how that's done
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9726 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-14 00:16:05 +00:00
c5f67d62df
copy ALL style RC file into bundle
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-11 19:39:05 +00:00
8dedb6c38a
Fix syntax errors (how did this happen?)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-31 03:45:30 +00:00
Todd Naugle
c3a681b86a
Properly handle spaces in filenames along the path to the installer.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9613 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-27 19:46:28 +00:00
Todd Naugle
e057436a2b
add -P flag to both calls to df
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9609 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-27 15:19:28 +00:00
df96cb6136
add -P to invocation of df(1) to ensure expected output format
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9604 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-26 23:41:33 +00:00
fa42d70b85
remove --nostrip from noderun script, since it was removed from the build script
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9592 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-25 22:13:24 +00:00
Todd Naugle
5711425f18
Fix debug build detection
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9453 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-28 21:07:47 +00:00
Todd Naugle
83cd8d1a83
Remove unused strip option from package script. Fixed build script to properly detect non-debug builds
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9447 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-28 19:28:22 +00:00
4769db412d
Fix Python whitespace (follow PEP8 guidelines, reformatted by Python Reindent)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9409 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-22 22:15:21 +00:00
Todd Naugle
72b0911421
install and uninstall can now be run as root (ie su -c) although this is not preferred. Also check for free disk space before installing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-06 19:02:11 +00:00
193762e12a
track MIDI map copies for bundle
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9268 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-02 15:29:05 +00:00
c3677cf38d
fix typo
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9265 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-02 14:26:17 +00:00
b3faa154b8
copy pre-defined export presets & formats into the correct location in the bundle
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9264 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-02 14:17:44 +00:00
12c62f0c82
even more potential fixes for partial stripping of a linux bundle
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9255 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-01 19:34:31 +00:00
041fd2ce8c
more potential fixes for partial stripping of a linux bundle
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9254 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-01 18:56:16 +00:00
1bdc026bcd
more potential fixes for partial stripping of a linux bundle
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-01 18:52:59 +00:00
0d0f487686
another potential fix for partial stripping of a linux bundle
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9252 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-01 18:49:18 +00:00
22fe07d1c4
potential fix for partial stripping of a linux bundle
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9251 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-01 18:33:40 +00:00
08fddb1217
add call to ./package to noderun script
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9209 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-25 21:49:01 +00:00
7f4318b343
no real point running gzip on the package tarball
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9208 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-25 21:48:12 +00:00
7a970d08ed
include MIDI binding maps in packages
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9204 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-25 21:21:23 +00:00
Todd Naugle
3d51ea0ed2
Allow single architecture packages to be made
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9200 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-24 21:13:53 +00:00
1d5e55c9f1
get that last commit right
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9196 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-23 20:55:59 +00:00
2c01b36740
drop need for argument to "noderun" when building binaries on VMs
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9195 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-23 20:54:54 +00:00
6831fb9622
add light theme to binary package
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9194 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-23 16:00:24 +00:00
e43b01535c
tracking down why alpha binaries don't find control surfaces
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9189 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-23 14:09:48 +00:00
78814265e3
final copy needs to be done as root to deal wit vbox mount defaults
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9184 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-21 22:17:11 +00:00
4d4e231f03
part two of force mount of shared folder before build, and copy result there when done
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9183 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-21 21:29:18 +00:00
92c6b6a45b
force mount of shared folder before build, and copy result there when done
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9182 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-21 21:28:43 +00:00
fa93e48551
automated build stuff continues on
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9181 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-21 20:47:28 +00:00
5e0c8d1015
automated build stuff continues
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9180 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-21 20:46:15 +00:00
da52e3fb4e
more automated build stuff
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-21 19:55:06 +00:00
315c1d5a47
more automated build stuff
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9178 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-21 19:12:54 +00:00
272b790943
more tweaks
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9177 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-21 19:05:47 +00:00
7427334d4b
first round of automated builds
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9176 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-21 19:00:30 +00:00
feb120c803
add qm-dsp lib dir to linux packaging script
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9174 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-21 15:51:08 +00:00
9850407bd9
Indent python files with spaces as per style guide.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9158 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-16 16:32:56 +00:00
Todd Naugle
e18cebd6d7
merge in changes from 2.0 ongoing. Includes the build type in the package name and other fixes from 2.0
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8962 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-25 22:05:15 +00:00
Todd Naugle
5d86418fd2
add README file from 2.0 ongoing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8961 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-25 21:39:38 +00:00
4eb1a9ea0e
tweak description of qjackctl
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8784 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-08 23:40:56 +00:00
a8cc2b5a74
sanitycheck should be looking for SCHED_FIFO
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8783 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-08 23:40:32 +00:00
ce9035388b
fix bad comparison of possible frequency scaling governor values
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8776 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-08 19:52:50 +00:00
1c5506a99a
add uninstaller, remove (INTERNAL|EXTERNAL)_JACK
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8760 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-07 21:19:27 +00:00
1a7ef6b3da
add uninstaller from 2.0-ongoing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8759 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-07 21:16:24 +00:00
368e656e66
update for 3.0
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8758 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-07 20:56:49 +00:00
03529268f6
copy sanityCheck to the right place
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8757 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-07 20:56:39 +00:00
3ce03c80c1
catch up installer to 2.0-ongoing, and change program name
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8756 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-07 20:56:17 +00:00
0995509a15
strip by default in public build
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8704 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-04 15:01:16 +00:00
fc64778946
move chmod out of strip conditional
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8693 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-03 19:25:47 +00:00
487c5f4be6
if STRIP is not set, don't strip included libraries either
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8691 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-03 19:20:53 +00:00
926a4dd097
look in the right place for gtk2_ardour msg catalogs (*.mo)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8686 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-03 04:51:25 +00:00
bc565a1c06
try to get clearlooks back inside the 3.0 package
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8679 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-02 17:13:40 +00:00
8c121dc0f3
a couple more hacks for a3 linux packing, most importantly including panners
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8666 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 22:03:33 +00:00
f091a30fea
tweaks for startup script
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 19:36:59 +00:00
0881ec1f6a
search another dir for libs within a3
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 18:49:44 +00:00
6cd854b5d0
search more dirs for libs within a3
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8654 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 18:20:25 +00:00
fea976d6de
mo' better math expressions
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8653 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 18:13:21 +00:00
70512f34e8
better math expressions
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8652 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 18:12:01 +00:00
668266acb0
workaround incorrect name for actual ardour3 executable
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8651 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 18:07:48 +00:00
295f647147
avoid use of bash let statement
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8650 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 18:04:37 +00:00
f519d7fc7d
try to get the package a little more complete still
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8649 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 17:49:10 +00:00
df61b749a0
try to get the package a little more complete
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 17:40:39 +00:00
bd65df330f
don't try to package templates (yet)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 17:36:25 +00:00
f14726d306
no light theme for a3 at present
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8645 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-01 17:22:41 +00:00
ff1a365e40
linux packaging fixes for a3 build
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8629 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-31 15:37:22 +00:00
339ef19a6f
add linux packaging script(s) from 2.0-ongoing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8625 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-31 14:48:34 +00:00
85b4ff8669
copy sanitycheck from 2.0-ongoing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8624 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-31 14:45:56 +00:00
85e8be3fa4
remove gtkrcify tool
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8589 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-27 18:47:11 +00:00
d2289f6d14
new tool to convert meta version of ardour3_ui.rc.in into the real thing
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8587 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-27 03:15:55 +00:00
1fb74e6818
add linux bundle tools from 2.X
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7960 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-04 02:39:45 +00:00
