From 8cbfe06dd9d83fab60dee02310309d52c430b240 Mon Sep 17 00:00:00 2001 From: ppaulis Date: Thu, 6 Oct 2016 11:19:13 +0200 Subject: [PATCH] working on setup --- build.properties | 12 ++++ build.xml | 106 ++++++++++++++++++++++++++++++ composer.json | 17 ++++- package.json | 6 +- package.json.continuousphp | 20 ++++++ scripts/compile_translations.sh | 11 ++-- scripts/link_modules_resources.sh | 4 +- 7 files changed, 164 insertions(+), 12 deletions(-) create mode 100644 build.properties create mode 100644 build.xml create mode 100644 package.json.continuousphp diff --git a/build.properties b/build.properties new file mode 100644 index 0000000..2016378 --- /dev/null +++ b/build.properties @@ -0,0 +1,12 @@ +version=0.1.0 +author.name=Pascal Paulis +author.email=pascal.paulis@continuousphp.com + +db.host=localhost +db.name=monarc +db.username=dbuser +db.password=123 + +dir.bin=./bin + +phinx.bin=${dir.bin}/phinx \ No newline at end of file diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..eaa1cfd --- /dev/null +++ b/build.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DROP DATABASE IF EXISTS `${db.name}`; + + + + + + + + + + CREATE DATABASE IF NOT EXISTS ${db.name}; + GRANT USAGE ON *.* TO '${db.username}'@'%' IDENTIFIED BY '${db.password}'; + GRANT UPDATE,CREATE,REFERENCES,ALTER,LOCK TABLES,CREATE VIEW,CREATE + ROUTINE,TRIGGER,INSERT,DELETE,DROP,INDEX,CREATE TEMPORARY TABLES,EXECUTE,SHOW VIEW,ALTER ROUTINE,SELECT ON + `${db.name}`.* TO '${db.username}'@'%'; + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/composer.json b/composer.json index 865f6ce..42f7f30 100644 --- a/composer.json +++ b/composer.json @@ -12,9 +12,22 @@ "php": ">=5.5", "zendframework/zendframework": "2.5.3", "doctrine/doctrine-orm-module": "^0.10", - "robmorgan/phinx": "0.5.*" + "robmorgan/phinx": "0.5.*", + "monarc/core": "dev-beta", + "monarc/backoffice": "dev-beta", + "phing/phing": "~2.0" }, "config": { "bin-dir": "bin/" - } + }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/CASES-LU/zm-core" + }, + { + "type": "vcs", + "url": "https://github.com/CASES-LU/zm-backoffice" + } + ] } diff --git a/package.json b/package.json index 6495a18..e2caecc 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,12 @@ }, "author": "Netlor", "license": "Copyright", + "dependencies": { + "ng_anr": "git+ssh://git@github.com/CASES-LU/ng_anr#beta", + "ng_backoffice": "git+ssh://git@github.com/CASES-LU/ng_backoffice#beta" + }, "devDependencies": { "grunt": "~0.4.1", "grunt-cli": "~0.1.13" } -} +} \ No newline at end of file diff --git a/package.json.continuousphp b/package.json.continuousphp new file mode 100644 index 0000000..fe78126 --- /dev/null +++ b/package.json.continuousphp @@ -0,0 +1,20 @@ +{ + "name": "MONARC", + "version": "1.0.0", + "description": "MONARC Skeleton App", + "private": true, + "repository": { + "type": "git", + "url": "https://github.com/CASES-LU/skeleton.git" + }, + "author": "Netlor", + "license": "Copyright", + "dependencies": { + "ng_anr": "git+https://@github.token@:x-oauth-basic@github.com/CASES-LU/ng-anr#beta", + "ng_backoffice": "git+https://@github.token@:x-oauth-basic@github.com/CASES-LU/ng-backoffice#beta" + }, + "devDependencies": { + "grunt": "~0.4.1", + "grunt-cli": "~0.1.13" + } +} \ No newline at end of file diff --git a/scripts/compile_translations.sh b/scripts/compile_translations.sh index 83525d3..2de3e76 100755 --- a/scripts/compile_translations.sh +++ b/scripts/compile_translations.sh @@ -1,16 +1,13 @@ #!/bin/bash -pwd - if [ -d node_modules/ng_backoffice ]; then pushd node_modules/ng_backoffice - node_modules/.bin/grunt compile_translations - node_modules/.bin/grunt concat + ../.bin/grunt compile_translations + ../.bin/grunt concat fi - if [ -d node_modules/ng_client ]; then pushd node_modules/ng_client - node_modules/.bin/grunt compile_translations - node_modules/.bin/grunt concat + ../.bin/grunt compile_translations + ../.bin/grunt concat fi diff --git a/scripts/link_modules_resources.sh b/scripts/link_modules_resources.sh index 5a7c03c..cfbadc4 100755 --- a/scripts/link_modules_resources.sh +++ b/scripts/link_modules_resources.sh @@ -59,7 +59,7 @@ if [ -d node_modules/ng_backoffice ]; then cd ../.. pushd node_modules/ng_backoffice - node_modules/.bin/grunt concat + ../.bin/grunt concat popd fi @@ -90,7 +90,7 @@ if [ -d node_modules/ng_client ]; then cd ../.. pushd node_modules/ng_client - node_modules/.bin/grunt concat + ../.bin/grunt concat popd fi