Skip to content

Commit

Permalink
[CrossEPG] version 0.7 thanks to Skaman, i still have some stuff to f…
Browse files Browse the repository at this point in the history 
…inish like new scheduler, AUS OpenTV needs testing.
  • Loading branch information
Andy Blackburn committed Nov 1, 2013
1 parent 5cb8e26 commit 6a0d26f
Show file tree
Hide file tree
Showing 85 changed files with 15,264 additions and 2,847 deletions.
61 changes: 38 additions & 23 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ EPGCOPY_OBJS += src/enigma2/crossepg_epgcopy.o
IMPORTER_OBJS += src/common/crossepg_importer.o
EXPORTER_OBJS += src/common/crossepg_exporter.o
XMLTV_OBJS += src/common/crossepg_xmltv.o
DEFRAGMENTER_OBJS += src/common/crossepg_defragmenter.o

CONVERTER_BIN = bin/crossepg_dbconverter
DBINFO_BIN = bin/crossepg_dbinfo
Expand All @@ -39,6 +40,7 @@ EPGCOPY_BIN = bin/crossepg_epgcopy
IMPORTER_BIN = bin/crossepg_importer
EXPORTER_BIN = bin/crossepg_exporter
XMLTV_BIN = bin/crossepg_xmltv
DEFRAGMENTER_BIN = bin/crossepg_defragmenter
SHARED_LIBS = bin/libcrossepg.so

SWIGS_OBJS = src/common/crossepg_wrap.o
Expand All @@ -51,13 +53,13 @@ VERSION=$(shell cat VERSION)

BIN_DIR = bin

FTP_HOST = 172.16.1.139
FTP_HOST = 172.16.1.130
FTP_USER = root
FTP_PASSWORD = sifteam

TARGET_ARCH ?= mips

all: clean $(CONVERTER_BIN) $(DBINFO_BIN) $(DOWNLOADER_BIN) $(EPGCOPY_BIN) $(IMPORTER_BIN) $(EXPORTER_BIN) $(XMLTV_BIN) $(SWIGS_LIBS) $(SHARED_LIBS)
all: clean $(CONVERTER_BIN) $(DBINFO_BIN) $(DOWNLOADER_BIN) $(EPGCOPY_BIN) $(IMPORTER_BIN) $(EXPORTER_BIN) $(XMLTV_BIN) $(DEFRAGMENTER_BIN) $(SWIGS_LIBS) $(SHARED_LIBS)

$(BIN_DIR):
mkdir -p $@
Expand Down Expand Up @@ -91,6 +93,9 @@ $(EXPORTER_OBJS):
$(XMLTV_OBJS):
$(CC) $(CFLAGS) -c -o $@ $(@:.o=.c)

$(DEFRAGMENTER_OBJS):
$(CC) $(CFLAGS) -c -o $@ $(@:.o=.c)

$(SWIGS_LIBS): $(SWIGS_OBJS)
$(CC) $(LDFLAGS) -shared -o $@ $(OBJS) $(SWIGS_OBJS) -lxml2 -lz -lm -lpthread
$(STRIP) $@
Expand Down Expand Up @@ -130,10 +135,14 @@ $(XMLTV_BIN): $(OBJS) $(XMLTV_OBJS)
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(XMLTV_OBJS) -lxml2 -lz -lm -lpthread
$(STRIP) $@

$(DEFRAGMENTER_BIN): $(OBJS) $(DEFRAGMENTER_OBJS)
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(DEFRAGMENTER_OBJS) -lxml2 -lz -lm -lpthread
$(STRIP) $@

clean:
rm -f $(OBJS) $(CONVERTER_OBJS) $(DOWNLOADER_OBJS) $(EPGCOPY_OBJS) $(IMPORTER_OBJS) \
$(EXPORTER_OBJS) $(XMLTV_OBJS) $(DBINFO_OBJS) $(CONVERTER_BIN) $(DBINFO_BIN) $(DOWNLOADER_BIN) \
$(EPGCOPY_BIN) $(IMPORTER_BIN) $(EXPORTER_BIN) $(XMLTV_BIN) $(VERSION_HEADER) \
$(EXPORTER_OBJS) $(XMLTV_OBJS) $(DEFRAGMENTER_OBJS) $(DBINFO_OBJS) $(CONVERTER_BIN) $(DBINFO_BIN) $(DOWNLOADER_BIN) \
$(EPGCOPY_BIN) $(IMPORTER_BIN) $(EXPORTER_BIN) $(XMLTV_BIN) $(DEFRAGMENTER_BIN) $(VERSION_HEADER) \
$(SWIGS_OBJS) $(SWIGS_LIBS) $(SHARED_LIBS)

install-python:
Expand Down Expand Up @@ -169,14 +178,15 @@ install-standalone:
install -d $(D)/usr/crossepg/scripts/rai
install -d $(D)/usr/crossepg/scripts/alias
install -d $(D)/usr/crossepg/scripts/mediaprem
install -d $(D)/usr/crossepg/scripts/mhw2epgdownloader
# install -d $(D)/usr/crossepg/scripts/mhw2epgdownloader
install -m 755 bin/crossepg_dbconverter $(D)/usr/crossepg/
install -m 755 bin/crossepg_dbinfo $(D)/usr/crossepg/
install -m 755 bin/crossepg_downloader $(D)/usr/crossepg/
install -m 755 bin/crossepg_epgcopy $(D)/usr/crossepg/
install -m 755 bin/crossepg_importer $(D)/usr/crossepg/
install -m 755 bin/crossepg_exporter $(D)/usr/crossepg/
install -m 755 bin/crossepg_xmltv $(D)/usr/crossepg/
install -m 755 bin/crossepg_defragmenter $(D)/usr/crossepg/
install -m 644 bin/libcrossepg.so $(D)/usr/crossepg/
install -m 755 contrib/crossepg_epgmove.sh $(D)/usr/crossepg/
install -m 755 contrib/crossepg_prepare_pre_start.sh $(D)/usr/crossepg/
Expand All @@ -187,9 +197,9 @@ install-standalone:
install -m 755 scripts/rai/* $(D)/usr/crossepg/scripts/rai/
install -m 755 scripts/alias/* $(D)/usr/crossepg/scripts/alias/
install -m 755 scripts/mediaprem/* $(D)/usr/crossepg/scripts/mediaprem/
install -m 644 scripts/mhw2epgdownloader/*.conf $(D)/usr/crossepg/scripts/mhw2epgdownloader/
install -m 644 scripts/mhw2epgdownloader/version.txt $(D)/usr/crossepg/scripts/mhw2epgdownloader/
install -m 755 scripts/mhw2epgdownloader/mhw2epgdownloader.$(TARGET_ARCH) $(D)/usr/crossepg/scripts/mhw2epgdownloader/mhw2epgdownloader
# install -m 644 scripts/mhw2epgdownloader/*.conf $(D)/usr/crossepg/scripts/mhw2epgdownloader/
# install -m 644 scripts/mhw2epgdownloader/version.txt $(D)/usr/crossepg/scripts/mhw2epgdownloader/
# install -m 755 scripts/mhw2epgdownloader/mhw2epgdownloader.$(TARGET_ARCH) $(D)/usr/crossepg/scripts/mhw2epgdownloader/mhw2epgdownloader

install-standalone-var:
install -d $(D)/var/crossepg/aliases
Expand All @@ -201,14 +211,15 @@ install-standalone-var:
install -d $(D)/var/crossepg/scripts/alias
install -d $(D)/var/crossepg/scripts/mediaprem
install -d $(D)/var/crossepg/scripts/mediaset
install -d $(D)/var/crossepg/scripts/mhw2epgdownloader
# install -d $(D)/var/crossepg/scripts/mhw2epgdownloader
install -m 755 bin/crossepg_dbconverter $(D)/var/crossepg/
install -m 755 bin/crossepg_dbinfo $(D)/var/crossepg/
install -m 755 bin/crossepg_downloader $(D)/var/crossepg/
install -m 755 bin/crossepg_epgcopy $(D)/var/crossepg/
install -m 755 bin/crossepg_importer $(D)/var/crossepg/
install -m 755 bin/crossepg_exporter $(D)/var/crossepg/
install -m 755 bin/crossepg_xmltv $(D)/var/crossepg/
install -m 755 bin/crossepg_defragmenter $(D)/var/crossepg/
install -m 644 bin/libcrossepg.so $(D)/var/crossepg/
install -m 755 contrib/crossepg_epgmove.sh $(D)/var/crossepg/
install -m 755 contrib/crossepg_prepare_pre_start.sh $(D)/var/crossepg/
Expand All @@ -220,9 +231,9 @@ install-standalone-var:
install -m 755 scripts/alias/* $(D)/var/crossepg/scripts/alias/
install -m 755 scripts/mediaprem/* $(D)/var/crossepg/scripts/mediaprem/
install -m 755 scripts/mediaset/* $(D)/var/crossepg/scripts/mediaset/
install -m 644 scripts/mhw2epgdownloader/*.conf $(D)/var/crossepg/scripts/mhw2epgdownloader/
install -m 644 scripts/mhw2epgdownloader/version.txt $(D)/var/crossepg/scripts/mhw2epgdownloader/
install -m 755 scripts/mhw2epgdownloader/mhw2epgdownloader.$(TARGET_ARCH) $(D)/var/crossepg/scripts/mhw2epgdownloader/mhw2epgdownloader
# install -m 644 scripts/mhw2epgdownloader/*.conf $(D)/var/crossepg/scripts/mhw2epgdownloader/
# install -m 644 scripts/mhw2epgdownloader/version.txt $(D)/var/crossepg/scripts/mhw2epgdownloader/
# install -m 755 scripts/mhw2epgdownloader/mhw2epgdownloader.$(TARGET_ARCH) $(D)/var/crossepg/scripts/mhw2epgdownloader/mhw2epgdownloader

install-plugin:
install -d $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/skins
Expand All @@ -236,6 +247,7 @@ install-plugin:
install -d $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/fa/LC_MESSAGES
install -d $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/es/LC_MESSAGES
install -d $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/sv/LC_MESSAGES
install -d $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/de/LC_MESSAGES
install -m 644 contrib/po/cs/LC_MESSAGES/CrossEPG.mo $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/cs/LC_MESSAGES/
install -m 644 contrib/po/nl/LC_MESSAGES/CrossEPG.mo $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/nl/LC_MESSAGES/
install -m 644 contrib/po/it/LC_MESSAGES/CrossEPG.mo $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/it/LC_MESSAGES/
Expand All @@ -245,6 +257,7 @@ install-plugin:
install -m 644 contrib/po/fa/LC_MESSAGES/CrossEPG.mo $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/fa/LC_MESSAGES/
install -m 644 contrib/po/es/LC_MESSAGES/CrossEPG.mo $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/es/LC_MESSAGES/
install -m 644 contrib/po/sv/LC_MESSAGES/CrossEPG.mo $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/sv/LC_MESSAGES/
install -m 644 contrib/po/de/LC_MESSAGES/CrossEPG.mo $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/de/LC_MESSAGES/
install -m 644 src/enigma2/python/*.py $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/
install -m 644 src/enigma2/python/*.pyo $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/
install -m 644 src/enigma2/python/skins/*.xml $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/skins/
Expand All @@ -260,15 +273,17 @@ install-plugin-qboxhd:
install -d $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/pl/LC_MESSAGES
install -d $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/fa/LC_MESSAGES
install -d $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/es/LC_MESSAGES
install -d $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/sv/LC_MESSAGES
install -d $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/sv/LC_MESSAGES
install -d $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/de/LC_MESSAGES
install -m 644 contrib/po/nl/LC_MESSAGES/CrossEPG.mo $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/nl/LC_MESSAGES/
install -m 644 contrib/po/it/LC_MESSAGES/CrossEPG.mo $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/it/LC_MESSAGES/
install -m 644 contrib/po/uk/LC_MESSAGES/CrossEPG.mo $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/uk/LC_MESSAGES/
install -m 644 contrib/po/ru/LC_MESSAGES/CrossEPG.mo $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/ru/LC_MESSAGES/
install -m 644 contrib/po/pl/LC_MESSAGES/CrossEPG.mo $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/pl/LC_MESSAGES/
install -m 644 contrib/po/fa/LC_MESSAGES/CrossEPG.mo $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/fa/LC_MESSAGES/
install -m 644 contrib/po/es/LC_MESSAGES/CrossEPG.mo $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/es/LC_MESSAGES/
install -m 644 contrib/po/es/LC_MESSAGES/CrossEPG.mo $(D)/usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/sv/LC_MESSAGES/
install -m 644 contrib/po/sv/LC_MESSAGES/CrossEPG.mo $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/sv/LC_MESSAGES/
install -m 644 contrib/po/de/LC_MESSAGES/CrossEPG.mo $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/de/LC_MESSAGES/
install -m 644 src/enigma2/python/*.py $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/
install -m 644 src/enigma2/python/*.pyo $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/
install -m 644 src/enigma2/python/skins/*.xml $(D)/usr/local/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/skins/
Expand All @@ -282,8 +297,8 @@ install-py25: install-python-2.5 install-standalone install-plugin
install-py26: install-python-2.6 install-standalone install-plugin

remote-install:
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/lib/python2.6 src/common/crossepg.py
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/lib/python2.6/lib-dynload bin/_crossepg.so
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/lib/python2.7 src/common/crossepg.py
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/lib/python2.7/lib-dynload bin/_crossepg.so

ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/crossepg bin/crossepg_dbconverter
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/crossepg bin/crossepg_dbinfo
Expand All @@ -292,12 +307,12 @@ remote-install:
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/crossepg bin/crossepg_importer
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/crossepg bin/crossepg_exporter
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/crossepg bin/crossepg_xmltv
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/crossepg bin/crossepg_defragmenter
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/crossepg contrib/crossepg_epgmove.sh

ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/crossepg/providers providers/*
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/crossepg/scripts scripts/*
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/it/LC_MESSAGES contrib/po/it/LC_MESSAGES/CrossEPG.mo
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG src/enigma2/python/*.py
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/skins src/enigma2/python/skins/*.xml
ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/images src/enigma2/python/images/*.png

#ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/crossepg/providers providers/*
#ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/crossepg/scripts scripts/*
#ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/po/it/LC_MESSAGES contrib/po/it/LC_MESSAGES/CrossEPG.mo
#ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG src/enigma2/python/*.py
#ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/skins src/enigma2/python/skins/*.xml
#ncftpput -m -u $(FTP_USER) -p $(FTP_PASSWORD) $(FTP_HOST) /usr/lib/enigma2/python/Plugins/SystemPlugins/CrossEPG/images src/enigma2/python/images/*.png
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.2
0.7.0
Binary file added bin/_crossepg.so
View file
Binary file not shown.
Binary file added bin/crossepg_dbconverter
View file
Binary file not shown.
Binary file added bin/crossepg_dbinfo
View file
Binary file not shown.
Binary file added bin/crossepg_defragmenter
View file
Binary file not shown.
Binary file added bin/crossepg_downloader
View file
Binary file not shown.
Binary file added bin/crossepg_epgcopy
View file
Binary file not shown.
Binary file added bin/crossepg_exporter
View file
Binary file not shown.
Binary file added bin/crossepg_importer
View file
Binary file not shown.
Binary file added bin/crossepg_xmltv
View file
Binary file not shown.
Binary file added bin/libcrossepg.so
View file
Binary file not shown.
Loading

0 comments on commit 6a0d26f

Please sign in to comment.