csd 0.1.13 → 0.1.14
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/csd.gemspec +1 -1
- data/lib/csd/application/minisip/component/core.rb +1 -1
- data/lib/csd/application/minisip/component/gnome.rb +1 -1
- data/lib/csd/application/minisip/unix/linux/debian/ubuntu10.rb +1 -1
- data/lib/csd/container.rb +2 -2
- data/test/application/test_minisip.rb +2 -1
- metadata +3 -3
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.1.
|
1
|
+
0.1.14
|
data/csd.gemspec
CHANGED
@@ -113,7 +113,7 @@ module CSD
|
|
113
113
|
Path.dirlist = Pathname.new File.join('/', 'usr', 'share', 'aclocal', 'dirlist')
|
114
114
|
if !Path.dirlist.file? and Gem::Platform.local.debian?
|
115
115
|
UI.info "Fixing broken Debian aclocal path".green.bold
|
116
|
-
Path.new_dirlist = Pathname.new File.join(
|
116
|
+
Path.new_dirlist = Pathname.new File.join(Path.work, 'dirlist')
|
117
117
|
Cmd.touch_and_replace_content Path.new_dirlist, '/usr/local/share/aclocal'
|
118
118
|
Cmd.run "sudo mv #{Path.new_dirlist} #{Path.dirlist}", :announce_pwd => false
|
119
119
|
end
|
@@ -37,7 +37,7 @@ Categories=Application;Internet;Network;Chat;AudioVideo}
|
|
37
37
|
return if Path.minisip_gnome_pixmap.file? and Path.minisip_desktop_entry.file?
|
38
38
|
UI.info "Installing Gnome menu item".green.bold
|
39
39
|
Cmd.run("sudo cp #{Path.minisip_gnome_png} #{Path.minisip_gnome_pixmap}", :announce_pwd => false)
|
40
|
-
Path.new_desktop_entry = Pathname.new File.join(
|
40
|
+
Path.new_desktop_entry = Pathname.new File.join(Path.work, 'minisip.desktop')
|
41
41
|
Cmd.touch_and_replace_content Path.new_desktop_entry, DESKTOP_ENTRY, :internal => true
|
42
42
|
Cmd.run "sudo mv #{Path.new_desktop_entry} #{Path.minisip_desktop_entry}", :announce_pwd => false
|
43
43
|
end
|
@@ -16,7 +16,7 @@ module CSD
|
|
16
16
|
if Path.giomm_header_backup.file? and !Options.reveal
|
17
17
|
UI.warn "giomm-2.4 seems to be fixed already, I won't touch it now. Delete #{Path.giomm_header_backup.enquote} to enforce it."
|
18
18
|
else
|
19
|
-
Path.new_giomm_header = File.join(
|
19
|
+
Path.new_giomm_header = File.join(Path.work, 'giomm.h')
|
20
20
|
Cmd.copy(Path.giomm_header, Path.new_giomm_header)
|
21
21
|
Cmd.replace Path.new_giomm_header do |r|
|
22
22
|
r.replace '#include <giomm/socket.h>', "/* ----- AI COMMENTING OUT START ----- \n#include <giomm/socket.h>"
|
data/lib/csd/container.rb
CHANGED
@@ -70,8 +70,8 @@ module CSD
|
|
70
70
|
class Options
|
71
71
|
# Because the Options class will respond to clear, we must pass it on explicitly to the OptionsParser instance residing in CSD.options
|
72
72
|
#
|
73
|
-
def self.clear
|
74
|
-
::CSD.options.clear
|
73
|
+
def self.clear(*args)
|
74
|
+
::CSD.options.clear(*args)
|
75
75
|
end
|
76
76
|
def self.method_missing(meth, *args, &block)
|
77
77
|
::CSD.options.send(meth, *args, &block)
|
@@ -36,7 +36,7 @@ class TestMinisip < Test::Unit::TestCase
|
|
36
36
|
setup do
|
37
37
|
Options.clear
|
38
38
|
@base.define_relative_paths
|
39
|
-
|
39
|
+
Options.clear Application::Minisip.default_options('compile')
|
40
40
|
Options.reveal = true
|
41
41
|
end
|
42
42
|
|
@@ -57,6 +57,7 @@ class TestMinisip < Test::Unit::TestCase
|
|
57
57
|
|
58
58
|
should "use sudo make install instead of make install by default" do
|
59
59
|
Options.make_install = true
|
60
|
+
Options.force_ffmpeg = true
|
60
61
|
out, err = capture { Core.compile }
|
61
62
|
# TODO: This should be a more strict test
|
62
63
|
assert_match /sudo make install/, out
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: csd
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 7
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 0.1.
|
9
|
+
- 14
|
10
|
+
version: 0.1.14
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Technology Transfer Alliance Team
|