Skip to content

Commit

Permalink
Version 1.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
docwhat committed May 18, 2012
1 parent b7ae971 commit 86b37a6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 39 deletions.
41 changes: 3 additions & 38 deletions Makefile
Expand Up @@ -18,14 +18,13 @@
## Options
# If you don't have jslint or jsmin, you can replace these with cat...
# but I strongly suggest you get jslint and jsmin working.
JSLINT := jslint
YC := yuicompressor
YC_JSFLAGS := --type js --charset UTF-8
ZIP := zip
PROJNICK := itsalltext
PROJNAME := "It's All Text!"
ICONFILE := src/chrome/content/icon.png
VERSION := 1.6.3
VERSION := 1.6.4


# NOTE: do not create files or directories in here that have
Expand All @@ -40,9 +39,6 @@ SOURCES_CHROME:=$(shell find src/chrome -type f\
SOURCES_NONCHROME:=src/chrome.manifest src/gpl.txt src/install.rdf src/defaults/preferences/itsalltext.js
SOURCES:=$(SOURCES_CHROME) $(SOURCES_NONCHROME)
SOURCES_JS:=$(shell echo "$(SOURCES)" | xargs -n 1 echo | grep -E '\.js$$')
SOURCES_JS_LINT:=$(patsubst %.js, lint/%.js.lint, $(SOURCES_JS))
SOURCES_JS_WARN:=$(patsubst %.js, lint/%.js.warn, $(SOURCES_JS))
SOURCES_JS_LINT_PRE:=$(patsubst %.lint, %.lint-pre, $(filter %.lint,$(SOURCES_JS_LINT)))
JARS:=chrome/content.jar $(patsubst src/chrome/locale/%, chrome/%.jar, $(wildcard src/chrome/locale/*-*))

STAGE1_OUT:=$(patsubst src/%, stage1/%, $(SOURCES))
Expand All @@ -61,10 +57,10 @@ else
endif

.PHONY: default
default: lintcheck narf final
default: narf final

.PHONY: all
all: lintcheck narf docs final
all: narf docs final

## Release a new xpi
.PHONY: release
Expand Down Expand Up @@ -131,37 +127,6 @@ final/chrome/%.jar: stage1 Makefile
.PHONY: build
build: final

##
## Lint checks for possible problems.
.PHONY: lint
lint: $(SOURCES_JS_LINT) $(SOURCES_JS_WARN)

.INTERMEDIATE: $(SOURCES_JS_LINT_PRE)

$(SOURCES_JS_LINT_PRE): lint/%.js.lint-pre: %.js
$(Q)mkdir -p $(dir $@)
$(Q)perl -p -e 's!^(\s*)(const)(\s+)!$$1var$$3!' $< > $@

$(SOURCES_JS_LINT): %.js.lint: %.js.lint-pre
$(info linting $(patsubst %.lint-pre,%,$(notdir $<)) ...)
$(Q)rm -f $@
$(Q)$(JSLINT) -p $< |\
perl -p -e 's!^(jslint: linting )lint/(.*)\.lint-pre!********* $$1$$2!' >> $@
$(SOURCES_JS_WARN): lint/%.js.warn: %.js
$(info warning $(patsubst %.lint-pre,%,$(notdir $<)) ...)
$(Q)echo '********* checking $< *********' > $@
$(Q)$(YC) $(YC_JSFLAGS) --verbose -o /dev/null $< 2>&1 |\
grep -vE '^\[INFO\] It is recommended to use Sun' >> $@

.PHONY: lintcheck
lintcheck: $(SOURCES_JS_LINT) $(SOURCES_JS_WARN)
$(Q)egrep -q '^lint at ' $(SOURCES_JS_LINT)
$(Q)egrep -q '^\[WARNING\]' $(SOURCES_JS_WARN)

.PHONY: showlint
showlint: lint
$(Q)find ./lint -type f \( -name '*.lint' -o -name '*.warn' \) -print0 | xargs -0 cat

##
## Narf is a magick keyword that should stop builds from working
## Useful as a todo marker.
Expand Down
2 changes: 1 addition & 1 deletion src/install.rdf
Expand Up @@ -7,7 +7,7 @@
<RDF:Description RDF:about="rdf:#$firefox"
em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
em:minVersion="3.6"
em:maxVersion="8.0a1" />
em:maxVersion="15.0a1" />

<!-- SeaMonkey -->
<RDF:Description RDF:about="rdf:#$seamonkey"
Expand Down

0 comments on commit 86b37a6

Please sign in to comment.