Backout changeset 452390823d77 from bug 916537, patch did not fix the issue. a=philipp

This commit is contained in:
Richard Marti 2013-09-17 22:42:33 +02:00
Родитель bde77a8c82
Коммит 3e1d0f6184
10 изменённых файлов: 13 добавлений и 13 удалений

Просмотреть файл

@ -46,7 +46,7 @@ ICON_SUFFIX = .png
endif
# Copy the window icons into the correct directory
tools:: $(addprefix themes/windows/icons/, $(addsuffix $(ICON_SUFFIX), $(WINDOW_ICONS)))
libs:: $(addprefix themes/windows/icons/, $(addsuffix $(ICON_SUFFIX), $(WINDOW_ICONS)))
$(INSTALL) $^ $(FINAL_TARGET)/chrome/icons/default
endif

Просмотреть файл

@ -25,11 +25,11 @@ EXTRA_SCRIPTS = \
$(NULL)
# Use NSINSTALL to make the directory, as there's no mtime to preserve.
tools:: $(EXTRA_SCRIPTS)
libs:: $(EXTRA_SCRIPTS)
if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
$(INSTALL) $^ $(FINAL_TARGET)/calendar-js
tools:: $(BACKEND_MANIFESTS)
libs:: $(BACKEND_MANIFESTS)
$(EXIT_ON_ERROR) \
$(NSINSTALL) -D $(FINAL_TARGET)/components; \
for i in $^; do \

Просмотреть файл

@ -50,7 +50,7 @@ EMBED_MANIFEST_AT =
BACKEND_MANIFESTS = libical.manifest
DEFINES += -DSHARED_LIBRARY=$(SHARED_LIBRARY) -DXPIDL_MODULE=$(XPIDL_MODULE)
tools:: $(BACKEND_MANIFESTS)
libs:: $(BACKEND_MANIFESTS)
$(EXIT_ON_ERROR) \
$(NSINSTALL) -D $(FINAL_TARGET)/components; \
for i in $^; do \

Просмотреть файл

@ -41,7 +41,7 @@ EXTRA_SCRIPTS = \
$(NULL)
# Use NSINSTALL to make the directory, as there's no mtime to preserve.
tools:: $(EXTRA_SCRIPTS)
libs:: $(EXTRA_SCRIPTS)
if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
$(INSTALL) $^ $(FINAL_TARGET)/calendar-js

Просмотреть файл

@ -19,7 +19,7 @@ EXTRA_SCRIPTS = \
$(NULL)
# Use NSINSTALL to make the directory, as there's no mtime to preserve.
tools:: $(EXTRA_SCRIPTS)
libs:: $(EXTRA_SCRIPTS)
if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
$(INSTALL) $^ $(FINAL_TARGET)/calendar-js

Просмотреть файл

@ -116,7 +116,7 @@ GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $
DEFINES += -DGRE_BUILDID=$(GRE_BUILDID)
# xxx todo: unless our packaging story is revised (bug 406579) we package up timezones.sqlite
tools::
libs::
$(NSINSTALL) -m 0644 $(srcdir)/../timezones/timezones.sqlite $(FINAL_TARGET)
include $(topsrcdir)/config/rules.mk
@ -131,7 +131,7 @@ lightning-extrafiles:
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
# If the macbundle dist dir was already created, sync lightning here to avoid
# the need to make -C objdir/mail/app each time
tools::
libs::
[ -d $(DIST)/$(MOZ_MACBUNDLE_NAME) ] && rsync -aL $(FINAL_TARGET)/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/extensions/$(XPI_EM_ID) || true
endif

Просмотреть файл

@ -11,7 +11,7 @@ include $(DEPTH)/config/autoconf.mk
EXTRA_SCRIPTS = calDavRequestHandlers.js
tools:: $(EXTRA_SCRIPTS)
libs:: $(EXTRA_SCRIPTS)
if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
$(INSTALL) $^ $(FINAL_TARGET)/calendar-js

Просмотреть файл

@ -17,7 +17,7 @@ EXTRA_SCRIPTS = \
$(NULL)
# Use NSINSTALL to make the directory, as there's no mtime to preserve.
tools:: $(EXTRA_SCRIPTS)
libs:: $(EXTRA_SCRIPTS)
if test ! -d $(FINAL_TARGET)/js; then $(NSINSTALL) -D $(FINAL_TARGET)/js; fi
$(INSTALL) $^ $(FINAL_TARGET)/js

Просмотреть файл

@ -18,7 +18,7 @@ EXTRA_SCRIPTS = \
calWcapCalendar.js \
$(NULL)
tools:: $(EXTRA_SCRIPTS)
libs:: $(EXTRA_SCRIPTS)
if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
$(INSTALL) $^ $(FINAL_TARGET)/calendar-js

Просмотреть файл

@ -55,13 +55,13 @@ DEFINES += -DAB_CD=$(AB_CD) \
TIMEZONES_SQLITE = $(srcdir)/timezones.sqlite
ifneq ($(strip $(update)),)
tools::
libs::
echo 'SELECT * FROM tz_data ORDER BY tzid;' | sqlite3 $(TIMEZONES_SQLITE) > $(srcdir)/timezones_before_update.dump
$(DIST)/bin/run-mozilla.sh $(LIBXUL_DIST)/bin/xpcshell -s -w $(srcdir)/update.js $(update) $(srcdir)/$(DEPTH) $(TIMEZONES_VERSION)
echo 'SELECT * FROM tz_data ORDER BY tzid;' | sqlite3 $(TIMEZONES_SQLITE) > $(srcdir)/timezones.dump
endif
tools::
libs::
$(NSINSTALL) -m 0644 $(TIMEZONES_SQLITE) $(FINAL_TARGET)
libs-%: