Commit c3389f5e authored by Markus Weiland's avatar Markus Weiland Committed by GitHub

Merge pull request #199 from ExchangeCalendar/145

Fix wrong version generated in Makefile, remove hidden files, remove …
parents 3aafb8f0 9a815f56
version = $(shell cat VERSION) version = $(shell cat VERSION)
excludefromxpi = .git/\* .gitignore \*/.gitignore .tx/\* \*.xpi \*.sh update\*.txt Makefile VERSION install.rdf.template excludefromxpi = .\* \*/.gitignore \*.xpi \*.sh update\*.txt Makefile VERSION install.rdf.template
releasebranch = ec-4.0
update = disable update = disable
xpi = exchangecalendar-v$(version).xpi xpi = exchangecalendar-v$(version).xpi
.PHONY: build release l10n-get l10n-auto-commit l10n-push dev beautify beautify-xml beautify-js defaults/preferences/update.js $(xpi) .PHONY: build release l10n-get l10n-auto-commit l10n-push dev beautify beautify-xml beautify-js defaults/preferences/update.js install.rdf $(xpi)
# Default target is build package # Default target is build package
build: $(xpi) build: $(xpi)
...@@ -31,7 +30,6 @@ release: build ...@@ -31,7 +30,6 @@ release: build
# Get translations updates from Transifex # Get translations updates from Transifex
l10n-get: l10n-get:
git checkout $(releasebranch)
tx pull -a tx pull -a
l10n-auto-commit: l10n-get l10n-auto-commit: l10n-get
...@@ -40,7 +38,6 @@ l10n-auto-commit: l10n-get ...@@ -40,7 +38,6 @@ l10n-auto-commit: l10n-get
# Send new texts to translate to Transifex # Send new texts to translate to Transifex
l10n-push: l10n-push:
git checkout $(releasebranch)
tx push -s tx push -s
# Target to beautify and build your code while developing it # Target to beautify and build your code while developing it
...@@ -63,6 +60,7 @@ beautify-xml: ...@@ -63,6 +60,7 @@ beautify-xml:
--preserve-entities yes --quote-ampersand no --quote-nbsp no --output-xml yes \ --preserve-entities yes --quote-ampersand no --quote-nbsp no --output-xml yes \
--strict-tags-attributes no --write-back yes --wrap 0 \ --strict-tags-attributes no --write-back yes --wrap 0 \
{} \; {} \;
beautify-js: beautify-js:
find . -name "*.js" -exec \ find . -name "*.js" -exec \
js-beautify --indent-size=4 --indent-char=' ' --jslint-happy \ js-beautify --indent-size=4 --indent-char=' ' --jslint-happy \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment