Removed osx stuff, don't really want to go there

diff --git a/uninstall_python.sh b/uninstall_python.sh
deleted file mode 100644 (file)
index de857b6..0000000
--- a/uninstall_python.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-for l in $(awk '{split($2, spl, "/"); print $4"\/"spl[length(spl)]}' python_install.log)
-do 
-               rm $l 2> /dev/null
-done
-
-exit 0
\ No newline at end of file

diff --git a/wsdl/Makefile b/wsdl/Makefile
index 003ca66..acbaf74 100644 (file)
--- a/wsdl/Makefile
+++ b/wsdl/Makefile
@@ -19,9 +19,6 @@ slice-manager.wsdl:
 
 aggregate.wsdl:
        PYTHONPATH=../ python sfa2wsdl.py --aggregate > $@
-       
-geni_am.wsdl:
-       PYTHONPATH=../ python sfa2wsdl.py --geni_aggregate > $@
 
 sfa.wsdl:
        PYTHONPATH=../ python sfa2wsdl.py --registry --slice-manager --aggregate > $@

diff --git a/wsdl/sfa2wsdl.py b/wsdl/sfa2wsdl.py
index f5fb2f9..21e0995 100755 (executable)
--- a/wsdl/sfa2wsdl.py
+++ b/wsdl/sfa2wsdl.py
@@ -328,8 +328,6 @@ def main():
                               help="Generate am.wsdl")
     parser.add_option("-c", "--component", action="store_true", dest="component",
                               help="Generate cm.wsdl")
-    parser.add_option("-g", "--geni_aggregate", action="store_true", dest="geni_am",
-                              help="Generate gm.wsdl")
     parser.add_option("-l", "--lite", action="store_true", dest="lite",
                               help="Generate LITE version of the interface, in which calls exclude credentials")
     (interface_options, args) = parser.parse_args()