Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2020-04-29 09:12:50 +02:00
Родитель f4ffbe92f2
Коммит d3e07ba15c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 60C25B8C072916CF
4 изменённых файлов: 43 добавлений и 68 удалений

Просмотреть файл

@ -9,16 +9,14 @@
# * npm # * npm
# * curl: used if phpunit and composer are not installed to fetch them from the web # * curl: used if phpunit and composer are not installed to fetch them from the web
# * tar: for building the archive # * tar: for building the archive
app_name=forms
project_dir=$(CURDIR) app_name=$(notdir $(CURDIR))
build_dir=$(CURDIR)/build project_directory=$(CURDIR)/../$(app_name)
build_tools_dir=$(build_dir)/tools build_tools_directory=$(CURDIR)/build/tools
build_source_dir=$(build_dir)/source source_build_directory=$(CURDIR)/build/artifacts/source
appstore_build_dir=$(build_dir)/artifacts/appstore source_package_name=$(source_build_directory)/$(app_name)
appstore_package_name=$(appstore_build_dir)/$(app_name) appstore_build_directory=$(CURDIR)/build/artifacts/appstore
nc_cert_dir=$(HOME)/.nextcloud/certificates appstore_package_name=$(appstore_build_directory)/$(app_name)
composer=$(shell which composer 2> /dev/null)
all: dev-setup lint build-js-production test all: dev-setup lint build-js-production test
@ -27,11 +25,11 @@ all: dev-setup lint build-js-production test
composer: composer:
ifeq (,$(composer)) ifeq (,$(composer))
@echo "No composer command available, downloading a copy from the web" @echo "No composer command available, downloading a copy from the web"
mkdir -p $(build_tools_dir) mkdir -p $(build_tools_directory)
curl -sS https://getcomposer.org/installer | php curl -sS https://getcomposer.org/installer | php
mv composer.phar $(build_tools_dir) mv composer.phar $(build_tools_directory)
php $(build_tools_dir)/composer.phar install --prefer-dist php $(build_tools_directory)/composer.phar install --prefer-dist
php $(build_tools_dir)/composer.phar update --prefer-dist php $(build_tools_directory)/composer.phar update --prefer-dist
else else
composer install --prefer-dist composer install --prefer-dist
composer update --prefer-dist composer update --prefer-dist
@ -41,7 +39,7 @@ endif
dev-setup: clean clean-dev composer npm-init dev-setup: clean clean-dev composer npm-init
npm-init: npm-init:
npm install npm ci
npm-update: npm-update:
npm update npm update
@ -73,59 +71,31 @@ stylelint-fix:
# Cleaning # Cleaning
.PHONY: clean .PHONY: clean
clean: clean:
rm -rf $(build_dir) rm -rf js/
rm -rf js/chunks
rm -f js/forms.js
rm -f js/forms.js.map
clean-dev: clean-dev:
rm -rf node_modules rm -rf node_modules
rm -rf vendor rm -rf vendor
# Builds the source package for the app store, ignores php and js tests
.PHONY: appstore
appstore: clean lint build-js-production
mkdir -p $(build_source_dir)
mkdir -p $(appstore_build_dir)
rsync -a \
--exclude="ISSUE_TEMPLATE.md" \
--exclude="*.log" \
--exclude=".*" \
--exclude="_*" \
--exclude="build" \
--exclude="bower.json" \
--exclude="composer.*" \
--exclude="js/.*" \
--exclude="js/*.log" \
--exclude="js/bower.json" \
--exclude="js/karma.*" \
--exclude="js/node_modules" \
--exclude="js/package.json" \
--exclude="js/protractor.*" \
--exclude="js/test" \
--exclude="js/tests" \
--exclude="karma.*" \
--exclude="l10n/no-php" \
--exclude="Makefile" \
--exclude="node_modules" \
--exclude="package*" \
--exclude="phpunit*xml" \
--exclude="protractor.*" \
--exclude="screenshots" \
--exclude="src" \
--exclude="tests" \
--exclude="vendor" \
--exclude="webpack.*" \
$(project_dir)/ $(build_source_dir)/$(app_name)
tar -czf $(appstore_package_name).tar.gz \
--directory="$(build_source_dir)" $(app_name)
@if [ -f $(nc_cert_dir)/$(app_name).key ]; then \
echo "Signing package..."; \
openssl dgst -sha512 -sign $(nc_cert_dir)/$(app_name).key $(appstore_build_dir)/$(app_name).tar.gz | openssl base64; \
fi
.PHONY: test .PHONY: test
test: composer test: composer
$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml $(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml
$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml $(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
# Builds the source package for the app store, ignores php and js tests
.PHONY: appstore
appstore:
rm -rf $(appstore_build_directory)
mkdir -p $(appstore_build_directory)
tar cvzf $(appstore_package_name).tar.gz \
--exclude-vcs \
$(project_directory)/appinfo \
$(project_directory)/css \
$(project_directory)/img \
$(project_directory)/l10n \
$(project_directory)/lib \
$(project_directory)/templates \
$(project_directory)/js \
$(project_directory)/COPYING \
$(project_directory)/CHANGELOG.md

Просмотреть файл

@ -5,8 +5,9 @@
<name>Forms</name> <name>Forms</name>
<summary>A forms app, similar to Google Forms.</summary> <summary>A forms app, similar to Google Forms.</summary>
<description>A forms app, similar to Google Forms with the possibility to restrict access (members, certain groups/users, and public).</description> <description>A forms app, similar to Google Forms with the possibility to restrict access (members, certain groups/users, and public).</description>
<version>1.2.0</version> <version>2.0.0-beta1</version>
<licence>agpl</licence> <licence>agpl</licence>
<author>Vinzenz Rosenkranz</author> <author>Vinzenz Rosenkranz</author>
<author>René Gieling</author> <author>René Gieling</author>
<author>Kai Schröer</author> <author>Kai Schröer</author>
@ -18,22 +19,27 @@
<author>Tim Sattizahn</author> <author>Tim Sattizahn</author>
<author>Stephan Link</author> <author>Stephan Link</author>
<author>Kameron Sheppard</author> <author>Kameron Sheppard</author>
<documentation>
<admin>https://github.com/nextcloud/forms/blob/master/README.md</admin>
</documentation>
<category>tools</category> <category>tools</category>
<category>social</category> <category>social</category>
<category>organization</category> <category>organization</category>
<website>https://github.com/nextcloud/forms</website> <website>https://github.com/nextcloud/forms</website>
<bugs>https://github.com/nextcloud/forms/issues</bugs> <bugs>https://github.com/nextcloud/forms/issues</bugs>
<repository type="git">https://github.com/nextcloud/forms</repository> <repository type="git">https://github.com/nextcloud/forms</repository>
<documentation>
<admin>https://github.com/nextcloud/forms/blob/master/README.md</admin>
</documentation>
<screenshot>https://raw.githubusercontent.com/nextcloud/forms/master/screenshots/Create.PNG</screenshot> <screenshot>https://raw.githubusercontent.com/nextcloud/forms/master/screenshots/Create.PNG</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/forms/master/screenshots/List.PNG</screenshot> <screenshot>https://raw.githubusercontent.com/nextcloud/forms/master/screenshots/List.PNG</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/forms/master/screenshots/Vote.PNG</screenshot> <screenshot>https://raw.githubusercontent.com/nextcloud/forms/master/screenshots/Vote.PNG</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/forms/master/screenshots/Results.PNG</screenshot> <screenshot>https://raw.githubusercontent.com/nextcloud/forms/master/screenshots/Results.PNG</screenshot>
<dependencies> <dependencies>
<nextcloud min-version="17" max-version="19" /> <nextcloud min-version="17" max-version="19" />
</dependencies> </dependencies>
<navigations> <navigations>
<navigation> <navigation>
<name>Forms</name> <name>Forms</name>

2
package-lock.json сгенерированный
Просмотреть файл

@ -1,6 +1,6 @@
{ {
"name": "forms", "name": "forms",
"version": "1.2.0", "version": "2.0.0-beta1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

Просмотреть файл

@ -1,7 +1,7 @@
{ {
"name": "forms", "name": "forms",
"description": "Forms app for nextcloud", "description": "Forms app for nextcloud",
"version": "1.2.0", "version": "2.0.0-beta1",
"authors": [ "authors": [
{ {
"name": "Vinzenz Rosenkranz", "name": "Vinzenz Rosenkranz",
@ -56,7 +56,6 @@
"homepage": "https://github.com/nextcloud/forms#readme", "homepage": "https://github.com/nextcloud/forms#readme",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"private": true, "private": true,
"main": "src/js/main.js",
"scripts": { "scripts": {
"build": "NODE_ENV=production webpack --progress --hide-modules --config webpack.prod.js", "build": "NODE_ENV=production webpack --progress --hide-modules --config webpack.prod.js",
"dev": "NODE_ENV=development webpack --progress --config webpack.dev.js", "dev": "NODE_ENV=development webpack --progress --config webpack.dev.js",