XX-9567 - ruby install issues, other improvements

danchang · Jun 1, 2011 · 54c8744 · 54c8744
1 parent e181c3d
commit 54c8744
Show file tree

Hide file tree

Showing 73 changed files with 105 additions and 262 deletions.
diff --git a/config/project.am b/config/project.am
@@ -1,14 +1,22 @@
+# Require utility.am be included. Do not include it here because having all top-level makefile
+# include nec. files helps readablity.  We have to avoid a network of includes that include other
+# includes
+utility_am_required ?= $(error Please include utility.am)
+$(utility_am_required)
+
+
 EXTRA_DIST = \
     config/revision-gen \
     CONTRIBUTORS \
     $(@PACKAGE@_EXTRA_DIST)
 
-# defined as empty target so if a package does not override, it's a nop
-%-dist-hook:;
+dist-hook: @PACKAGE@-dist-revision @PACKAGE@-dist-specfile
 
-dist-hook: @PACKAGE@-dist-hook
+%-dist-revision :
 	echo $(PACKAGE_REVISION) > $(distdir)/.tarball-revision
-	@$(LocalizeSipXconfig) $(srcdir)/@[email protected] > $(distdir)/@[email protected]
+
+%-dist-specfile :
+	@$(call SearchAndReplace,$(srcdir)/@[email protected],$(distdir)/@[email protected], $(dist_EXTRA_REPLACE))
 
 # CONFIG_DISTCLEANFILES are files to be added to DISTCLEANFILES in any
 # makefile that includes config as an external subdirectory.

diff --git a/sipXaastra/Makefile.am b/sipXaastra/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include $(top_srcdir)/config/project.am
 
 SUBDIRS = \

diff --git a/sipXacccode/Makefile.am b/sipXacccode/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include config/project.am
 
 SUBDIRS = \

diff --git a/sipXacd/Makefile.am b/sipXacd/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include config/project.am
 
 SUBDIRS = \

diff --git a/sipXacdStatistics/Makefile.am b/sipXacdStatistics/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include config/project.am
 
 @PACKAGE@_EXTRA_DIST = \

diff --git a/sipXaudiocodes/Makefile.am b/sipXaudiocodes/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include config/project.am
 
 SUBDIRS = \

diff --git a/sipXbridge/Makefile.am b/sipXbridge/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include config/project.am
 
 @PACKAGE@_EXTRA_DIST = \

diff --git a/sipXcallController/Makefile.am b/sipXcallController/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include config/project.am
 
 @PACKAGE@_EXTRA_DIST = \

diff --git a/sipXcallLib/Makefile.am b/sipXcallLib/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include config/project.am
 
 SUBDIRS = \

diff --git a/sipXcdr/Makefile.am b/sipXcdr/Makefile.am
@@ -1,16 +1,19 @@
+include config/utility.am
 include $(top_srcdir)/config/project.am
 include $(top_srcdir)/config/utility.am
 include $(top_srcdir)/config/ruby.am
+include $(top_srcdir)/common.am
 
 @PACKAGE@_EXTRA_DIST = \
-	$(callresolver_SRC)
+	$(sipxcallresolver_SRC)
 
 SUBDIRS = \
 	java-client \
+	bin \
+	etc \
 	.
 
-callresolver_SRC = $(shell cd $(srcdir); find lib -type f -name '*.rb')
-callresolver_VER = 1.0.0
+sipxcallresolver_SRC = $(shell cd $(srcdir); find lib -type f -name '*.rb')
 
 noinst_DATA = \
-	callresolver-$(callresolver_VER).gem
+	sipxcallresolver-$(sipxcallresolver_VER).gem
diff --git a/sipXcdr/bin/Makefile.am b/sipXcdr/bin/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/config/utility.am
+include $(top_srcdir)/common.am
 
 bin_SCRIPTS = \
 	sipxcallresolver-agent.sh \
@@ -13,6 +14,6 @@ setup_SCRIPTS = \
 	sipxcallresolver-setup
 
 $(setup_SCRIPTS) $(bin_SCRIPTS) : % : %.in
-	@$(call SearchAndReplace,$<,$@,STUNNEL)
+	@$(call SearchAndReplace,$<,$@,STUNNEL ODBC_LIBDIR sipxcallresolver_VER)
 
 CLEANFILES = $(bin_SCRIPTS) $(setup_SCRIPTS)
diff --git a/sipXcdr/bin/sipxcallresolver.sh.in b/sipXcdr/bin/sipxcallresolver.sh.in
@@ -35,7 +35,7 @@ fi
 : ${DbPatchDir:=${ConfDir}/cdr}
 : ${DbPatchLog:=${LogDir}/sipcdrpatch.log}
 : ${CallResolverLog:=${LogDir}/sipcallresolver.log}
-: ${CallResolverMain:=@GEM_LIB_DIR@/sipxcallresolver-2.0.0/lib/main.rb}
+: ${CallResolverMain:=@GEM_LOCAL_LIB_DIR@/gems/sipxcallresolver-@sipxcallresolver_VER@/lib/main.rb}
 
 resolverArgs="--confdir ${ConfDir} --logdir ${LogDir}"
 Database=SIPXCDR
@@ -348,10 +348,10 @@ ERROR
 removeOldCronEntry()
 {
     # Remove crontab entry for sipxcallresolver if there is one
-    if [ -f @SIPX_SYSCONFDIR@/crontab ]; then
-       if grep sipxcallresolver @SIPX_SYSCONFDIR@/crontab >/dev/null; then
-          sed -e 's/^.*sipxcallresolver.*$//' @SIPX_SYSCONFDIR@/crontab > @SIPX_SYSCONFDIR@/crontab.tmp
-          mv @SIPX_SYSCONFDIR@/crontab.tmp @SIPX_SYSCONFDIR@/crontab
+    if [ -f @sysconfdir@/crontab ]; then
+       if grep sipxcallresolver @sysconfdir@/crontab >/dev/null; then
+          sed -e 's/^.*sipxcallresolver.*$//' @sysconfdir@/crontab > @sysconfdir@/crontab.tmp
+          mv @sysconfdir@/crontab.tmp @sysconfdir@/crontab
        fi
     fi
 }

diff --git a/sipXcdr/common.am b/sipXcdr/common.am
@@ -0,0 +1 @@
+sipxcallresolver_VER = 2.0.0
diff --git a/sipXcdr/configure.ac b/sipXcdr/configure.ac
@@ -17,5 +17,7 @@ CHECK_POSTGRES
 AC_CONFIG_FILES([
   Makefile
   java-client/Makefile
+  etc/Makefile
+  bin/Makefile
 ])
 AC_OUTPUT
diff --git a/sipXcdr/etc/Makefile.am b/sipXcdr/etc/Makefile.am
@@ -1,25 +1,15 @@
 include $(top_srcdir)/config/utility.am
 
-SUBDIRS = \
-	. \
-	database
-
 EXTRA_DIST = \
-        $(proc_DATA:.xml=.xml.in) \
-	$(cfg_DATA:=.in)
+        $(proc_DATA:.xml=.xml.in)
 
 procdir = \
         $(SIPX_DATADIR)/process.d
 
 proc_DATA = \
-	sipxcallresolver-agent-process.xml \
 	sipxcallresolver-process.xml
 
-cfgdir = @SIPX_CONFDIR@
-cfg_DATA = \
-	sipxcallresolver-agent-config
-
-$(cfg_DATA) $(proc_DATA) : % : %.in
-        @$(call SearchAndReplace, $<, $@)
+$(proc_DATA) : % : %.in Makefile
+	@$(call SearchAndReplace, $<, $@)
 
-CLEANFILES = $(proc_DATA) $(cfg_DATA)
+CLEANFILES = $(proc_DATA)
diff --git a/sipXcdr/etc/sipxcallresolver-agent-config b/sipXcdr/etc/sipxcallresolver-agent-config
diff --git a/sipXcdr/etc/sipxcallresolver-agent-process.xml.in b/sipXcdr/etc/sipxcallresolver-agent-process.xml.in
diff --git a/sipXcdr/lib/main.rb b/sipXcdr/lib/main.rb
@@ -16,7 +16,6 @@
 # application requires
 require 'call_resolver'
 require 'utils/call_resolver_configure'
-require 'utils/stunnel_connection'
 
 
 def usage()
@@ -101,28 +100,20 @@ def main()
 
   resolver = CallResolver.new(config)
 
-  stunnel_connection = StunnelConnection.new(config)
-
-  stunnel_connection.open()
-
   resolver.check_connections
   if daemon_flag
     resolver.run_resolver
   else
     resolver.resolve(start_time, end_time)
   end
 
-rescue
   config.log.error("Exiting because of error: <#{$!}>")
   config.log.error do
     start_line = "\n"
     $!.backtrace.inject("") {|trace, line| "#{trace}\n#{line}" }
   end
-ensure
-  stunnel_connection.close if stunnel_connection
 end
 
-
 if __FILE__ == $0
   main()
 end
diff --git a/sipXcdr/lib/utils/call_resolver_configure.rb b/sipXcdr/lib/utils/call_resolver_configure.rb
@@ -161,10 +161,6 @@ def min_cleanup_interval
     parse_int_param(@config, 'SIP_CALLRESOLVER_MIN_CLEANUP_INTERVAL', 5 * 60 ,60)
   end
 
-  def stunnel_debug
-    @config.fetch('SIP_CALLRESOLVER_STUNNEL_DEBUG', 5)
-  end
-
   def cse_connect_port
     @config.fetch('SIP_CALLRESOLVER_STUNNEL_PORT', 9300)
   end

diff --git a/sipXcdr/lib/utils/stunnel_connection.rb b/sipXcdr/lib/utils/stunnel_connection.rb
diff --git a/sipXcdr/callresolver.gemspec.in → sipXcdr/sipxcallresolver.gemspec.in b/sipXcdr/callresolver.gemspec.in → sipXcdr/sipxcallresolver.gemspec.in
diff --git a/sipXcdr/sipxcdr.spec.in b/sipXcdr/sipxcdr.spec.in
@@ -60,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %attr(644,sipxchange,sipxchange) %{_sysconfdir}/sipxpbx/cdr/*
 %dir %attr(755,sipxchange,sipxchange) %{_sysconfdir}/sipxpbx/cdr
 %dir %attr(755,root,root) %{sipxpbxvarlib}
-%attr(755,root,root) %{sipxpbxvarlib}/sipxcallresolver-2.0.0.gem
+%attr(755,root,root) %{sipxpbxvarlib}/sipxcallresolver-*.gem
 %attr(755,root,root) %{_bindir}/sipxcallresolver.sh
 %attr(755,root,root) %{_bindir}/sipxcallresolver-agent.sh
 

diff --git a/sipXcdrLog/Makefile.am b/sipXcdrLog/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include config/project.am
 
 @PACKAGE@_EXTRA_DIST = \

diff --git a/sipXcisco/Makefile.am b/sipXcisco/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include $(top_srcdir)/config/project.am
 
 SUBDIRS = \

diff --git a/sipXclearone/Makefile.am b/sipXclearone/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include $(top_srcdir)/config/project.am
 
 SUBDIRS = \

diff --git a/sipXcommons/Makefile.am b/sipXcommons/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include config/project.am
 
 @PACKAGE@_EXTRA_DIST = \

diff --git a/sipXcommserverLib/Makefile.am b/sipXcommserverLib/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include config/project.am
 
 @PACKAGE@_EXTRA_DIST = \

diff --git a/sipXconfig/Makefile.am b/sipXconfig/Makefile.am
@@ -1,3 +1,4 @@
+include config/utility.am
 include config/project.am
 
 @PACKAGE@_EXTRA_DIST = \