0.0.6 with new makefile

merge-requests/1/head v0.0.6
Julien Veyssier 2017-05-16 17:36:22 +02:00
parent 5991640392
commit 97bf36c535
2 changed files with 27 additions and 5 deletions

View File

@ -3,10 +3,13 @@
<id>gpxedit</id> <id>gpxedit</id>
<name>GpxEdit</name> <name>GpxEdit</name>
<description> <description>
# GpxEdit owncloud/nextcloud application # GpxEdit Nextcloud application
# GpxEdit Owncloud application
Simple Owncloud/Nextcloud app to load, edit and save GPX files on an interactive map. Simple Nextcloud app to load, edit and save GPX files on an interactive map.
You can load/save files from your Owncloud/Nextcloud file storage. Simple Owncloud app to load, edit and save GPX files on an interactive map.
You can load/save files from your Nextcloud file storage.
You can load/save files from your Owncloud file storage.
GPX, KML, CSV (unicsv format) and geotagged JPG are supported for loading. JPG files are loaded as waypoints. GPX, KML, CSV (unicsv format) and geotagged JPG are supported for loading. JPG files are loaded as waypoints.
There is a file explorer inside the app interface to select a file to load and a folder to save what is currently on the map. There is a file explorer inside the app interface to select a file to load and a folder to save what is currently on the map.

View File

@ -3,24 +3,33 @@ app_version=$(version)
project_dir=$(CURDIR)/../$(app_name) project_dir=$(CURDIR)/../$(app_name)
build_dir=/tmp/build build_dir=/tmp/build
sign_dir=/tmp/sign sign_dir=/tmp/sign
build_dir_own=/tmp/build_own
sign_dir_own=/tmp/sign_own
cert_dir=$(HOME)/.nextcloud/certificates cert_dir=$(HOME)/.nextcloud/certificates
cert_dir_own=$(HOME)/.owncloud/certificates
webserveruser ?= www-data webserveruser ?= www-data
occ_dir ?= /var/www/html/nextcloud occ_dir ?= /var/www/html/nextcloud
occ_dir_own ?= /var/www/html/owncloud
all: appstore all: appstore
clean: clean:
rm -rf $(build_dir) rm -rf $(build_dir)
rm -rf $(build_dir_own)
rm -rf $(sign_dir) rm -rf $(sign_dir)
rm -rf $(sign_dir_own)
appstore: clean appstore: clean
mkdir -p $(sign_dir) mkdir -p $(sign_dir)
mkdir -p $(sign_dir)_own
mkdir -p $(build_dir) mkdir -p $(build_dir)
mkdir -p $(build_dir)_own
rsync -a \ rsync -a \
--exclude=.git \ --exclude=.git \
--exclude=appinfo/signature.json \ --exclude=appinfo/signature.json \
--exclude=*.swp \ --exclude=*.swp \
--exclude=build \ --exclude=build \
--exclude=README.md \
--exclude=.gitignore \ --exclude=.gitignore \
--exclude=.travis.yml \ --exclude=.travis.yml \
--exclude=.scrutinizer.yml \ --exclude=.scrutinizer.yml \
@ -36,10 +45,20 @@ appstore: clean
--exclude=tests \ --exclude=tests \
--exclude=vendor/bin \ --exclude=vendor/bin \
$(project_dir) $(sign_dir) $(project_dir) $(sign_dir)
cp -r $(sign_dir)/$(app_name) $(sign_dir_own)/
# adapt info.xml
sed -i '/[^<][oO]wncloud[^>]/d' $(sign_dir)/$(app_name)/appinfo/info.xml
sed -i '/[nN]extcloud/d' $(sign_dir_own)/$(app_name)/appinfo/info.xml
# give the webserver user the right to create signature file # give the webserver user the right to create signature file
sudo chown $(webserveruser) $(sign_dir)/$(app_name)/appinfo sudo chown $(webserveruser) $(sign_dir)/$(app_name)/appinfo $(sign_dir_own)/$(app_name)/appinfo
sudo -u $(webserveruser) php $(occ_dir)/occ integrity:sign-app --privateKey=$(cert_dir)/$(app_name).key --certificate=$(cert_dir)/$(app_name).crt --path=$(sign_dir)/$(app_name)/ sudo -u $(webserveruser) php $(occ_dir)/occ integrity:sign-app --privateKey=$(cert_dir)/$(app_name).key --certificate=$(cert_dir)/$(app_name).crt --path=$(sign_dir)/$(app_name)/
sudo chown -R $(USER) $(sign_dir)/$(app_name)/appinfo sudo -u $(webserveruser) php $(occ_dir_own)/occ integrity:sign-app --privateKey=$(cert_dir_own)/$(app_name).key --certificate=$(cert_dir_own)/$(app_name).crt --path=$(sign_dir_own)/$(app_name)/
sudo chown -R $(USER) $(sign_dir)/$(app_name)/appinfo $(sign_dir_own)/$(app_name)/appinfo
tar -czf $(build_dir)/$(app_name)-$(app_version).tar.gz \ tar -czf $(build_dir)/$(app_name)-$(app_version).tar.gz \
-C $(sign_dir) $(app_name) -C $(sign_dir) $(app_name)
tar -czf $(build_dir_own)/$(app_name)-$(app_version).tar.gz \
-C $(sign_dir_own) $(app_name)
echo NEXTCLOUD------------------------------------------
openssl dgst -sha512 -sign $(cert_dir)/$(app_name).key $(build_dir)/$(app_name)-$(app_version).tar.gz | openssl base64 openssl dgst -sha512 -sign $(cert_dir)/$(app_name).key $(build_dir)/$(app_name)-$(app_version).tar.gz | openssl base64
echo OWNCLOUD-------------------------------------------
openssl dgst -sha512 -sign $(cert_dir_own)/$(app_name).key $(build_dir_own)/$(app_name)-$(app_version).tar.gz | openssl base64