@Montellese, @Memphiz, @jimfcarroll Replace the scripting engine with…

… a codegenerated one.

.gitignore

@@ -7,6 +7,7 @@ testMain
 # Eclipse
 *.project
 *.cproject
+.classpath
 
 # generated files etc
 config.cache
@@ -28,6 +29,7 @@ config.log
 *.orig
 *.bak
 *.apk
+*.class
 
 # Windows specific generated files
 *.exp
@@ -378,6 +380,8 @@ lib/cmyth/Makefile
 /project/BuildDependencies/lib
 /project/BuildDependencies/msys
 /project/BuildDependencies/scripts/tmp
+/project/BuildDependencies/bin/swig
+/project/BuildDependencies/bin/doxygen
 
 # /project/VS2008Express
 /project/VS2008Express/Debug
@@ -1150,33 +1154,12 @@ lib/cmyth/Makefile
 # /xbmc/interfaces/
 /xbmc/interfaces/Makefile
 /xbmc/interfaces/python/Makefile
-/xbmc/interfaces/python/xbmcmodule/Makefile
-/xbmc/interfaces/python/linux/Makefile
-/xbmc/interfaces/python/linux/wrapper_python.def
+/xbmc/interfaces/python/generated/
 
 # /xbmc/network/
 /xbmc/network/Makefile
 /xbmc/network/upnp/Makefile
 
-/lib/python/Makefile
-/lib/python/Include/pyconfig.h
-/lib/python/Makefile.pre
-/lib/python/Modules/Setup
-/lib/python/Modules/Setup.config
-/lib/python/Modules/Setup.local
-/lib/python/Modules/config.c
-/lib/python/Parser/pgen
-/lib/python/Parser/pgen.exe
-/lib/python/PC/pythonnt_rc.h
-/lib/python/build/
-/lib/python/buildno
-/lib/python/pyconfig.h
-/lib/python/pyconfig.hbak
-/lib/python/python
-/lib/python/python.exe
-/lib/python/Mac/Python/
-/lib/python/PC/pythonnt_rc_d.h
-
 # /lib/libRTV/
 /lib/libRTV/Makefile
 /lib/libRTV/Debug

Makefile.in

@@ -50,8 +50,6 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
                    xbmc/interfaces/info/info.a \
                    xbmc/interfaces/interfaces.a \
                    xbmc/interfaces/json-rpc/json-rpc.a \
-                   xbmc/interfaces/python/python.a \
-                   xbmc/interfaces/python/xbmcmodule/xbmcmodule.a \
                    xbmc/linux/linux.a \
                    xbmc/music/dialogs/musicdialogs.a \
                    xbmc/music/infoscanner/musicscanner.a \
@@ -97,6 +95,9 @@ ifeq (@USE_WEB_SERVER@,1)
 DIRECTORY_ARCHIVES += xbmc/network/httprequesthandler/httprequesthandlers.a
 endif
 
+DIRECTORY_ARCHIVES += xbmc/interfaces/legacy/legacy.a
+DIRECTORY_ARCHIVES += xbmc/interfaces/python/python_binding.a
+
 ifeq (@USE_OPENGL@,1)
 DIRECTORY_ARCHIVES += xbmc/rendering/gl/rendering_gl.a
 endif
@@ -347,9 +348,6 @@ libaddon: exports
 	$(MAKE) -C lib/addons/library.xbmc.addon
 	$(MAKE) -C lib/addons/library.xbmc.gui
 	$(MAKE) -C lib/addons/library.xbmc.pvr
-libpython: dllloader
-	$(MAKE) -C xbmc/interfaces/python
-	$(MAKE) -C xbmc/interfaces/python/xbmcmodule
 dvdpcodecs: dllloader
 	$(MAKE) -C lib
 	$(MAKE) -C lib/libdvd
@@ -396,13 +394,18 @@ libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@[email protected] $(CMYTH
 
 externals: codecs libs visualizations screensavers libaddon
 
+ADDON_BINDINGS = xbmc/interfaces/legacy/legacy.a
+ADDON_BINDINGS += xbmc/interfaces/python/python_binding.a
+
 xcode_depends: \
 	codecs libs visualizations screensavers eventclients skins libaddon \
 	lib/libsquish/libsquish.a \
 	lib/libapetag/.libs/libapetag.a \
 	lib/libRTV/librtv.a \
 	lib/libXDAAP/libxdaap.a \
-	lib/SlingboxLib/SlingboxLib.a
+	lib/SlingboxLib/SlingboxLib.a \
+	$(ADDON_BINDINGS)
+	libtool -static -o xbmc/interfaces/addonbindings.a $(ADDON_BINDINGS)
 
 OBJSXBMC =$(DIRECTORY_ARCHIVES)
 OBJSXBMC+=lib/libapetag/.libs/libapetag.a

configure.in

@@ -1574,6 +1574,31 @@ else
   AC_DEFINE([PIX_FMT_VDPAU_MPEG4_IN_AVUTIL], [1], [Whether AVUtil defines PIX_FMT_VDPAU_MPEG4.])
 fi
 
+echo "Checking for SWIG installation"
+AC_PATH_PROG(SWIG_EXE, swig, "none")
+if test "$SWIG_EXE" = "none"; then
+  AC_MSG_ERROR($missing_program)
+fi
+final_message="$final_message\n  SWIG Available:\tYes"
+
+echo "Checking for a jre installation"
+AC_PATH_PROG(JAVA_EXE, java, "none")
+if test "$JAVE_EXE" = "none"; then
+  AC_MSG_ERROR($missing_program)
+fi
+final_message="$final_message\n  JRE Available:\tYes"
+
+echo "Checking for doxygen installation"
+AC_PATH_PROG(DOXYGEN_EXE, doxygen, "none")
+if test "$DOXYGEN_EXE" = "none"; then
+  AC_MSG_WARN([Unable to find doxygen installation. Will not be able to make docstrings for the python api])
+  final_message="$final_message\n  Doxygen Available:\tNo"
+  USE_DOXYGEN=0
+else
+  final_message="$final_message\n  Doxygen Available:\tYes"
+  USE_DOXYGEN=1
+fi
+
 # VDPAU
 if test "x$use_vdpau" != "xno"; then
   if test "$host_vendor" = "apple" ; then
@@ -2269,8 +2294,6 @@ OUTPUT_FILES="Makefile \
     lib/libid3tag/Makefile \
     lib/cximage-6.0/Makefile \
     lib/addons/script.module.pil/Makefile \
-    xbmc/interfaces/python/Makefile \
-    xbmc/interfaces/python/xbmcmodule/Makefile \
     lib/libUPnP/Makefile \
     xbmc/DllPaths_generated.h \
     xbmc/DllPaths_generated_android.h \
@@ -2301,6 +2324,9 @@ if test "$use_skin_touched" = "yes"; then
 OUTPUT_FILES="$OUTPUT_FILES addons/skin.touched/media/Makefile"
 fi
 
+OUTPUT_FILES="$OUTPUT_FILES \
+  xbmc/interfaces/python/Makefile"
+
 # Line below is used so we can use AM_INIT_AUTOMAKE. The corresponding
 # .dummy.am does nothing.
 AC_CONFIG_FILES([.dummy])
@@ -2362,6 +2388,7 @@ AC_SUBST(USE_UPNP)
 AC_SUBST(USE_OMXLIB)
 AC_SUBST(USE_ANDROID)
 AC_SUBST(GTEST_CONFIGURED)
+AC_SUBST(USE_DOXYGEN)
 
 
 # pushd and popd are not available in other shells besides bash, so implement