NB-Public/WolKal3000
Archived
11
1
Fork 0
Code Issues Pull requests Releases 2 Wiki Activity

changing icalparser integration and package building

Browse source
This commit is contained in:
Harald Milz 2019-03-27 09:34:41 +01:00
parent 6165de6085
commit fe907ad683
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Makefile
View file

@ -2,18 +2,26 @@
NAME = kal3000-gcal-import
ICALPARSER = icalparser
INSTALLDIR = /usr/share/wordpress/wp-content/plugins/$(NAME)
SSHACCOUNT = root@ubuntu1804
VERSION = 0.1.0
release:
( cd .. ; zip -9 -r $(NAME)-$(VERSION).zip $(ICALPARSER)/readme.md $(ICALPARSER)/src/* $(ICALPARSER)/tools/* $(NAME)/*.php $(NAME)/*.txt)
install:
mkdir -p $(INSTALLDIR)
cp -vu *.txt *.php $(INSTALLDIR)
chown -R www-data:www-data $(INSTALLDIR)
# Make sure we always ship the latest icalparser version
icalparser:
if [ -d icalparser ] ; then \
cd icalparser && git pull ; \
else \
git clone https://github.com/OzzyCzech/icalparser ; \
fi
release: icalparser
cd .. ; \
zip -9 -r $(NAME)-$(VERSION).zip $(NAME)/$(ICALPARSER)/readme.md $(NAME)/$(ICALPARSER)/src/* $(NAME)/$(ICALPARSER)/tools/* $(NAME)/*.php $(NAME)/readme.* $(NAME)/README.*
install: icalparser
rsync --delete -C -av ./ $(SSHACCOUNT):$(INSTALLDIR)
ssh $(SSHACCOUNT) chown -R www-data:www-data $(INSTALLDIR)

8
gcal-import-worker.php
View file

@ -201,10 +201,10 @@ function gcal_import_do_import($category, $link) {
error_log ("entering gcal_import_do_import($category, $link)");
require_once dirname (__FILE__) . '/../icalparser/src/IcalParser.php';
require_once dirname (__FILE__) . '/../icalparser/src/Recurrence.php';
require_once dirname (__FILE__) . '/../icalparser/src/Freq.php';
require_once dirname (__FILE__) . '/../icalparser/src/WindowsTimezones.php';
require_once dirname (__FILE__) . '/icalparser/src/IcalParser.php';
require_once dirname (__FILE__) . '/icalparser/src/Recurrence.php';
require_once dirname (__FILE__) . '/icalparser/src/Freq.php';
require_once dirname (__FILE__) . '/icalparser/src/WindowsTimezones.php';
$cal = new \om\IcalParser();
$results = $cal->parseFile($link);