split addon gui for skin and binary addons

6 files changed, 67 insertions, 32 deletions

diff --git a/lib/addons/library.kodi.guilib/Makefile.in b/lib/addons/library.kodi.guilib/Makefile.in
new file mode 100644
index 0000000000..347f540320
--- /dev/null
+++ b/lib/addons/library.kodi.guilib/Makefile.in
@@ -0,0 +1,34 @@
+ARCH=@ARCH@
+INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers
+DEFINES+=
+CXXFLAGS=-fPIC
+LIBNAME=libKODI_guilib
+OBJS=$(LIBNAME).o
+
+LIB_INTERFACE=../../../addons/library.kodi.guilib/libKODI_guilib.h
+LIB_SHARED=../../../addons/library.kodi.guilib/$(LIBNAME)-$(ARCH).so
+GENERATED_ADDON_GUILIB = ../../../addons/kodi.guilib/addon.xml
+LIB_VERSION := $(shell sed -n 's/.*KODI_GUILIB_API_VERSION\s*"\(.*\)"/\1/p' $(LIB_INTERFACE))
+LIB_VERSION_MIN := $(shell sed -n 's/.*KODI_GUILIB_MIN_API_VERSION\s*"\(.*\)"/\1/p' $(LIB_INTERFACE))
+
+all: $(LIB_SHARED) $(GENERATED_ADDON_GUILIB)
+
+$(LIB_SHARED): $(OBJS) $(LIB_INTERFACE)
+ifeq ($(findstring osx,$(ARCH)), osx)
+	$(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+	-bundle -undefined dynamic_lookup -o $@ \
+	@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS)
+else
+	$(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS)
+endif
+
+$(GENERATED_ADDON_GUILIB) : $(LIB_INTERFACE)
+	sed -e s/@guilib_version@/$(LIB_VERSION)/g -e s/@guilib_version_min@/$(LIB_VERSION_MIN)/g $@.in > $@
+
+CLEAN_FILES = \
+	$(LIB_SHARED) \
+
+DISTCLEAN_FILES= \
+	Makefile \
+
+include ../../../Makefile.include
diff --git a/lib/addons/library.xbmc.gui/libXBMC_gui.cpp b/lib/addons/library.kodi.guilib/libKODI_guilib.cpp
index b7fb237069..42ede0a99e 100644
--- a/lib/addons/library.xbmc.gui/libXBMC_gui.cpp
+++ b/lib/addons/library.kodi.guilib/libKODI_guilib.cpp
@@ -18,10 +18,11 @@
  *
  */
 
+#include "../../../addons/library.kodi.guilib/libKODI_guilib.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
-#include "../../../addons/library.xbmc.gui/libXBMC_gui.h"
 #include "addons/AddonCallbacks.h"
 
 #ifdef _WIN32
diff --git a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj b/lib/addons/library.kodi.guilib/project/VS2010Express/libKODI_guilib.vcxproj
index 7c5197f3d4..b991f16040 100644
--- a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj
+++ b/lib/addons/library.kodi.guilib/project/VS2010Express/libKODI_guilib.vcxproj
@@ -10,6 +10,9 @@
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\libKODI_guilib.cpp" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectGuid>
     <RootNamespace>XBMC_VDR</RootNamespace>
@@ -59,6 +62,9 @@
     <Link>
       <OutputFile>..\..\..\..\..\addons\library.xbmc.gui\$(ProjectName).dll</OutputFile>
     </Link>
+    <PostBuildEvent>
+      <Command>powershell -ExecutionPolicy ByPass  -File $(ProjectDir)\post-build.ps1 $(ProjectDir)</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -71,10 +77,10 @@
     <Link>
       <OutputFile>../../../../../addons/library.xbmc.gui/$(ProjectName).dll</OutputFile>
     </Link>
+    <PostBuildEvent>
+      <Command>powershell -ExecutionPolicy ByPass  -File $(ProjectDir)\post-build.ps1 $(ProjectDir)</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libXBMC_gui.cpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj.filters b/lib/addons/library.kodi.guilib/project/VS2010Express/libKODI_guilib.vcxproj.filters
index 166719621f..e823d63633 100644
--- a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj.filters
+++ b/lib/addons/library.kodi.guilib/project/VS2010Express/libKODI_guilib.vcxproj.filters
@@ -11,7 +11,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\libXBMC_gui.cpp">
+    <ClCompile Include="..\..\libKODI_guilib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/lib/addons/library.kodi.guilib/project/VS2010Express/post-build.ps1 b/lib/addons/library.kodi.guilib/project/VS2010Express/post-build.ps1
new file mode 100644
index 0000000000..c82f4f3e10
--- /dev/null
+++ b/lib/addons/library.kodi.guilib/project/VS2010Express/post-build.ps1
@@ -0,0 +1,21 @@
+param (
+[string]$ProjectDir
+)
+
+$LIB_INTERFACE = "$ProjectDir\..\..\..\..\..\addons\library.kodi.guilib\libKODI_guilib.h"
+$GENERATED_ADDON_GUILIB = "$ProjectDir\..\..\..\..\..\addons\kodi.guilib\addon.xml"
+
+$LIB_VERSION = ""
+$LIB_VERSION_MIN = ""
+cat $LIB_INTERFACE | %{
+if ($_ -match 'KODI_GUILIB_API_VERSION\s*"(.*)"'){
+    $LIB_VERSION = $matches[1]
+    }
+if ($_ -match 'KODI_GUILIB_MIN_API_VERSION\s*"(.*)"'){
+    $LIB_VERSION_MIN = $matches[1]
+    }
+}
+
+$ADDON_GUILIB = $GENERATED_ADDON_GUILIB + ".in"
+cat $ADDON_GUILIB | % { $_ -replace "@guilib_version@", $LIB_VERSION `
+                           -replace "@guilib_version_min@", $LIB_VERSION_MIN} > $GENERATED_ADDON_GUILIB
\ No newline at end of file
diff --git a/lib/addons/library.xbmc.gui/Makefile.in b/lib/addons/library.xbmc.gui/Makefile.in
deleted file mode 100644
index 8a75239d46..0000000000
--- a/lib/addons/library.xbmc.gui/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-ARCH=@ARCH@
-INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers
-DEFINES+=
-CXXFLAGS=-fPIC
-LIBNAME=libXBMC_gui
-OBJS=$(LIBNAME).o
-
-LIB_SHARED=../../../addons/library.xbmc.gui/$(LIBNAME)-$(ARCH).so
-
-all: $(LIB_SHARED)
-
-$(LIB_SHARED): $(OBJS)
-ifeq ($(findstring osx,$(ARCH)), osx)
-	$(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
-	-bundle -undefined dynamic_lookup -o $@ \
-	@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS)
-else
-	$(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS)
-endif
-
-CLEAN_FILES = \
-	$(LIB_SHARED) \
-
-DISTCLEAN_FILES= \
-	Makefile \
-
-include ../../../Makefile.include