diff --git a/.travis.yml b/.travis.yml index 3ef4b80..ad7e547 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: haxe # haxe versions : http://haxe.org/website-content/downloads/versions.json haxe: - - "3.4.0" + - "3.4.7" - development matrix: @@ -20,7 +20,7 @@ env: before_install: - echo $TRAVIS_BRANCH - - if [[ "$TRAVIS_BRANCH" != "master" ]]; then export DEPENDENCIES_BRANCH=develop; else export DEPENDENCIES_BRANCH=master; fi + - if [[ "$TRAVIS_BRANCH" != "master" ]]; then export DEPENDENCIES_BRANCH=$TRAVIS_BRANCH; else export DEPENDENCIES_BRANCH=master; fi - echo $TRAVIS_TAG - if [[ "$TRAVIS_TAG" != "" ]]; then export DEPENDENCIES_BRANCH=$TRAVIS_TAG; fi - echo $DEPENDENCIES_BRANCH @@ -35,44 +35,50 @@ before_install: - sudo apt-get install -qq libxcursor1:i386 - sudo apt-get install -qq libnss3:i386 - sudo apt-get install -qq libgtk2.0-0:i386 - + install: - - haxelib newrepo -#hexLog + - export BRANCH_REF=$DEPENDENCIES_BRANCH +# hexLog + - if [[ $( git ls-remote https://github.com/DoclerLabs/hexLog.git $DEPENDENCIES_BRANCH | wc -l ) == "0" ]]; then export DEPENDENCIES_BRANCH=develop; else export DEPENDENCIES_BRANCH=$BRANCH_REF; fi + - echo Checking out $DEPENDENCIES_BRANCH - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexLog.git ~/hexlog - haxelib dev hexlog ~/hexlog -#hexCore +# hexCore + - if [[ $( git ls-remote https://github.com/DoclerLabs/hexCore.git $DEPENDENCIES_BRANCH | wc -l ) == "0" ]]; then export DEPENDENCIES_BRANCH=develop; else export DEPENDENCIES_BRANCH=$BRANCH_REF; fi + - echo Checking out $DEPENDENCIES_BRANCH - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexCore.git ~/hexcore + - haxelib install ~/hexcore/haxelib.json --always - haxelib dev hexcore ~/hexcore -#hexUnit +# hexUnit + - if [[ $( git ls-remote https://github.com/DoclerLabs/hexUnit.git $DEPENDENCIES_BRANCH | wc -l ) == "0" ]]; then export DEPENDENCIES_BRANCH=develop; else export DEPENDENCIES_BRANCH=$BRANCH_REF; fi + - echo Checking out $DEPENDENCIES_BRANCH - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexUnit.git ~/hexunit - haxelib dev hexunit ~/hexunit -#hexReflection +# hexReflection + - if [[ $( git ls-remote https://github.com/DoclerLabs/hexReflection.git $DEPENDENCIES_BRANCH | wc -l ) == "0" ]]; then export DEPENDENCIES_BRANCH=develop; else export DEPENDENCIES_BRANCH=$BRANCH_REF; fi + - echo Checking out $DEPENDENCIES_BRANCH - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexReflection.git ~/hexreflection - haxelib dev hexreflection ~/hexreflection -#hexAnnotation +# hexAnnotation + - if [[ $( git ls-remote https://github.com/DoclerLabs/hexAnnotation.git $DEPENDENCIES_BRANCH | wc -l ) == "0" ]]; then export DEPENDENCIES_BRANCH=develop; else export DEPENDENCIES_BRANCH=$BRANCH_REF; fi + - echo Checking out $DEPENDENCIES_BRANCH - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexAnnotation.git ~/hexannotation - haxelib dev hexannotation ~/hexannotation -#hexInject +# hexInject + - if [[ $( git ls-remote https://github.com/DoclerLabs/hexInject.git $DEPENDENCIES_BRANCH | wc -l ) == "0" ]]; then export DEPENDENCIES_BRANCH=develop; else export DEPENDENCIES_BRANCH=$BRANCH_REF; fi + - echo Checking out $DEPENDENCIES_BRANCH - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexInject.git ~/hexinject - haxelib dev hexinject ~/hexinject -#hexDSL - - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexDSL.git ~/hexdsl +# hexDsl + - if [[ $( git ls-remote https://github.com/DoclerLabs/hexDsl.git $DEPENDENCIES_BRANCH | wc -l ) == "0" ]]; then export DEPENDENCIES_BRANCH=develop; else export DEPENDENCIES_BRANCH=$BRANCH_REF; fi + - echo Checking out $DEPENDENCIES_BRANCH + - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexDsl.git ~/hexdsl - haxelib dev hexdsl ~/hexdsl -#hexMVC - - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexMVC.git ~/hexmvc - - haxelib dev hexmvc ~/hexmvc -#hexService - - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexService.git ~/hexservice - - haxelib dev hexservice ~/hexservice -#hexState - - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexState.git ~/hexstate - - haxelib dev hexstate ~/hexstate -#hexIoC - - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexIoC.git ~/hexioc - - haxelib dev hexioc ~/hexioc -#tink_macro - - haxelib install tink_macro 0.16.1 +# hexCommand + - if [[ $( git ls-remote https://github.com/DoclerLabs/hexCommand.git $DEPENDENCIES_BRANCH | wc -l ) == "0" ]]; then export DEPENDENCIES_BRANCH=develop; else export DEPENDENCIES_BRANCH=$BRANCH_REF; fi + - echo Checking out $DEPENDENCIES_BRANCH + - git clone --recursive -b $DEPENDENCIES_BRANCH https://github.com/DoclerLabs/hexCommand.git ~/hexcommand + - haxelib dev hexcommand ~/hexcommand #hexMachina - haxelib dev hexmachina . #---- dependencies done ---- @@ -94,7 +100,7 @@ script: - haxe build-flash.hxml -D fdb && haxe flash/run.hxml bin/MainTest.swf before_deploy: -- if [ $TRAVIS_HAXE_VERSION == "3.4.0" ]; then ./.travis/pre-deploy.sh; fi +- if [ $TRAVIS_HAXE_VERSION == "3.4.7" ]; then ./.travis/pre-deploy.sh; fi deploy: provider: releases @@ -110,7 +116,7 @@ deploy: tags: true after_deploy: -- if [ $TRAVIS_HAXE_VERSION == "3.4.0" ]; then ./.travis/post-deploy.sh; fi +- if [ $TRAVIS_HAXE_VERSION == "3.4.7" ]; then ./.travis/post-deploy.sh; fi notifications: email: diff --git a/.travis/make-documentation.sh b/.travis/make-documentation.sh index fdeb147..68080d0 100644 --- a/.travis/make-documentation.sh +++ b/.travis/make-documentation.sh @@ -1,11 +1,11 @@ #!/bin/bash cd $HOME -#Generate documentation -haxe -cp ./hexcore/src -cp ./hexlog/src -cp ./hexreflection/src -cp ./hexinject/src -cp ./hexmvc/src -cp ./hexioc/src -cp ./hexservice/src -cp ./hexannotation/src -cp ./hexstate/src -cp ./hexunit/src -cp ./hexdsl/src --macro "include('hex')" -D doc-gen --no-output -xml xml/php.xml -php bin -haxe -cp ./hexcore/src -cp ./hexlog/src -cp ./hexreflection/src -cp ./hexinject/src -cp ./hexmvc/src -cp ./hexioc/src -cp ./hexservice/src -cp ./hexannotation/src -cp ./hexstate/src -cp ./hexunit/src -cp ./hexdsl/src --macro "include('hex')" -D doc-gen --no-output -xml xml/neko.xml -neko bin/docs.n -haxe -cp ./hexcore/src -cp ./hexlog/src -cp ./hexreflection/src -cp ./hexinject/src -cp ./hexmvc/src -cp ./hexioc/src -cp ./hexservice/src -cp ./hexannotation/src -cp ./hexstate/src -cp ./hexunit/src -cp ./hexdsl/src --macro "include('hex')" -D doc-gen --no-output -xml xml/js.xml -js bin/docs.js -haxe -cp ./hexcore/src -cp ./hexlog/src -cp ./hexreflection/src -cp ./hexinject/src -cp ./hexmvc/src -cp ./hexioc/src -cp ./hexservice/src -cp ./hexannotation/src -cp ./hexstate/src -cp ./hexunit/src -cp ./hexdsl/src --macro "include('hex')" -D doc-gen --no-output -xml xml/flash.xml -swf-version 11 -swf bin/docs.swf +# Generate documentation +haxe -lib hexunit -lib hexdsl -lib hexcommand --macro "include('hex')" -D doc-gen --no-output -xml xml/php.xml -php bin +haxe -lib hexunit -lib hexdsl -lib hexcommand --macro "include('hex')" -D doc-gen --no-output -xml xml/neko.xml -neko bin/docs.n +haxe -lib hexunit -lib hexdsl -lib hexcommand --macro "include('hex')" -D doc-gen --no-output -xml xml/js.xml -js bin/docs.js +haxe -lib hexunit -lib hexdsl -lib hexcommand --macro "include('hex')" -D doc-gen --no-output -xml xml/flash.xml -swf-version 11 -swf bin/docs.swf haxelib install dox diff --git a/.travis/make-hexMachina-bundle.sh b/.travis/make-hexMachina-bundle.sh index b512dbb..3224239 100755 --- a/.travis/make-hexMachina-bundle.sh +++ b/.travis/make-hexMachina-bundle.sh @@ -1,46 +1,34 @@ #!/bin/bash cd $HOME mkdir hexmachina-bundle hexmachina-bundle/src hexmachina-bundle/test +# hexLog +rsync -a ./hexlog/src ./hexmachina-bundle +rsync -a ./hexlog/test ./hexmachina-bundle +cp ./hexlog/README.md ./hexmachina-bundle/README-hexlog.md # hexCore rsync -a ./hexcore/src ./hexmachina-bundle rsync -a ./hexcore/test ./hexmachina-bundle cp ./hexcore/README.md ./hexmachina-bundle/README-hexcore.md -# hexLog -rsync -a ./hexlog/src ./hexmachina-bundle -rsync -a ./hexlog/test ./hexmachina-bundle -cp ./hexlog/README.md ./hexmachina-bundle/README-hexlog.md # hexReflection rsync -a ./hexreflection/src ./hexmachina-bundle rsync -a ./hexreflection/test ./hexmachina-bundle cp ./hexreflection/README.md ./hexmachina-bundle/README-hexreflection.md +# hexAnnotation +rsync -a ./hexannotation/src ./hexmachina-bundle +rsync -a ./hexannotation/test ./hexmachina-bundle +cp ./hexannotation/README.md ./hexmachina-bundle/README-hexannotation.md +# hexInject +rsync -a ./hexinject/src ./hexmachina-bundle +rsync -a ./hexinject/test ./hexmachina-bundle +cp ./hexinject/README.md ./hexmachina-bundle/README-hexinject.md # hexDsl rsync -a ./hexdsl/src ./hexmachina-bundle rsync -a ./hexdsl/test ./hexmachina-bundle cp ./hexdsl/README.md ./hexmachina-bundle/README-hexdsl.md -# hexInject -rsync -a ./hexinject/src ./hexmachina-bundle -rsync -a ./hexinject/test ./hexmachina-bundle -cp ./hexinject/README.md ./hexmachina-bundle/README-hexinject.md -# hexNVC -rsync -a ./hexmvc/src ./hexmachina-bundle -rsync -a ./hexmvc/test ./hexmachina-bundle -cp ./hexmvc/README.md ./hexmachina-bundle/README-hexmvc.md -# hexIoC -rsync -a ./hexioc/src ./hexmachina-bundle -rsync -a ./hexioc/test ./hexmachina-bundle -cp ./hexioc/README.md ./hexmachina-bundle/README-hexioc.md -# hexService -rsync -a ./hexservice/src ./hexmachina-bundle -rsync -a ./hexservice/test ./hexmachina-bundle -cp ./hexservice/README.md ./hexmachina-bundle/README-hexservice.md -# hexAnnotation -rsync -a ./hexannotation/src ./hexmachina-bundle -rsync -a ./hexannotation/test ./hexmachina-bundle -cp ./hexannotation/README.md ./hexmachina-bundle/README-hexannotation.md -# hexState -rsync -a ./hexstate/src ./hexmachina-bundle -rsync -a ./hexstate/test ./hexmachina-bundle -cp ./hexstate/README.md ./hexmachina-bundle/README-hexstate.md +# hexCommand +rsync -a ./hexcommand/src ./hexmachina-bundle +rsync -a ./hexcommand/test ./hexmachina-bundle +cp ./hexcommand/README.md ./hexmachina-bundle/README-hexcommand.md # hexUnit rsync -a ./hexunit/src ./hexmachina-bundle rsync -a ./hexunit/test ./hexmachina-bundle diff --git a/README.md b/README.md index b9c0a1e..50ba7fe 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,7 @@ Source code is split in different repositories : * [hexAnnotation](https://github.com/doclerlabs/hexAnnotation) * [hexInject](https://github.com/doclerlabs/hexInject) * [hexDSL](https://github.com/doclerlabs/hexDSL) -* [hexService](https://github.com/doclerlabs/hexService) -* [hexMVC](https://github.com/doclerlabs/hexMVC) -* [hexState](https://github.com/doclerlabs/hexState) -* [hexIoC](https://github.com/doclerlabs/hexIoC) +* [hexCommand](https://github.com/doclerlabs/hexCommand) Organigramme : @@ -24,14 +21,14 @@ Organigramme : | +----------+ | | | | | v | - | +----------+ | - | | hexCore |----------+ | - | +----------+ | | - | | | | - | v v | - | +----------------+ +----------+ | - | | hexReflection | | hexUnit | | - | +----------------+ +----------+ | + | +----------+ | +---------------+ + | +---------- | hexCore |<------------------+---| tink macro | + | | +----------+ | +---------------+ + | | | | + | v v | + | +----------+ +----------------+ | + | | hexUnit | | hexReflection | | + | +----------+ +----------------+ | | | | | v | | +----------------+ | @@ -40,23 +37,13 @@ Organigramme : | | | | v | | +----------------+ | - | +-----| hexInject |------+ | - | | +----------------+ | | - | | | | | - | v v v | - | +------------+ +------------+ +------------+ | +---------------+ - | | hexMVC | | hexService | | hexDSL |<--+---| tink macro | - | +------------+ +------------+ +------------+ | +---------------+ - | | | | | - | v | | | - | +------------+ | | | - | | hexState | | | | - | +------------+ | | | - | | | | | - | v v v | - | +------------------------------------------+ | - | | hexIoC | | - | +------------------------------------------+ | + | | hexInject | | + | +----------------+ | + | | | | + | v v | + | +------------+ +------------+ | + | | hexCommand | | hexDSL | | + | +------------+ +------------+ | | | +--------------------------------------------------+ diff --git a/build-each.hxml b/build-each.hxml index 6792e7e..c85565a 100644 --- a/build-each.hxml +++ b/build-each.hxml @@ -1,7 +1,8 @@ -main MainMachinaTest -lib hexunit --lib hexioc +-lib hexdsl +-lib hexcommand #all test sources to run the whole test suite -cp test @@ -12,9 +13,6 @@ -cp /home/travis/hexannotation/test -cp /home/travis/hexinject/test -cp /home/travis/hexdsl/test --cp /home/travis/hexservice/test --cp /home/travis/hexmvc/test --cp /home/travis/hexstate/test --cp /home/travis/hexioc/test +-cp /home/travis/hexcommand/test -D debug diff --git a/haxelib.json b/haxelib.json index 81ab601..6176534 100644 --- a/haxelib.json +++ b/haxelib.json @@ -9,7 +9,8 @@ "url": "https://github.com/DoclerLabs/hexMachina", "dependencies": { - "hexioc": "git:https://github.com/DoclerLabs/hexIoC.git", + "hexdsl": "git:https://github.com/DoclerLabs/hexDSL.git", + "hexcommand": "git:https://github.com/DoclerLabs/hexCommand.git", "hexunit": "git:https://github.com/DoclerLabs/hexUnit.git" } } diff --git a/test/MachinaSuite.hx b/test/MachinaSuite.hx index c3ac98c..9381f55 100644 --- a/test/MachinaSuite.hx +++ b/test/MachinaSuite.hx @@ -1,16 +1,13 @@ package; -import hex.HexAnnotationSuite; -import hex.HexCoreSuite; -import hex.HexDslSuite; -import hex.HexInjectSuite; -import hex.HexIoCSuite; import hex.HexLogSuite; -import hex.HexMVCSuite; -import hex.HexReflectionSuite; -import hex.HexServiceSuite; +import hex.HexCoreSuite; import hex.HexUnitSuite; -import hex.HexStateSuite; +import hex.HexReflectionSuite; +import hex.HexAnnotationSuite; +import hex.HexInjectSuite; +import hex.HexDslSuite; +import hex.HexCommandSuite; /** * ... @@ -20,16 +17,13 @@ class MachinaSuite { @Suite( "Machina suite" ) public var list : Array> = [ - HexUnitSuite, + HexLogSuite, HexCoreSuite, + HexUnitSuite, HexReflectionSuite, HexAnnotationSuite, HexInjectSuite, HexDslSuite, - HexServiceSuite, - HexMVCSuite, - HexStateSuite, - HexIoCSuite, - HexLogSuite + HexCommandSuite, ]; } \ No newline at end of file