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

Commit

Permalink
Merge pull request #22996 from delta-nry/bug-1012568-fix
Browse files Browse the repository at this point in the history 
Bug 1012568 - replace all tab to 2 spaces in Makefile except makefile ru... r=yurenju
  • Loading branch information
@yurenju
yurenju committed Aug 27, 2014
2 parents 7be5450 + aa6c6b3 commit c3f6c3f
Showing 1 changed file with 89 additions and 90 deletions.
179 changes: 89 additions & 90 deletions Makefile
View file
Expand Up @@ -4,7 +4,7 @@
# GAIA_DOMAIN : change that if you plan to use a different domain to update #
# your applications or want to use a local domain #
# #
# SYSTEM : url of the SYSTEM to start on #
# SYSTEM : url of the SYSTEM to start on #
# #
# ADB : if you use a device and plan to send update it with your work #
# you need to have adb in your path or you can edit this line to#
Expand Down Expand Up @@ -309,12 +309,12 @@ endif
ifndef GAIA_DISTRIBUTION_DIR
GAIA_DISTRIBUTION_DIR := $(GAIA_DIR)$(SEP)distribution
else
ifneq (,$(findstring MINGW32_,$(SYS)))
GAIA_DISTRIBUTION_DIR := $(shell pushd $(GAIA_DISTRIBUTION_DIR) > /dev/null; \
pwd -W | sed 's|/|\\\\|g'; popd > /dev/null;)
else
GAIA_DISTRIBUTION_DIR := $(realpath $(GAIA_DISTRIBUTION_DIR))
endif
ifneq (,$(findstring MINGW32_,$(SYS)))
GAIA_DISTRIBUTION_DIR := $(shell pushd $(GAIA_DISTRIBUTION_DIR) > /dev/null; \
pwd -W | sed 's|/|\\\\|g'; popd > /dev/null;)
else
GAIA_DISTRIBUTION_DIR := $(realpath $(GAIA_DISTRIBUTION_DIR))
endif
endif
export GAIA_DISTRIBUTION_DIR

Expand All @@ -323,30 +323,30 @@ KEYBOARD_LAYOUTS_PATH ?= build/config/keyboard-layouts.json
CONTACTS_IMPORT_SERVICES_PATH ?= build/config/communications_services.json

ifdef GAIA_DISTRIBUTION_DIR
DISTRIBUTION_SETTINGS := $(GAIA_DISTRIBUTION_DIR)$(SEP)settings.json
DISTRIBUTION_CONTACTS := $(GAIA_DISTRIBUTION_DIR)$(SEP)contacts.json
DISTRIBUTION_APP_CONFIG := $(GAIA_DISTRIBUTION_DIR)$(SEP)apps.list
DISTRIBUTION_VARIANT := $(GAIA_DISTRIBUTION_DIR)$(SEP)variant.json
DISTRIBUTION_KEYBOARD_LAYOUTS := $(GAIA_DISTRIBUTION_DIR)$(SEP)keyboard-layouts.json
DISTRIBUTION_CONTACTS_IMPORT_SERVICES := $(GAIA_DISTRIBUTION_DIR)$(SEP)communications_services.json
ifneq ($(wildcard $(DISTRIBUTION_SETTINGS)),)
SETTINGS_PATH := $(DISTRIBUTION_SETTINGS)
endif
ifneq ($(wildcard $(DISTRIBUTION_CONTACTS)),)
CONTACTS_PATH := $(DISTRIBUTION_CONTACTS)
endif
ifneq ($(wildcard $(DISTRIBUTION_APP_CONFIG)),)
GAIA_APP_CONFIG := $(DISTRIBUTION_APP_CONFIG)
endif
ifneq ($(wildcard $(DISTRIBUTION_VARIANT)),)
VARIANT_PATH := $(DISTRIBUTION_VARIANT)
endif
ifneq ($(wildcard $(DISTRIBUTION_KEYBOARD_LAYOUTS)),)
KEYBOARD_LAYOUTS_PATH := $(DISTRIBUTION_KEYBOARD_LAYOUTS)
endif
ifneq ($(wildcard $(DISTRIBUTION_CONTACTS_IMPORT_SERVICES)),)
CONTACTS_IMPORT_SERVICES_PATH := $(DISTRIBUTION_CONTACTS_IMPORT_SERVICES)
endif
DISTRIBUTION_SETTINGS := $(GAIA_DISTRIBUTION_DIR)$(SEP)settings.json
DISTRIBUTION_CONTACTS := $(GAIA_DISTRIBUTION_DIR)$(SEP)contacts.json
DISTRIBUTION_APP_CONFIG := $(GAIA_DISTRIBUTION_DIR)$(SEP)apps.list
DISTRIBUTION_VARIANT := $(GAIA_DISTRIBUTION_DIR)$(SEP)variant.json
DISTRIBUTION_KEYBOARD_LAYOUTS := $(GAIA_DISTRIBUTION_DIR)$(SEP)keyboard-layouts.json
DISTRIBUTION_CONTACTS_IMPORT_SERVICES := $(GAIA_DISTRIBUTION_DIR)$(SEP)communications_services.json
ifneq ($(wildcard $(DISTRIBUTION_SETTINGS)),)
SETTINGS_PATH := $(DISTRIBUTION_SETTINGS)
endif
ifneq ($(wildcard $(DISTRIBUTION_CONTACTS)),)
CONTACTS_PATH := $(DISTRIBUTION_CONTACTS)
endif
ifneq ($(wildcard $(DISTRIBUTION_APP_CONFIG)),)
GAIA_APP_CONFIG := $(DISTRIBUTION_APP_CONFIG)
endif
ifneq ($(wildcard $(DISTRIBUTION_VARIANT)),)
VARIANT_PATH := $(DISTRIBUTION_VARIANT)
endif
ifneq ($(wildcard $(DISTRIBUTION_KEYBOARD_LAYOUTS)),)
KEYBOARD_LAYOUTS_PATH := $(DISTRIBUTION_KEYBOARD_LAYOUTS)
endif
ifneq ($(wildcard $(DISTRIBUTION_CONTACTS_IMPORT_SERVICES)),)
CONTACTS_IMPORT_SERVICES_PATH := $(DISTRIBUTION_CONTACTS_IMPORT_SERVICES)
endif
endif

# Read the file specified in $GAIA_APP_CONFIG and turn them into $GAIA_APPDIRS,
Expand All @@ -368,19 +368,19 @@ endif
GAIA_ALLAPPDIRS=$(shell find $(GAIA_DIR)$(SEP)apps $(GAIA_DIR)$(SEP)dev_apps -maxdepth 1 -mindepth 1 -type d | sed 's@[/\\]@$(SEP_FOR_SED)@g')

GAIA_APPDIRS=$(shell while read LINE; do \
if [ "$${LINE\#$${LINE%?}}" = "*" ]; then \
srcdir="`echo "$$LINE" | sed 's/.\{2\}$$//'`"; \
[ -d $(GAIA_DIR)$(SEP)$$srcdir ] && find -L $(GAIA_DIR)$(SEP)$$srcdir -mindepth 1 -maxdepth 1 -type d | sed 's@[/\\]@$(SEP_FOR_SED)@g'; \
[ -d $(GAIA_DISTRIBUTION_DIR)$(SEP)$$srcdir ] && find -L $(GAIA_DISTRIBUTION_DIR)$(SEP)$$srcdir -mindepth 1 -maxdepth 1 -type d | sed 's@[/\\]@$(SEP_FOR_SED)@g'; \
else \
if [ "$${LINE\#$${LINE%?}}" = "*" ]; then \
srcdir="`echo "$$LINE" | sed 's/.\{2\}$$//'`"; \
[ -d $(GAIA_DIR)$(SEP)$$srcdir ] && find -L $(GAIA_DIR)$(SEP)$$srcdir -mindepth 1 -maxdepth 1 -type d | sed 's@[/\\]@$(SEP_FOR_SED)@g'; \
[ -d $(GAIA_DISTRIBUTION_DIR)$(SEP)$$srcdir ] && find -L $(GAIA_DISTRIBUTION_DIR)$(SEP)$$srcdir -mindepth 1 -maxdepth 1 -type d | sed 's@[/\\]@$(SEP_FOR_SED)@g'; \
else \
if [ -d "$(GAIA_DISTRIBUTION_DIR)$(SEP)$$LINE" ]; then \
echo "$(GAIA_DISTRIBUTION_DIR)$(SEP)$$LINE" | sed 's@[/\\]@$(SEP_FOR_SED)@g'; \
elif [ -d "$(GAIA_DIR)$(SEP)$$LINE" ]; then \
echo "$(GAIA_DIR)$(SEP)$$LINE" | sed 's@[/\\]@$(SEP_FOR_SED)@g'; \
elif [ -d "$$LINE" ]; then \
echo "$$LINE" | sed 's@[/\\]@$(SEP_FOR_SED)@g'; \
fi \
fi \
fi \
done < $(GAIA_APP_CONFIG))

ifneq ($(GAIA_OUTOFTREE_APP_SRCDIRS),)
Expand Down Expand Up @@ -416,11 +416,11 @@ endif
# Test agent setup
TEST_COMMON=dev_apps/test-agent/common
ifeq ($(strip $(NODEJS)),)
NODEJS := `which node`
NODEJS := `which node`
endif

ifeq ($(strip $(NPM)),)
NPM := `which npm`
NPM := `which npm`
endif

TEST_AGENT_CONFIG="./dev_apps/test-agent/config.json"
Expand All @@ -439,51 +439,50 @@ TEST_DIRS ?= $(GAIA_DIR)/tests

define BUILD_CONFIG
{ \
"ADB" : "$(patsubst "%",%,$(ADB))", \
"GAIA_DIR" : "$(GAIA_DIR)", \
"PROFILE_DIR" : "$(GAIA_DIR)$(SEP)$(PROFILE_FOLDER)", \
"PROFILE_FOLDER" : "$(PROFILE_FOLDER)", \
"GAIA_SCHEME" : "$(SCHEME)", \
"GAIA_DOMAIN" : "$(GAIA_DOMAIN)", \
"DEBUG" : $(DEBUG), \
"LOCAL_DOMAINS" : $(LOCAL_DOMAINS), \
"DESKTOP" : $(DESKTOP), \
"DEVICE_DEBUG" : $(DEVICE_DEBUG), \
"NO_LOCK_SCREEN" : $(NO_LOCK_SCREEN), \
"SYSTEM" : "$(SYSTEM)", \
"GAIA_PORT" : "$(GAIA_PORT)", \
"GAIA_LOCALES_PATH" : "$(GAIA_LOCALES_PATH)", \
"GAIA_INSTALL_PARENT" : "$(GAIA_INSTALL_PARENT)", \
"LOCALES_FILE" : "$(subst \,\\,$(LOCALES_FILE))", \
"GAIA_KEYBOARD_LAYOUTS" : "$(GAIA_KEYBOARD_LAYOUTS)", \
"LOCALE_BASEDIR" : "$(subst \,\\,$(LOCALE_BASEDIR))", \
"BUILD_APP_NAME" : "$(BUILD_APP_NAME)", \
"PRODUCTION" : "$(PRODUCTION)", \
"GAIA_OPTIMIZE" : "$(GAIA_OPTIMIZE)", \
"GAIA_DEVICE_TYPE" : "$(GAIA_DEVICE_TYPE)", \
"GAIA_DEV_PIXELS_PER_PX" : "$(GAIA_DEV_PIXELS_PER_PX)", \
"DOGFOOD" : "$(DOGFOOD)", \
"OFFICIAL" : "$(MOZILLA_OFFICIAL)", \
"GAIA_DEFAULT_LOCALE" : "$(GAIA_DEFAULT_LOCALE)", \
"GAIA_INLINE_LOCALES" : "$(GAIA_INLINE_LOCALES)", \
"GAIA_PRETRANSLATE" : "$(GAIA_PRETRANSLATE)", \
"GAIA_CONCAT_LOCALES" : "$(GAIA_CONCAT_LOCALES)", \
"GAIA_ENGINE" : "xpcshell", \
"GAIA_DISTRIBUTION_DIR" : "$(GAIA_DISTRIBUTION_DIR)", \
"GAIA_APPDIRS" : "$(GAIA_APPDIRS)", \
"GAIA_ALLAPPDIRS" : "$(GAIA_ALLAPPDIRS)", \
"GAIA_MEMORY_PROFILE" : "$(GAIA_MEMORY_PROFILE)", \
"NOFTU" : "$(NOFTU)", \
"REMOTE_DEBUGGER" : "$(REMOTE_DEBUGGER)", \
"TARGET_BUILD_VARIANT" : "$(TARGET_BUILD_VARIANT)", \
"SETTINGS_PATH" : "$(subst \,\\,$(SETTINGS_PATH))", \
"FTU_PING_URL": "$(FTU_PING_URL)", \
"KEYBOARD_LAYOUTS_PATH" : "$(KEYBOARD_LAYOUTS_PATH)", \
"CONTACTS_IMPORT_SERVICES_PATH" : "$(CONTACTS_IMPORT_SERVICES_PATH)", \
"STAGE_DIR" : "$(STAGE_DIR)", \
"GAIA_APP_TARGET" : "$(GAIA_APP_TARGET)", \
"VARIANT_PATH" : "$(VARIANT_PATH)", \
"BUILD_DEBUG" : "$(BUILD_DEBUG)"

This comment has been minimized.

Sign in to view

Copy link
@timdream

timdream Aug 29, 2014

Contributor

@yurenju I think BUILD_DEBUG is removed in this patch. Is this intentional?
"ADB" : "$(patsubst "%",%,$(ADB))", \
"GAIA_DIR" : "$(GAIA_DIR)", \
"PROFILE_DIR" : "$(GAIA_DIR)$(SEP)$(PROFILE_FOLDER)", \
"PROFILE_FOLDER" : "$(PROFILE_FOLDER)", \
"GAIA_SCHEME" : "$(SCHEME)", \
"GAIA_DOMAIN" : "$(GAIA_DOMAIN)", \
"DEBUG" : $(DEBUG), \
"LOCAL_DOMAINS" : $(LOCAL_DOMAINS), \
"DESKTOP" : $(DESKTOP), \
"DEVICE_DEBUG" : $(DEVICE_DEBUG), \
"NO_LOCK_SCREEN" : $(NO_LOCK_SCREEN), \
"SYSTEM" : "$(SYSTEM)", \
"GAIA_PORT" : "$(GAIA_PORT)", \
"GAIA_LOCALES_PATH" : "$(GAIA_LOCALES_PATH)", \
"GAIA_INSTALL_PARENT" : "$(GAIA_INSTALL_PARENT)", \
"LOCALES_FILE" : "$(subst \,\\,$(LOCALES_FILE))", \
"GAIA_KEYBOARD_LAYOUTS" : "$(GAIA_KEYBOARD_LAYOUTS)", \
"LOCALE_BASEDIR" : "$(subst \,\\,$(LOCALE_BASEDIR))", \
"BUILD_APP_NAME" : "$(BUILD_APP_NAME)", \
"PRODUCTION" : "$(PRODUCTION)", \
"GAIA_OPTIMIZE" : "$(GAIA_OPTIMIZE)", \
"GAIA_DEVICE_TYPE" : "$(GAIA_DEVICE_TYPE)", \
"GAIA_DEV_PIXELS_PER_PX" : "$(GAIA_DEV_PIXELS_PER_PX)", \
"DOGFOOD" : "$(DOGFOOD)", \
"OFFICIAL" : "$(MOZILLA_OFFICIAL)", \
"GAIA_DEFAULT_LOCALE" : "$(GAIA_DEFAULT_LOCALE)", \
"GAIA_INLINE_LOCALES" : "$(GAIA_INLINE_LOCALES)", \
"GAIA_PRETRANSLATE" : "$(GAIA_PRETRANSLATE)", \
"GAIA_CONCAT_LOCALES" : "$(GAIA_CONCAT_LOCALES)", \
"GAIA_ENGINE" : "xpcshell", \
"GAIA_DISTRIBUTION_DIR" : "$(GAIA_DISTRIBUTION_DIR)", \
"GAIA_APPDIRS" : "$(GAIA_APPDIRS)", \
"GAIA_ALLAPPDIRS" : "$(GAIA_ALLAPPDIRS)", \
"GAIA_MEMORY_PROFILE" : "$(GAIA_MEMORY_PROFILE)", \
"NOFTU" : "$(NOFTU)", \
"REMOTE_DEBUGGER" : "$(REMOTE_DEBUGGER)", \
"TARGET_BUILD_VARIANT" : "$(TARGET_BUILD_VARIANT)", \
"SETTINGS_PATH" : "$(subst \,\\,$(SETTINGS_PATH))", \
"FTU_PING_URL": "$(FTU_PING_URL)", \
"KEYBOARD_LAYOUTS_PATH" : "$(KEYBOARD_LAYOUTS_PATH)", \
"CONTACTS_IMPORT_SERVICES_PATH" : "$(CONTACTS_IMPORT_SERVICES_PATH)", \
"STAGE_DIR" : "$(STAGE_DIR)", \
"GAIA_APP_TARGET" : "$(GAIA_APP_TARGET)", \
"VARIANT_PATH" : "$(VARIANT_PATH)" \
}
endef

Expand All @@ -494,7 +493,7 @@ include build/common.mk
# Generate profile/
$(PROFILE_FOLDER): preferences pre-app post-app test-agent-config offline contacts extensions $(XULRUNNER_BASE_DIRECTORY) .git/hooks/pre-commit
ifeq ($(BUILD_APP_NAME),*)
@echo "Profile Ready: please run [b2g|firefox] -profile $(CURDIR)$(SEP)$(PROFILE_FOLDER)"
@echo "Profile Ready: please run [b2g|firefox] -profile $(CURDIR)$(SEP)$(PROFILE_FOLDER)"
endif

$(STAGE_DIR):
Expand Down Expand Up @@ -680,11 +679,11 @@ INJECTED_GAIA = "$(MOZ_TESTS)/browser/gaia"
TEST_PATH=gaia/tests/${TEST_FILE}

ifndef APPS
ifdef APP
APPS=$(APP)
else
APPS=template $(shell find apps -type d -name 'test' | sed -e 's|^apps/||' -e 's|/test$$||' | sort )
endif
ifdef APP
APPS=$(APP)
else
APPS=template $(shell find apps -type d -name 'test' | sed -e 's|^apps/||' -e 's|/test$$||' | sort )
endif
endif

b2g: node_modules/.bin/mozilla-download
Expand Down

0 comments on commit c3f6c3f

Please sign in to comment.