From 39e4aad0331f9687ea55ef678a6bf82ca36d9ea7 Mon Sep 17 00:00:00 2001 From: Carlos Vieira Date: Wed, 6 Nov 2019 10:28:02 -0300 Subject: [PATCH] Closes #20 --- recipes/barra_versao_2/assets/version/version.json | 3 +++ recipes/barra_versao_2/barra-brasil-final-version.yaml | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ recipes/barra_versao_2/barra-brasil-final.yaml | 8 ++++---- recipes/barra_versao_2/compile.sh | 2 +- recipes/default/assets/version/version.json | 3 +++ recipes/default/barra-brasil-final-version.yaml | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ recipes/default/barra-brasil-final.yaml | 8 ++++---- recipes/default/compile.sh | 2 +- 8 files changed, 165 insertions(+), 10 deletions(-) create mode 100644 recipes/barra_versao_2/assets/version/version.json create mode 100644 recipes/barra_versao_2/barra-brasil-final-version.yaml create mode 100644 recipes/default/assets/version/version.json create mode 100644 recipes/default/barra-brasil-final-version.yaml diff --git a/recipes/barra_versao_2/assets/version/version.json b/recipes/barra_versao_2/assets/version/version.json new file mode 100644 index 0000000..c42b0be --- /dev/null +++ b/recipes/barra_versao_2/assets/version/version.json @@ -0,0 +1,3 @@ +{ +"VERSION": "2.2.23" +} diff --git a/recipes/barra_versao_2/barra-brasil-final-version.yaml b/recipes/barra_versao_2/barra-brasil-final-version.yaml new file mode 100644 index 0000000..7a8c6fa --- /dev/null +++ b/recipes/barra_versao_2/barra-brasil-final-version.yaml @@ -0,0 +1,78 @@ +# configuracao do assetgen para: +# - mesclar o css com javascript de comportamento + +generate: + +- barra-brasil_sem_licenca.js: + source: + - build/barra-brasil-original.js # parte de comportamento + - build/footer-brasil-original.js # parte de comportamento + uglify.bin: uglifyjs + +- barra-brasil_sem_licenca-en.js: + source: + - build/barra-brasil-original-en.js # parte de comportamento + - build/footer-brasil-original.js # parte de comportamento + uglify.bin: uglifyjs + +- barra-brasil_sem_licenca-fr.js: + source: + - build/barra-brasil-original-fr.js # parte de comportamento + - build/footer-brasil-original.js # parte de comportamento + uglify.bin: uglifyjs + +- barra-brasil_sem_licenca-es.js: + source: + - build/barra-brasil-original-es.js # parte de comportamento + - build/footer-brasil-original.js # parte de comportamento + uglify.bin: uglifyjs + +- barra-brasil.js: + compress: false + uglify.bin: uglifyjs + css.compress: false + source: + - build/barra-brasil_sem_licenca.js + - raw: "/** @license-end */" # fechamento da licença + template: | + /** @version %VERSION% @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + +- barra-brasil-en.js: + compress: false + uglify.bin: uglifyjs + css.compress: false + source: + - build/barra-brasil_sem_licenca-en.js + - raw: "/** @license-end */" # fechamento da licença + template: | + /** @version %VERSION% @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + +- barra-brasil-fr.js: + compress: false + uglify.bin: uglifyjs + css.compress: false + source: + - build/barra-brasil_sem_licenca-fr.js + - raw: "/** @license-end */" # fechamento da licença + template: | + /** @version %VERSION% @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + +- barra-brasil-es.js: + compress: false + uglify.bin: uglifyjs + css.compress: false + source: + - build/barra-brasil_sem_licenca-es.js + - raw: "/** @license-end */" # fechamento da licença + template: | + /** @version %VERSION% @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + +css.embed: true +css.embed.only: true +output.directory: build +output.hashed: false +output.manifest: build/assets.json + +profile.dev: + css.compress: false + js.compress: false diff --git a/recipes/barra_versao_2/barra-brasil-final.yaml b/recipes/barra_versao_2/barra-brasil-final.yaml index fb95fe2..c1e4276 100644 --- a/recipes/barra_versao_2/barra-brasil-final.yaml +++ b/recipes/barra_versao_2/barra-brasil-final.yaml @@ -35,7 +35,7 @@ generate: - build/barra-brasil_sem_licenca.js - raw: "/** @license-end */" # fechamento da licença template: | - /** @version 2.2.20 @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + /** @version 2.2.23 @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} - barra-brasil-en.js: compress: false @@ -45,7 +45,7 @@ generate: - build/barra-brasil_sem_licenca-en.js - raw: "/** @license-end */" # fechamento da licença template: | - /** @version 2.2.20 @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + /** @version 2.2.23 @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} - barra-brasil-fr.js: compress: false @@ -55,7 +55,7 @@ generate: - build/barra-brasil_sem_licenca-fr.js - raw: "/** @license-end */" # fechamento da licença template: | - /** @version 2.2.20 @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + /** @version 2.2.23 @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} - barra-brasil-es.js: compress: false @@ -65,7 +65,7 @@ generate: - build/barra-brasil_sem_licenca-es.js - raw: "/** @license-end */" # fechamento da licença template: | - /** @version 2.2.20 @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + /** @version 2.2.23 @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} css.embed: true css.embed.only: true diff --git a/recipes/barra_versao_2/compile.sh b/recipes/barra_versao_2/compile.sh index e9c1816..31051ad 100755 --- a/recipes/barra_versao_2/compile.sh +++ b/recipes/barra_versao_2/compile.sh @@ -8,5 +8,5 @@ variable-replacer assets/conteudo-barra_i18n.html assets/conteudo-barra-en.html ../../venv/bin/assetgen ./barra-brasil-2.yaml ../../venv/bin/assetgen ./footer-brasil-1.yaml ../../venv/bin/assetgen ./footer-brasil-2.yaml +variable-replacer ./barra-brasil-final-version.yaml ./barra-brasil-final.yaml --data=assets/version/version.json ../../venv/bin/assetgen ./barra-brasil-final.yaml - diff --git a/recipes/default/assets/version/version.json b/recipes/default/assets/version/version.json new file mode 100644 index 0000000..5e5700b --- /dev/null +++ b/recipes/default/assets/version/version.json @@ -0,0 +1,3 @@ +{ +"VERSION": "3.0.14" +} diff --git a/recipes/default/barra-brasil-final-version.yaml b/recipes/default/barra-brasil-final-version.yaml new file mode 100644 index 0000000..ae22c49 --- /dev/null +++ b/recipes/default/barra-brasil-final-version.yaml @@ -0,0 +1,71 @@ +# configuracao do assetgen para: +# - mesclar o css com javascript de comportamento + +generate: + +- barra-brasil_sem_licenca.js: + source: + - build/barra-brasil-original.js # parte de comportamento + - build/footer-brasil-original.js # parte de comportamento + +- barra-brasil_sem_licenca-en.js: + source: + - build/barra-brasil-original-en.js # parte de comportamento + - build/footer-brasil-original.js # parte de comportamento + +- barra-brasil_sem_licenca-fr.js: + source: + - build/barra-brasil-original-fr.js # parte de comportamento + - build/footer-brasil-original.js # parte de comportamento + +- barra-brasil_sem_licenca-es.js: + source: + - build/barra-brasil-original-es.js # parte de comportamento + - build/footer-brasil-original.js # parte de comportamento + +- barra-brasil.js: + compress: false + css.compress: false + source: + - build/barra-brasil_sem_licenca.js + - raw: "/** @license-end */" # fechamento da licença + template: | + /** @version %VERSION% @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + +- barra-brasil-en.js: + compress: false + css.compress: false + source: + - build/barra-brasil_sem_licenca-en.js + - raw: "/** @license-end */" # fechamento da licença + template: | + /** @version %VERSION% @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + +- barra-brasil-fr.js: + compress: false + css.compress: false + source: + - build/barra-brasil_sem_licenca-fr.js + - raw: "/** @license-end */" # fechamento da licença + template: | + /** @version %VERSION% @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + +- barra-brasil-es.js: + compress: false + css.compress: false + source: + - build/barra-brasil_sem_licenca-es.js + - raw: "/** @license-end */" # fechamento da licença + template: | + /** @version %VERSION% @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + +css.embed: true +css.embed.only: true +output.directory: build +output.hashed: false +js.uglify.bin: uglifyjs +output.manifest: build/assets.json + +profile.dev: + css.compress: false + js.compress: false diff --git a/recipes/default/barra-brasil-final.yaml b/recipes/default/barra-brasil-final.yaml index f058498..ae22c49 100644 --- a/recipes/default/barra-brasil-final.yaml +++ b/recipes/default/barra-brasil-final.yaml @@ -30,7 +30,7 @@ generate: - build/barra-brasil_sem_licenca.js - raw: "/** @license-end */" # fechamento da licença template: | - /** @version 3.0.11 @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + /** @version %VERSION% @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} - barra-brasil-en.js: compress: false @@ -39,7 +39,7 @@ generate: - build/barra-brasil_sem_licenca-en.js - raw: "/** @license-end */" # fechamento da licença template: | - /** @version 3.0.11 @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + /** @version %VERSION% @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} - barra-brasil-fr.js: compress: false @@ -48,7 +48,7 @@ generate: - build/barra-brasil_sem_licenca-fr.js - raw: "/** @license-end */" # fechamento da licença template: | - /** @version 3.0.11 @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + /** @version %VERSION% @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} - barra-brasil-es.js: compress: false @@ -57,7 +57,7 @@ generate: - build/barra-brasil_sem_licenca-es.js - raw: "/** @license-end */" # fechamento da licença template: | - /** @version 3.0.11 @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} + /** @version %VERSION% @source http://softwarepublico.gov.br/gitlab/govbr/barra-govbr/ @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0 */ ${source|trim} css.embed: true css.embed.only: true diff --git a/recipes/default/compile.sh b/recipes/default/compile.sh index e9c1816..31051ad 100755 --- a/recipes/default/compile.sh +++ b/recipes/default/compile.sh @@ -8,5 +8,5 @@ variable-replacer assets/conteudo-barra_i18n.html assets/conteudo-barra-en.html ../../venv/bin/assetgen ./barra-brasil-2.yaml ../../venv/bin/assetgen ./footer-brasil-1.yaml ../../venv/bin/assetgen ./footer-brasil-2.yaml +variable-replacer ./barra-brasil-final-version.yaml ./barra-brasil-final.yaml --data=assets/version/version.json ../../venv/bin/assetgen ./barra-brasil-final.yaml - -- libgit2 0.21.2