Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Revert "Merge pull request #17179 from cctuan/979827" for breaking B2…
Browse files Browse the repository at this point in the history
…G desktop builds on TBPL

This reverts commit c23af48, reversing
changes made to d2651c1.
  • Loading branch information
KWierso committed Mar 18, 2014
1 parent 2c46348 commit 190bb06
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions Makefile
Expand Up @@ -214,9 +214,6 @@ endif
# Force bash for all shell commands since we depend on bash-specific syntax
SHELL := /bin/bash

# what major version of node we expect to run?
NODE_VERSION?=v0.10

# what OS are we on?
SYS=$(shell uname -s)
ARCH?=$(shell uname -m)
Expand Down Expand Up @@ -412,21 +409,13 @@ define run-build-test
$(strip $1)
endef

# Print message in yellow.
define print-warnning-msg
tput setaf 3; \
echo $1; \
tput sgr0
endef

# Generate profile/

$(PROFILE_FOLDER): check-node-version preferences app-makefiles copy-build-stage-manifest test-agent-config offline contacts extensions install-xulrunner-sdk .git/hooks/pre-commit $(PROFILE_FOLDER)/settings.json create-default-data $(PROFILE_FOLDER)/installed-extensions.json
$(PROFILE_FOLDER): preferences app-makefiles copy-build-stage-manifest test-agent-config offline contacts extensions install-xulrunner-sdk .git/hooks/pre-commit $(PROFILE_FOLDER)/settings.json create-default-data $(PROFILE_FOLDER)/installed-extensions.json
ifeq ($(BUILD_APP_NAME),*)
@echo "Profile Ready: please run [b2g|firefox] -profile $(CURDIR)$(SEP)$(PROFILE_FOLDER)"
endif


svoperapps: install-xulrunner-sdk
@$(call run-js-command, svoperapps)

Expand Down Expand Up @@ -1067,10 +1056,3 @@ docs: $(NPM_INSTALLED_PROGRAMS)
.PHONY: watch
watch: $(NPM_INSTALLED_PROGRAMS)
node build/watcher.js

.PHONY: check-node-version
check-node-version: $(NPM_INSTALLED_PROGRAMS)
ifneq ($(shell echo $(NODE_VERSION) | cut -d '.' -f1 -f2),$(shell node --version | cut -d '.' -f1 -f2))
$(call print-warnning-msg, "Please use $(NODE_VERSION) of nodejs or it may cause unexpected error.")
endif

0 comments on commit 190bb06

Please sign in to comment.