Commit ca1b5bf4 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 926906 - Kill core_abspath, core_realpath and core_winabspath. r=gps

parent a0a21e42

browser/app/profile/extensions/Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# License, v. 2.0. If a copy of the MPL was not distributed with this

# file, You can obtain one at http://mozilla.org/MPL/2.0/.



DISTROEXT = $(call core_abspath,$(FINAL_TARGET))/distribution/extensions

DISTROEXT = $(abspath $(FINAL_TARGET))/distribution/extensions



include $(topsrcdir)/config/config.mk
@@ -34,7 +34,7 @@ include $(topsrcdir)/config/rules.mk 
$(all_xpis): $(DISTROEXT)/%.xpi: $(call mkdir_deps,$(DISTROEXT)) libs-%

	cd $* && \

	$(ZIP) -r9XD $@ * -x \*.in -x \*.mkdir.done

	cd $(call core_abspath,$(srcdir)/$*) && \

	cd $(abspath $(srcdir)/$*) && \

	$(ZIP) -r9XD $@ * -x \*.in -x \*.mkdir.done



.PHONY: $(all_xpis:.xpi=)

browser/base/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


include $(topsrcdir)/config/config.mk



abs_srcdir = $(call core_abspath,$(srcdir))

abs_srcdir = $(abspath $(srcdir))



CHROME_DEPS += $(abs_srcdir)/content/overrides/app-license.html

build/automation-build.mk

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ browser_path := \"$(browser_path)\" 


_PROFILE_DIR = $(TARGET_DEPTH)/_profile/pgo



ABSOLUTE_TOPSRCDIR = $(call core_abspath,$(MOZILLA_DIR))

ABSOLUTE_TOPSRCDIR = $(abspath $(MOZILLA_DIR))

_CERTS_SRC_DIR = $(ABSOLUTE_TOPSRCDIR)/build/pgo/certs



AUTOMATION_PPARGS = 	\

build/macosx/universal/flight.mk

+1 −3
Original line number Diff line number Diff line
@@ -19,14 +19,12 @@ topsrcdir = $(TOPSRCDIR) 
DEPTH = $(OBJDIR)

include $(OBJDIR)/config/autoconf.mk



core_abspath = $(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1))



DIST = $(OBJDIR)/dist



postflight_all:

	mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME)

	rm -f $(DIST_ARCH_2)/universal

	ln -s $(call core_abspath,$(DIST_UNI)) $(DIST_ARCH_2)/universal

	ln -s $(abspath $(DIST_UNI)) $(DIST_ARCH_2)/universal

# Stage a package for buildsymbols to be happy. Doing so in OBJDIR_ARCH_1

# actually does a universal staging with both OBJDIR_ARCH_1 and OBJDIR_ARCH_2.

	$(MAKE) -C $(OBJDIR_ARCH_1)/$(MOZ_BUILD_APP)/installer \

config/android-common.mk

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ ifndef JAVA_CLASSPATH 
endif



# DEBUG_JARSIGNER always debug signs.

DEBUG_JARSIGNER=$(PYTHON) $(call core_abspath,$(topsrcdir)/mobile/android/debug_sign_tool.py) \

DEBUG_JARSIGNER=$(PYTHON) $(abspath $(topsrcdir)/mobile/android/debug_sign_tool.py) \

  --keytool=$(KEYTOOL) \

  --jarsigner=$(JARSIGNER) \

  $(NULL)