Adjusted build files for pruned version of the repository. From this point on, configuration related projects goes to this repo while SIP core modules go to the sipXrouter repository.

Author: sipfoundrydev

config/dart.m4

@@ -8,7 +8,7 @@ AC_DEFUN([CHECK_DART_SDK],
        SF_MISSING_DEP([Cannot find dart2js in dart sdk at ${DART_HOME}/bin/dart2js])
      ])
    else
-     candidates="${DART_HOME} /opt/dart/dart-sdk /opt/dart-sdk ~/dart-sdk"
+     candidates="${DART_HOME} / /usr/lib/dart /opt/dart/dart-sdk /opt/dart-sdk ~/dart-sdk"
      for candidate in $candidates; do
        AC_CHECK_FILE([$candidate/bin/dart2js],
        [

config/revision-gen

@@ -5,8 +5,9 @@
 # the revision.  Source build therefore should save revision into the tarball
 
 if [ "$#" == "0" ]; then
-    echo "Usage: $0 version. Example: $0 1.2.3" 1>&2
-    exit 1
+    VERSION="15.06"
+else
+    VERSION=$1
 fi
 
 if test -f ./tarball-revision; then
@@ -23,19 +24,7 @@ if test -d ../.git; then
   parent_rev=${parent%.*}
 fi
 
-VERSION=$1
-if [ $VERSION == "15.06" ]; then
-    VERSION="4.6.0"
-fi
-if [ $VERSION == "15.05" ]; then
-    VERSION="4.6.0"
-fi
-if [ $VERSION == "15.04" ]; then
-    VERSION="4.6.0"
-fi
-if [ $VERSION == "1.4.4" ]; then
-    VERSION="1.0.7"
-fi
+
 VER_REV=`git describe --abbrev=5 --match="v${VERSION}" HEAD`
 if [ "$?" != "0" ]; then
     echo "Could not find tag v$VERSION" 1>&2

config/sipXlib2.m4

@@ -44,7 +44,8 @@ test -n "$SIPXPBXGROUP" || SIPXPBXGROUP=$SIPXPBXUSER
 
 AC_ARG_VAR(PACKAGE_REVISION, [Package revision number. Default is based on date rpm is built. Allowed values: stable, unstable, developer or supply your own value of command.])
 if test -z "$PACKAGE_REVISION" || test "$PACKAGE_REVISION" == "developer" ; then
-  PACKAGE_REVISION=`date +%Y%m%d%H%M%S`
+  #PACKAGE_REVISION=`date +%Y%m%d%H%M%S`
+  PACKAGE_REVISION=`cd ${srcdir} && ./config/revision-gen ${PACKAGE_VERSION}`
 else
   case ${PACKAGE_REVISION} in
     unstable )

mak/build.mk.in

@@ -21,8 +21,8 @@ $(foreach M,$(git_submodules) $(git_custommodules),$(eval $(M)_GIT_SUBMODULE = $
 include $(SRC)/mak/modules.mk
 
 # pull in dependency make fragments
-include $(SRC)/mak/*.sipxecs.mk
-include $(SRC)/*/.sipxecs.mk
+#include $(SRC)/mak/*.sipxecs.mk
+#include $(SRC)/*/.sipxecs.mk
 
 # Example .modules-include files
 # - Includes sipxecs core pieces and Italian language pack

mak/modules.mk

@@ -6,177 +6,28 @@
 # should be listed after it's dependencies.  No circular dependecies
 # allowed.
 sipx_core = \
-  sipXportLib \
-  sipXtackLib \
-  sipXresiprocate \
-  oss_core \
-  sipXmediaLib \
-  sipXmediaAdapterLib \
-  sipXcallLib \
-  sipXeslLib \
   sipXsupervisor \
-  sipXcommserverLib \
-  sipXsqa \
   sipXcommons \
-  sipXrelay \
-  sipXbridge \
   sipXcdr \
   sipXconfig \
-  sipXcom \
-  sipXopenfire \
-  sipXcounterpath \
-  sipXprompts \
-  sipXivr \
-  sipXproxy \
-  sipXpublisher \
-  sipXregistry \
-  sipXpage \
   sipXpolycom \
-  sipXrls \
-  sipXsaa \
-  sipXyard \
-  sipXrelease \
-  sipXecs
-
-#additional configure options for sipXresiprocate package
-sipXresiprocate_OPTIONS = --with-c-ares --with-ssl --with-repro --enable-ipv6 --with-tfm
-
-# sipxecs projects that are NOT essential for a running communication system
-sipx_extra = \
   sipXacccode \
-  sipXcustomCallerId \
   sipXviewer \
-  sipXimbot \
-  sipXexample \
   sipXrest \
-  sipXcallController \
   sipXcdrLog \
-  sipXrecording \
-  sipXhomer \
-  sipXcallQueue \
-  sipXAocBilling \
-  sipXtools
-
-# sipxecs projects that are NOT essential for a running communication system
-# and are related to configuration system. Many are phone plugins
-sipx_config = \
-  sipXaudiocodes \
+  sipXcallController \
   sipXprovision \
-  sipXcisco \
-  sipXclearone \
-  sipXgtek \
-  sipXhitachi \
-  sipXipdialog \
-  sipXisphone \
-  sipXnortel \
-  sipXlg-nortel \
-  sipXmitel \
-  sipXsnom \
-  sipXunidata \
-  sipXgrandstream \
-  sipXaastra \
-  sipXyealink
-
-# Language packs not required for a function communications system
-sipx_lang = \
-  sipXlang-abitibi-fr_CA \
-  sipXlang-ch \
-  sipXlang-cs \
-  sipXlang-de \
-  sipXlang-en_GB \
-  sipXlang-es \
-  sipXlang-fr_CA \
-  sipXlang-fr \
-  sipXlang-it \
-  sipXlang-ja \
-  sipXlang-es_MX \
-  sipXlang-nl \
-  sipXlang-pl \
-  sipXlang-pt_BR \
-  sipXlang-zh
-
-sipx_all = \
-  $(sipx_core) \
-  $(sipx_extra) \
-  $(sipx_config) \
-  $(sipx_lang)
-
-# re: ruby-postgres, there's a new one we should be using ruby-pgsql i
-# think it's called as ruby-postgres is obsoleted.
-lib_all = \
-  epel \
-  rubygem-file-tail \
-  erlang \
-  freeswitch \
-  hiredis \
-  net-snmp \
-  homer \
-  openfire \
-  ruby-dbi \
-  cfengine \
-  rubygem-net-ssh \
-  rubygem-net-sftp \
-  ruby-postgres \
-  jasperserver \
-  libjsonrpccpp \
-  libevent2 \
-  mongo-cxx-driver \
-  mongodb
-
-lib_exclude_fedora_16 = \
-  epel \
-  erlang \
-  rrdtool \
-  rubygem-net-ssh \
-  rubygem-net-sftp
+  sipXrelease \
+  sipXecs
 
-lib_exclude_fedora_17 = \
-  $(lib_exclude_fedora_16) \
-  ruby-postgres
 
-lib_exclude_fedora_18 = $(lib_exclude_fedora_17)
-lib_exclude_fedora_19 = $(lib_exclude_fedora_18)
-lib_exclude_fedora_20 = $(lib_exclude_fedora_19)
-lib_exclude_fedora_21 = $(lib_exclude_fedora_20)
-lib_exclude_fedora_22 = $(lib_exclude_fedora_21)
-lib_exclude_fedora_23 = $(lib_exclude_fedora_22)
+sipx_all = $(sipx_core) 
 
-lib = $(filter-out $(lib_exclude_$(DISTRO_OS)_$(DISTRO_VER)),$(lib_all))
 
 # Project compile-time dependencies. Only list project that if
 # it's dependecies were recompiled then you'd want to recompile.
-freeswitch_DEPS = erlang
-sipXtackLib_DEPS = sipXportLib
-sipXmediaLib_DEPS = sipXtackLib
-sipXmediaAdapterLib_DEPS = sipXmediaLib
-sipXcallLib_DEPS = sipXmediaAdapterLib
-sipXcustomCallerId_DEPS = sipXconfig
-sipXcommserverLib_DEPS = sipXtackLib 
-sipXsqa_DEPS = sipXcommserverLib
-sipXrelay_DEPS = sipXcommons
-sipXbridge_DEPS = sipXcommons
 sipXcdr_DEPS = sipXcommons
 sipXconfig_DEPS = sipXcommons sipXcdr
-sipXopenfire_DEPS = sipXconfig sipXsqa
-sipXcounterpath_DEPS = sipXconfig
-sipXaudiocodes_DEPS = sipXconfig
-sipXivr_DEPS = sipXconfig
-sipXproxy_DEPS = sipXcommserverLib oss_core
-sipXpublisher_DEPS = sipXcommserverLib
-sipXregistry_DEPS = sipXcommserverLib
-sipXpage_DEPS = sipXcommons
 sipXpolycom_DEPS = sipXconfig
-sipXrls_DEPS = sipXsqa sipXcallLib sipXcommserverLib
-sipXsaa_DEPS = sipXsqa sipXcallLib sipXcommserverLib
-sipXhomer_DEPS = sipXsqa sipXresiprocate
-sipXsbc_DEPS = sipXconfig sipXsqa sipXregistry
-sipXcallQueue_DEPS = sipXconfig
-sipXAocBilling_DEPS = sipXconfig
-sipXexample_DEPS = sipXcommserverLib sipXconfig
-sipXsss_DEPS = sipXsqa sipXcommserverLib sipXresiprocate
-sipXyard = sipXcommserverLib
-sipXtools_DEPS = sipXtackLib sipXcommserverLib
 
-all = \
-  $(lib) \
-  $(sipx)
+all = $(sipx)

mak/rpm.mk.in

@@ -108,6 +108,18 @@ $(sipx:=.rpm.if-changed) $(lib:=.rpm.if-changed) : %.rpm.if-changed : $$($$*_GIT
 	fi
 	cp @RPMBUILD_TOPDIR@/SRPMS/$($(PROJ)_SRPM) $(MOCK_SRPM_DIR)
 
+%.localrpm : %.dist
+	rm -rf $(PROJ)/RPMBUILD; \
+	mkdir -p $(PROJ)/RPMBUILD/{DIST,BUILD,SOURCES,RPMS,SRPMS,SPECS}; \
+	echo `pwd`/$(PROJ)/RPMBUILD > .rpmtopdir; \
+	rpmbuild -ta --define "%_topdir `cat .rpmtopdir`"  $($(PROJ)_TAR); \
+	rm -rf $(PROJ)/RPMS; mv $(PROJ)/RPMBUILD/RPMS $(PROJ); \
+	rm -rf $(PROJ)/SRPMS; mv $(PROJ)/RPMBUILD/SRPMS $(PROJ); \
+	rm -rf rm -rf $(PROJ)/RPMBUILD
+
+%.localrpm-install :
+	yum -y localinstall `pwd`/$(PROJ)/RPMS/x86_64/*.rpm
+
 $(sipx:=.srpm) : %.srpm : %.dist $(MOCK_INIT_TEST) $(MOCK_RESULTS_DIR)
 	rpmbuild -ts $(SRPM_DEFS) $($(PROJ)_SRPM_DEFS) --nodeps $($(PROJ)_TAR)
 	test -d $(MOCK_SRPM_DIR) || mkdir -p $(MOCK_SRPM_DIR)

sipXconfig/Makefile.am

@@ -44,7 +44,7 @@ noinst_DATA = $(SRC_PUB_PACKAGES)
 pub-get $(SRC_PUB_PACKAGES) : pubspec.yaml
 	cd $(srcdir); $(DART_HOME)/bin/pub get
 	touch $(SRC_PUB_PACKAGES)
-	$(MAKE) remove-extraneous-packages-symlinks
+#	$(MAKE) remove-extraneous-packages-symlinks
 
 # Dart's package manager has an annoying feature that generates packages symlinks in
 # web directory.  This removes all the copies that are not needed by how sipXconfig has integrated

sipXconfig/etc/sipxpbx/sipxconfig-jetty.xml

@@ -37,15 +37,6 @@
         </New>
       </Arg>
     </Call>
-    <Call name="addHandler">
-      <Arg>
-        <New class="org.eclipse.jetty.webapp.WebAppContext">
-          <Set name="contextPath">/cmcprov</Set>
-          <Set name="war"><SystemProperty name="jetty.lib.dir"/>/cmcprov.war</Set>
-          <Set name="extractWAR">true</Set>
-        </New>
-      </Arg>
-    </Call>
   </Ref>
 
   <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">

sipXconfig/sipxconfig.spec.in

@@ -86,9 +86,11 @@ Requires: ruby
 Requires: rubygems
 Requires: freeswitch >= 1.0.7
 
+#
 # XX-10822 Required EPEL rpms are now found in build. Pointing to this repo has
 # proven to be dangerous
-Obsoletes: epel-release
+# Obsoletes: epel-release
+#
 
 Obsoletes: sipx-jasperreports-deps
 Obsoletes: sipxfreeswitch

sipXconfig/web/packages

@@ -1 +1 @@
-../packages/
+../packages

sipXprovision/sipxprovision.spec.in

@@ -13,12 +13,9 @@ BuildRequires: automake
 BuildRequires: java-1.7.0-openjdk-devel
 BuildRequires: zip
 BuildRequires: sipxcommons >= %version
-BuildRequires: sipxopenfire >= %version
 
 Source: %name-%version.tar.gz
 
-Obsoletes: sipxvxml
-
 Requires: sipxcommons >= %version
 Requires: chkconfig
 BuildRequires: sipxconfig >= %version

sipXsupervisor/etc/Makefile.am

@@ -40,7 +40,6 @@ dist_cfplugins_DATA = \
 	firewall.cf \
 	security.cf \
 	redis.cf \
-	mysql.cf \
 	dhcpd.cf \
 	ntpd.cf \
 	phonelog.cf \

sipXsupervisor/etc/sipx.cf.in

@@ -164,6 +164,12 @@ body copy_from file_remote_cp(from,server) {
   compare  => "mtime";
 }
 
+body copy_from local_cp_by_digest(filename) {
+  source => "$(filename)";
+  compare => "digest";
+  purge => "true";
+}
+
 bundle agent sipx_init {
   vars:
 

sipXviewer/sipxviewer.spec.in

@@ -10,7 +10,7 @@ Packager: SIPfoundry <[email protected]>
 Url: http://www.sipfoundry.org/sipXtools
 
 BuildRequires: automake
-BuildRequires: java-devel >= 1.7
+BuildRequires: java-1.7.0-openjdk-devel
 BuildRequires: sipxcommons >= %version
 
 Source: %name-%version.tar.gz