2.0.0-beta1
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv)
parent
f4ffbe92f2
commit
d3e07ba15c
92
Makefile
92
Makefile
|
|
@ -9,16 +9,14 @@
|
|||
# * npm
|
||||
# * curl: used if phpunit and composer are not installed to fetch them from the web
|
||||
# * tar: for building the archive
|
||||
app_name=forms
|
||||
|
||||
project_dir=$(CURDIR)
|
||||
build_dir=$(CURDIR)/build
|
||||
build_tools_dir=$(build_dir)/tools
|
||||
build_source_dir=$(build_dir)/source
|
||||
appstore_build_dir=$(build_dir)/artifacts/appstore
|
||||
appstore_package_name=$(appstore_build_dir)/$(app_name)
|
||||
nc_cert_dir=$(HOME)/.nextcloud/certificates
|
||||
composer=$(shell which composer 2> /dev/null)
|
||||
app_name=$(notdir $(CURDIR))
|
||||
project_directory=$(CURDIR)/../$(app_name)
|
||||
build_tools_directory=$(CURDIR)/build/tools
|
||||
source_build_directory=$(CURDIR)/build/artifacts/source
|
||||
source_package_name=$(source_build_directory)/$(app_name)
|
||||
appstore_build_directory=$(CURDIR)/build/artifacts/appstore
|
||||
appstore_package_name=$(appstore_build_directory)/$(app_name)
|
||||
|
||||
all: dev-setup lint build-js-production test
|
||||
|
||||
|
|
@ -27,11 +25,11 @@ all: dev-setup lint build-js-production test
|
|||
composer:
|
||||
ifeq (,$(composer))
|
||||
@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
|
||||
mv composer.phar $(build_tools_dir)
|
||||
php $(build_tools_dir)/composer.phar install --prefer-dist
|
||||
php $(build_tools_dir)/composer.phar update --prefer-dist
|
||||
mv composer.phar $(build_tools_directory)
|
||||
php $(build_tools_directory)/composer.phar install --prefer-dist
|
||||
php $(build_tools_directory)/composer.phar update --prefer-dist
|
||||
else
|
||||
composer install --prefer-dist
|
||||
composer update --prefer-dist
|
||||
|
|
@ -41,7 +39,7 @@ endif
|
|||
dev-setup: clean clean-dev composer npm-init
|
||||
|
||||
npm-init:
|
||||
npm install
|
||||
npm ci
|
||||
|
||||
npm-update:
|
||||
npm update
|
||||
|
|
@ -73,59 +71,31 @@ stylelint-fix:
|
|||
# Cleaning
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -rf $(build_dir)
|
||||
rm -rf js/chunks
|
||||
rm -f js/forms.js
|
||||
rm -f js/forms.js.map
|
||||
rm -rf js/
|
||||
|
||||
clean-dev:
|
||||
rm -rf node_modules
|
||||
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
|
||||
test: composer
|
||||
$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.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>
|
||||
<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>
|
||||
<version>1.2.0</version>
|
||||
<version>2.0.0-beta1</version>
|
||||
<licence>agpl</licence>
|
||||
|
||||
<author>Vinzenz Rosenkranz</author>
|
||||
<author>René Gieling</author>
|
||||
<author>Kai Schröer</author>
|
||||
|
|
@ -18,22 +19,27 @@
|
|||
<author>Tim Sattizahn</author>
|
||||
<author>Stephan Link</author>
|
||||
<author>Kameron Sheppard</author>
|
||||
<documentation>
|
||||
<admin>https://github.com/nextcloud/forms/blob/master/README.md</admin>
|
||||
</documentation>
|
||||
|
||||
<category>tools</category>
|
||||
<category>social</category>
|
||||
<category>organization</category>
|
||||
|
||||
<website>https://github.com/nextcloud/forms</website>
|
||||
<bugs>https://github.com/nextcloud/forms/issues</bugs>
|
||||
<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/List.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>
|
||||
|
||||
<dependencies>
|
||||
<nextcloud min-version="17" max-version="19" />
|
||||
</dependencies>
|
||||
|
||||
<navigations>
|
||||
<navigation>
|
||||
<name>Forms</name>
|
||||
|
|
|
|||
2
package-lock.json
generated
2
package-lock.json
generated
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "forms",
|
||||
"version": "1.2.0",
|
||||
"version": "2.0.0-beta1",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "forms",
|
||||
"description": "Forms app for nextcloud",
|
||||
"version": "1.2.0",
|
||||
"version": "2.0.0-beta1",
|
||||
"authors": [
|
||||
{
|
||||
"name": "Vinzenz Rosenkranz",
|
||||
|
|
@ -56,7 +56,6 @@
|
|||
"homepage": "https://github.com/nextcloud/forms#readme",
|
||||
"license": "AGPL-3.0",
|
||||
"private": true,
|
||||
"main": "src/js/main.js",
|
||||
"scripts": {
|
||||
"build": "NODE_ENV=production webpack --progress --hide-modules --config webpack.prod.js",
|
||||
"dev": "NODE_ENV=development webpack --progress --config webpack.dev.js",
|
||||
|
|
|
|||
Loading…
Reference in a new issue