csd 0.1.9 → 0.1.10

data/lib/csd/application/minisip/component/plugins.rb

@@ -0,0 +1,53 @@
+# -*- encoding: UTF-8 -*-
+
+module CSD
+  module Application
+    module Minisip
+      module Component
+        module Plugins
+          class << self
+            
+            def compile
+              UI.debug "#{self}.compile was called"
+              if Path.plugins.directory? and !Options.reveal
+                UI.warn "The optional MiniSIP plugins will not be installed, because the directory #{Path.plugins.enquote} already exists."
+              else
+                checkout
+                copy
+              end
+            end
+          
+            def introduction
+            end
+          
+            def checkout
+              Cmd.git_clone('additional MiniSIP plugins', 'http://github.com/csd/minisip-plugins.git', Path.plugins)
+            end
+          
+            # Copies the plugins from the repository to the final destination.
+            #
+            def copy
+              if Path.plugins_destination.directory?
+                UI.info "Installing optional MiniSIP plugins".green.bold
+                UI.info "Copying from `#{Path.plugins_destination}´ to `#{Path.plugins}´".yellow
+                Dir[File.join(Path.plugins, '{md,mg,mvideo}*.{a,la,so}')].each do |plugin|
+                  if Gem::Platform.local.os == 'linux' or Gem::Platform.local.os == 'darwin'
+                    optional_sudo = Options.this_user ? '' : 'sudo '
+                    UI.info "  #{File.basename(plugin)}"
+                    Cmd.run("#{optional_sudo}cp #{plugin} #{Path.plugins_destination}", :internal => true)
+                  else
+                    # On other platforms we will have to do this without superuser privileges for now
+                    Cmd.copy(plugin, Path.plugins_destination)
+                  end
+                end
+              else
+                UI.warn "The target plugin directory could not be found: #{Path.plugins_destination.enquote}".green.bold
+              end
+            end
+          
+          end
+        end
+      end
+    end
+  end
+end

data/lib/csd/application/minisip/component/x264.rb

@@ -0,0 +1,42 @@
+# -*- encoding: UTF-8 -*-
+
+module CSD
+  module Application
+    module Minisip
+      module Component
+        module X264
+          class << self
+            
+            def compile
+              UI.debug "#{self}.compile was called"
+              if Path.x264_repository.directory? and !Options.reveal
+                UI.warn "x264 will not be processed, because the directory #{Path.x264_repository.enquote} already exists."
+              else
+                checkout
+                make
+              end
+            end
+            
+            def introduction
+            end
+            
+            def checkout
+              Cmd.git_clone('x264 repository', 'http://github.com/csd/x264.git', Path.x264_repository)
+            end
+            
+            # This method compiles x264, given that x264 was downloaded before.
+            #
+            def make
+              UI.info "Compiling and installing x264".green.bold
+              Cmd.cd Path.x264_repository, :internal => true
+              Cmd.run('./configure')
+              Cmd.run('make')
+              Cmd.run('sudo checkinstall --pkgname=x264 --pkgversion "99:-`git log -1 --pretty=format:%h`" --backup=no --default')
+            end
+            
+          end
+        end
+      end
+    end
+  end
+end

data/lib/csd/application/minisip/error.rb

@@ -1,12 +1,18 @@
 # -*- encoding: UTF-8 -*-
-require File.join(File.dirname(__FILE__), '..', '..', 'error')
+require 'csd/error'
 
 module CSD
   module Error
-  
-    module Options
-      class PathNotFound < CSDError; status_code(200); end
+    module Minisip
+      
+      # See 'csd/error' to find out which status code range has been assigned to MiniSIP
+      
+      class BuildDirNotFound < CSDError; status_code(200); end
+      
+      module Core
+        class FFmpegInstalled < CSDError; status_code(210); end
+      end
+      
     end
-    
   end
 end

data/lib/csd/application/minisip/options/common.rb

@@ -2,12 +2,12 @@
 
 opts.headline 'WORKING DIRECTORY OPTIONS'.green.bold
 
-self.temp = false
-opts.on("-t", "--temp", "Use a system's temporary directory as working directory.") do |value|
-  self.temp = value
+self.temp = true
+opts.on("--no-temp", "Use the current directory as working directory and not a system's temporary directory.") do |value|
+  self.temp = !value
 end
 
 self.work_dir = nil
-opts.on("--work-dir [PATH]", "Defines and/or creates the working directory. This will override the --temp option.") do |value|
+opts.on("--work-dir [PATH]", "Defines and/or creates the working directory. This will override the --pwd option.") do |value|
   self.work_dir = value
 end

data/lib/csd/application/minisip/options/compile.rb

@@ -1,31 +1,25 @@
 # -*- encoding: UTF-8 -*-
 # This file gets eval'ed by the global options parser in lib/csd/options_parser
 
+self.this_user = false
+opts.on("--this-user","Compile MiniSIP not for all users (sudo), but only for the current user") do |value|
+  self.this_user = value
+end
+
 self.apt_get = true
 opts.on("--no-apt-get","Don't run any apt-get commands") do |value|
   self.apt_get = value
 end
 
-#self.owner = nil
-#opts.on("-o", "--owner [OWNER]","Specify OWNER:GROUP for this operation") do |value|
-#  if owner = value
-#    chmod = owner.split(':')
-#    self.owner = chmod.first
-#    self.group = chmod.last
-#  end
-#end
-
-self.only_fix_giomm = false
-opts.on("--only-fix-giomm","Forces the AI to do nothing except trying to bugfix the Ubuntu 10.04 giomm") do |value|
-  self.only_fix_giomm = value
-end
-
 self.ffmpeg_first = false
-opts.on("--ffmpeg-first","Compile FFmpeg before compiling MiniSIP. Default is first MiniSIP.") do |value|
+opts.on("--ffmpeg-first","Compile FFmpeg before compiling MiniSIP (default is first MiniSIP)") do |value|
   self.ffmpeg_first = value
 end
 
-
+self.branch = nil
+opts.on('--branch BRANCH', 'Choose another branch than `master´ when downloading the source code') do |lib|
+  self.branch = value
+end
 
 opts.headline 'MINISIP LIBRARY OPTIONS'.green.bold
 

data/lib/csd/application/minisip/unix.rb

@@ -9,8 +9,11 @@ module CSD
         # This method presents a general overview about the task that is to be performed.
         #
         def introduction
-          UI.separator
-          UI.info " MiniSIP libraries to process:   ".green + libraries.join(', ').yellow
+          Core.introduction
+          # FFmpeg.introduction
+          # HDVIPER.introduction
+          # X264.introduction
+          # Plugins.introduction
           super
         end
         
@@ -18,10 +21,10 @@ module CSD
         #
         def compile
           UI.separator
-          UI.info "This operation will download and compile MiniSIP.".green.bold
+          UI.info "This operation will compile MiniSIP and its dependencies.".green.bold
+          UI.separator
           introduction
           compile!
-          run_minisip_gtk_gui
         end
         
         # This method is called by the AI when the user requests the task "package" for MiniSIP.
@@ -33,166 +36,23 @@ module CSD
           package!
         end
         
-        # This is the internal compile procedure for MiniSIP
+        # This is the internal compile procedure for MiniSIP and its components.
         #
         def compile!
-          Cmd.mkdir Path.work
-          make_hdviper   unless checkout_hdviper.already_exists?
-          modify_minisip unless checkout_minisip.already_exists?
-          checkout_plugins
+          create_working_directory
+          HDVIPER.compile
           if Options.ffmpeg_first
-            make_x264 unless checkout_x264.already_exists?
-            unless checkout_ffmpeg.already_exists?
-              modify_libavutil
-              checkout_libswscale
-              make_ffmpeg
-            end
-            make_minisip
+            X264.compile
+            FFmpeg.compile
+            Core.compile
           else
-            make_minisip
-            make_x264 unless checkout_x264.already_exists?
-            unless checkout_ffmpeg.already_exists?
-              checkout_libswscale
-              make_ffmpeg
-            end
-          end
-          copy_plugins
-        end
-        
-        # This method compiles FFmpeg, given that FFmpeg was downloaded before.
-        #
-        def make_ffmpeg
-          Cmd.cd Path.ffmpeg_repository, :internal => true
-          Cmd.run('./configure --enable-gpl --enable-libx264 --enable-x11grab')
-          Cmd.run('make')
-          Cmd.run('sudo checkinstall --pkgname=ffmpeg --pkgversion "99:-`git log -1 --pretty=format:%h`" --backup=no --default')
-        end
-        
-        # This method compiles x264, given that x264 was downloaded before.
-        #
-        def make_x264
-          Cmd.cd Path.x264_repository, :internal => true
-          Cmd.run('./configure')
-          Cmd.run('make')
-          Cmd.run('sudo checkinstall --pkgname=x264 --pkgversion "99:-`git log -1 --pretty=format:%h`" --backup=no --default')
-        end
-        
-        # This method compiles HDVIPER, given that HDVIPER was downloaded before.
-        #
-        def make_hdviper
-          Cmd.cd Path.hdviper_x264, :internal => true
-          Cmd.run('./configure')
-          Cmd.run('make')
-          Cmd.cd Path.hdviper_x264_test_x264api, :internal => true
-          Cmd.run('make')
-        end
-        
-        # Creates all build directories such as +lib+, +share+, +bin+, etc.
-        #
-        def create_build_dir
-          UI.info "Creating target build directories".green.bold
-          [Path.build, Path.build_include, Path.build_lib, Path.build_share, Path.build_share_aclocal].each { |target| Cmd.mkdir target }
-        end
-        
-        # Copies the plugins from the repository to the final destination.
-        #
-        def copy_plugins
-          UI.info "Creating plugin target directory".green.bold
-          # result = Path.plugins_destination.parent.directory? ? Cmd.run("sudo mkdir #{Path.plugins_destination}") : CommandResult.new
-          # TODO: This will maybe need sudo rights in the future
-          Cmd.copy(Dir[File.join(Path.plugins, '*.{l,la,so}')], Path.plugins_destination) if Path.plugins_destination.directory?
-        end
-        
-        # Iteratively configures and compiles the internal MiniSIP libraries.
-        #
-        def make_minisip
-          create_build_dir
-          libraries.each do |library|
-            directory = Pathname.new(File.join(Path.repository, library))
-            next if Options.only and !Options.only.include?(library)
-            if Cmd.cd(directory) or Options.reveal
-              if Options.bootstrap
-                UI.info "Bootstrapping #{library}".green.bold
-                Cmd.run("./bootstrap -I #{Path.build_share_aclocal.enquote}")
-              end
-              if Options.configure
-                UI.info "Configuring #{library}".green.bold
-                individual_options = case library
-                  when 'libminisip'
-                    %Q{--enable-debug --enable-video --disable-mil --enable-decklink --enable-opengl --disable-sdl #{libminisip_c_flags} #{libminisip_cpp_flags} #{libminisip_ld_flags}}
-                  when 'minisip'
-                    %Q{--enable-debug --enable-video --enable-textui --enable-opengl}
-                  else
-                    ''
-                end
-                Cmd.run(%Q{./configure #{individual_options} --prefix=#{Path.build.enquote} PKG_CONFIG_PATH=#{Path.build_lib_pkg_config.enquote} ACLOCAL_FLAGS=#{Path.build_share_aclocal} LD_LIBRARY_PATH=#{Path.build_lib.enquote}})
-              end
-              if Options.make
-                UI.info "Make #{library}".green.bold
-                Cmd.run("make")
-              end
-              if Options.make_install
-                UI.info "Make install #{library}".green.bold
-                Cmd.run("make install")
-              end
-            else
-              UI.warn "Skipping minisip library #{library} because it not be found: #{directory}".green.bold
-            end
+            Core.compile
+            X264.compile
+            FFmpeg.compile
           end
-        end
-        
-        # Iteratively makes debian packages of the internal MiniSIP libraries.
-        #
-        def package!
-          Cmd.mkdir(Path.packaging)
-          libraries.each do |library|
-            directory = Pathname.new(File.join(Path.repository, library))
-            next if Options.only and !Options.only.include?(library)
-            UI.info "Making #{library} with target dist".green.bold
-            if Cmd.cd(directory) or Options.reveal
-              Cmd.run("make dist")
-              
-              tar_filename = File.basename(Dir[File.join(directory, '*.tar.gz')].first)
-              Cmd.move(File.join(directory, tar_filename.to_s), Path.packaging) if tar_filename or Options.reveal
-              
-              if Cmd.cd(Path.packaging) or Options.reveal
-                Cmd.run("tar -xzf #{tar_filename}")
-                tar_dirname = File.basename(tar_filename.to_s, '.tar.gz')
-                if Cmd.cd(File.join(Path.packaging, tar_dirname))
-                  Cmd.run("dpkg-buildpackage -rfakeroot")
-                  if library == 'minisip'
-                    if Cmd.cd(Path.packaging)
-                      package = File.basename(Dir[File.join(Path.packaging, "#{library}*.deb")].first)
-                      Cmd.run("sudo dpkg -i #{package}") if package or Options.reveal
-                    end
-                  else
-                    if Cmd.cd(Path.packaging)
-                      package = File.basename(Dir[File.join(Path.packaging, "#{library}0*.deb")].first)
-                      Cmd.run("sudo dpkg -i #{package}") if package or Options.reveal
-                      dev_package = File.basename(Dir[File.join(Path.packaging, "#{library}-dev*.deb")].first)
-                      Cmd.run("sudo dpkg -i #{dev_package}") if dev_package or Options.reveal
-                    end
-                  end
-                else
-                  UI.error "Could not enter #{File.join(Path.packaging, tar_dirname)}."
-                end
-                
-              else
-                UI.error "Could not enter #{Path.packaging}."
-              end
-                
-            else
-              UI.error "Could not enter #{directory}."
-            end
-          end
-          Cmd.cd '/'
-          Cmd.run('minisip_gtk_gui')
-        end
-        
-        # Executed the MiniSIP GTK GUI.
-        #
-        def run_minisip_gtk_gui
-          Cmd.run(Path.build_gtkgui, :die_on_failure => false)
+          Plugins.compile
+          Gnome.compile
+          Core.run_gtkgui
         end
         
       end

data/lib/csd/application/minisip/unix/darwin.rb

@@ -1,20 +1,10 @@
 # -*- encoding: UTF-8 -*-
-require File.join(File.dirname(__FILE__), '..', 'unix')
+require 'csd/application/minisip/unix'
 
 module CSD
   module Application
     module Minisip
       class Darwin < Unix
-
-        def compile!
-          Cmd.mkdir Path.work
-          #checkout_hdviper
-          #make_hdviper
-          checkout_minisip
-          modify_minisip
-          checkout_plugins
-          make_minisip
-        end
         
       end
     end

data/lib/csd/application/minisip/unix/linux.rb

@@ -1,5 +1,5 @@
 # -*- encoding: UTF-8 -*-
-require File.join(File.dirname(__FILE__), '..', 'unix')
+require 'csd/application/minisip/unix'
 
 module CSD
   module Application

data/lib/csd/application/minisip/unix/linux/debian.rb

@@ -11,33 +11,25 @@ module CSD
         DEBIAN_DEPENDENCIES = %w{ automake build-essential checkinstall git-core libasound2-dev libavcodec-dev libglademm-2.4-dev libgtkmm-2.4-dev libltdl3-dev libsdl-dev libsdl-ttf2.0-dev libssl-dev libtool libswscale-dev libx11-dev libxv-dev nasm subversion yasm }
 
         def compile!
-          install_aptitude_dependencies if Options.apt_get
-          after_aptitude_dependencies
+          aptitude if Options.apt_get
+          after_aptitude
           super
         end
         
-        def after_aptitude_dependencies
+        def after_aptitude
         end
         
         def package!
-          modify_libminisip_rules
+          Core.modify_libminisip_rules # TODO: Oursource into Component::Core
           super
         end
         
-        def install_aptitude_dependencies
+        def aptitude
+          UI.info "Installing Debian dependencies".green.bold
           Cmd.run("sudo apt-get update")
           Cmd.run("sudo apt-get install #{DEBIAN_DEPENDENCIES.sort.join(' ')} --yes --fix-missing")
         end
         
-        def modify_libminisip_rules
-          if Path.repository_libminisip_rules_backup.file?
-            UI.warn "The libminisip rules seem to be fixed already, I won't touch them now. Delete #{Path.repository_libminisip_rules_backup.enquote} to enforce it."
-          else
-            Cmd.copy Path.repository_libminisip_rules, Path.repository_libminisip_rules_backup
-            Cmd.replace Path.repository_libminisip_rules, 'AUTOMATED_INSTALLER_PLACEHOLDER=""', [libminisip_cpp_flags, libminisip_ld_flags].join(' ')
-          end
-        end
-        
       end
     end
   end