Skip to content

Commit 0acb3f2

Browse files
andywolkandywolk
authored
Merge pull request #2704 from signalwire/abstraction
[mod_abstraction] Remove from tree
2 parents 122c589 + c1f4586 commit 0acb3f2

File tree

13 files changed

+1
-365
lines changed

13 files changed

+1
-365
lines changed

‎Freeswitch.2017.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spy", "src\mod\applicat
396396
EndProject
397397
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_httapi", "src\mod\applications\mod_httapi\mod_httapi.2017.vcxproj", "{4748FF56-CA85-4809-97D6-A94C0FAC1D77}"
398398
EndProject
399-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_abstraction", "src\mod\applications\mod_abstraction\mod_abstraction.2017.vcxproj", "{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}"
400-
EndProject
401399
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sms", "src\mod\applications\mod_sms\mod_sms.2017.vcxproj", "{2469B306-B027-4FF2-8815-C9C1EA2CAE79}"
402400
EndProject
403401
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xmlrpc-c", "xmlrpc-c", "{9DE35039-A8F6-4FBF-B1B6-EB527F802411}"
@@ -1757,17 +1755,6 @@ Global
17571755
{4748FF56-CA85-4809-97D6-A94C0FAC1D77}.Release|Win32.Build.0 = Release|Win32
17581756
{4748FF56-CA85-4809-97D6-A94C0FAC1D77}.Release|x64.ActiveCfg = Release|x64
17591757
{4748FF56-CA85-4809-97D6-A94C0FAC1D77}.Release|x64.Build.0 = Release|x64
1760-
{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.All|Win32.ActiveCfg = Release|x64
1761-
{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.All|x64.ActiveCfg = Release|x64
1762-
{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.All|x64.Build.0 = Release|x64
1763-
{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|Win32.ActiveCfg = Debug|Win32
1764-
{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|Win32.Build.0 = Debug|Win32
1765-
{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|x64.ActiveCfg = Debug|x64
1766-
{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|x64.Build.0 = Debug|x64
1767-
{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|Win32.ActiveCfg = Release|Win32
1768-
{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|Win32.Build.0 = Release|Win32
1769-
{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|x64.ActiveCfg = Release|x64
1770-
{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|x64.Build.0 = Release|x64
17711758
{2469B306-B027-4FF2-8815-C9C1EA2CAE79}.All|Win32.ActiveCfg = Release|x64
17721759
{2469B306-B027-4FF2-8815-C9C1EA2CAE79}.All|x64.ActiveCfg = Release|x64
17731760
{2469B306-B027-4FF2-8815-C9C1EA2CAE79}.All|x64.Build.0 = Release|x64
@@ -2588,7 +2575,6 @@ Global
25882575
{50AAC2CE-BFC9-4912-87CC-C6381850D735} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
25892576
{A61D7CB4-75A5-4A55-8CA1-BE5AF615D921} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
25902577
{4748FF56-CA85-4809-97D6-A94C0FAC1D77} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
2591-
{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
25922578
{2469B306-B027-4FF2-8815-C9C1EA2CAE79} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
25932579
{9DE35039-A8F6-4FBF-B1B6-EB527F802411} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
25942580
{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}

‎build/modules.conf.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#applications/mod_abstraction
21
applications/mod_av
32
#applications/mod_avmd
43
#applications/mod_bert

‎build/modules.conf.most

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
applications/mod_abstraction
21
applications/mod_av
32
applications/mod_avmd
43
applications/mod_bert

‎conf/vanilla/autoload_configs/abstraction.conf.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2088,7 +2088,6 @@ AC_CONFIG_FILES([Makefile
20882088
tests/unit/Makefile
20892089
src/Makefile
20902090
src/mod/Makefile
2091-
src/mod/applications/mod_abstraction/Makefile
20922091
src/mod/applications/mod_avmd/Makefile
20932092
src/mod/applications/mod_bert/Makefile
20942093
src/mod/applications/mod_blacklist/Makefile

‎debian/bootstrap.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,6 @@ Recommends:
516516
freeswitch-meta-codecs (= \${binary:Version}),
517517
freeswitch-music,
518518
freeswitch-sounds,
519-
freeswitch-mod-abstraction (= \${binary:Version}),
520519
freeswitch-mod-avmd (= \${binary:Version}),
521520
freeswitch-mod-blacklist (= \${binary:Version}),
522521
freeswitch-mod-callcenter (= \${binary:Version}),
@@ -601,7 +600,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
601600
freeswitch-meta-mod-say (= \${binary:Version}),
602601
freeswitch-music,
603602
freeswitch-sounds,
604-
freeswitch-mod-abstraction (= \${binary:Version}),
605603
freeswitch-mod-avmd (= \${binary:Version}),
606604
freeswitch-mod-av (= \${binary:Version}),
607605
freeswitch-mod-blacklist (= \${binary:Version}),
@@ -831,7 +829,6 @@ Architecture: amd64 armhf arm64
831829
Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
832830
freeswitch-meta-codecs-dbg (= \${binary:Version}),
833831
freeswitch-meta-mod-say (= \${binary:Version}),
834-
freeswitch-mod-abstraction-dbg (= \${binary:Version}),
835832
freeswitch-mod-avmd-dbg (= \${binary:Version}),
836833
freeswitch-mod-av-dbg (= \${binary:Version}),
837834
freeswitch-mod-blacklist-dbg (= \${binary:Version}),

‎debian/control-modules

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33

44
## mod/applications
55

6-
Module: applications/mod_abstraction
7-
Description: Abstraction layer for APIs
8-
This module provides a way to create new API functions via regex
9-
rewriting.
10-
116
Module: applications/mod_av
127
Description: mod_av
138
Adds mod_av.

‎freeswitch.spec

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,6 @@ FreeSWITCH development files
227227
######################################################################################################################
228228
# FreeSWITCH Application Modules
229229
######################################################################################################################
230-
%package application-abstraction
231-
Summary: FreeSWITCH mod_abstraction
232-
Group: System/Libraries
233-
Requires: %{name} = %{version}-%{release}
234-
235-
%description application-abstraction
236-
Provide an abstraction to FreeSWITCH API calls
237-
238230
%package application-avmd
239231
Summary: FreeSWITCH voicemail detector
240232
Group: System/Libraries
@@ -1205,7 +1197,6 @@ The Python ESL module allows for native interaction with FreeSWITCH over the eve
12051197
Summary: Basic vanilla config set for the FreeSWITCH Open Source telephone platform.
12061198
Group: System/Libraries
12071199
Requires: %{name} = %{version}-%{release}
1208-
Requires: freeswitch-application-abstraction
12091200
Requires: freeswitch-application-avmd
12101201
Requires: freeswitch-application-blacklist
12111202
Requires: freeswitch-application-callcenter
@@ -1299,7 +1290,7 @@ export QA_RPATHS=$[ 0x0001|0x0002 ]
12991290
# Application Modules
13001291
#
13011292
######################################################################################################################
1302-
APPLICATION_MODULES_AC="applications/mod_abstraction applications/mod_avmd applications/mod_blacklist \
1293+
APPLICATION_MODULES_AC="applications/mod_avmd applications/mod_blacklist \
13031294
applications/mod_callcenter applications/mod_cidlookup \
13041295
applications/mod_commands applications/mod_conference applications/mod_curl"
13051296
APPLICATION_MODULES_DE="applications/mod_db applications/mod_directory applications/mod_distributor \
@@ -1758,7 +1749,6 @@ fi
17581749
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/*.xml
17591750
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/extensions.conf
17601751
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/mime.types
1761-
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/abstraction.conf.xml
17621752
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/acl.conf.xml
17631753
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/amr.conf.xml
17641754
%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/amrwb.conf.xml
@@ -1885,9 +1875,6 @@ fi
18851875
# Application Packages
18861876
#
18871877
######################################################################################################################
1888-
%files application-abstraction
1889-
%{MODINSTDIR}/mod_abstraction.so*
1890-
18911878
%files application-avmd
18921879
%{MODINSTDIR}/mod_avmd.so*
18931880

‎src/mod/applications/mod_abstraction/Makefile.am

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/mod/applications/mod_abstraction/conf/autoload_configs/abstraction.conf.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)