Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
4e765056
Kaydet (Commit)
4e765056
authored
Haz 17, 2017
tarafından
Markus Mohrhard
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
updater: remove some of the old mozilla makefile pieces
Change-Id: Ib94c2a5e8335732823cd6632937ae77774a6746d
üst
d221a78d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
43 deletions
+0
-43
Makefile.in
onlineupdate/source/update/updater/Makefile.in
+0
-33
Makefile.in
...update/source/update/updater/updater-xpcshell/Makefile.in
+0
-10
No files found.
onlineupdate/source/update/updater/Makefile.in
Dosyayı görüntüle @
4e765056
...
@@ -5,42 +5,11 @@
...
@@ -5,42 +5,11 @@
# For changes here, also consider ./updater-xpcshell/Makefile.in
# For changes here, also consider ./updater-xpcshell/Makefile.in
ifndef
MOZ_WINCONSOLE
ifdef
MOZ_DEBUG
MOZ_WINCONSOLE
=
1
else
MOZ_WINCONSOLE
=
0
endif
endif
include
$(topsrcdir)/config/rules.mk
ifneq
(,$(filter
beta
release
esr,$(MOZ_UPDATE_CHANNEL)))
PRIMARY_CERT
=
release_primary.der
SECONDARY_CERT
=
release_secondary.der
else
ifneq
(,$(filter
nightly
aurora
nightly-elm
nightly-profiling
nightly-oak
nightly-ux,$(MOZ_UPDATE_CHANNEL)))
PRIMARY_CERT
=
nightly_aurora_level3_primary.der
SECONDARY_CERT
=
nightly_aurora_level3_secondary.der
else
PRIMARY_CERT
=
dep1.der
SECONDARY_CERT
=
dep2.der
endif
CERT_HEADERS
:=
primaryCert.h secondaryCert.h xpcshellCert.h
export
::
$(CERT_HEADERS)
primaryCert.h
:
$(PRIMARY_CERT)
secondaryCert.h
:
$(SECONDARY_CERT)
# This is how the xpcshellCertificate.der file is generated, in case we ever
# This is how the xpcshellCertificate.der file is generated, in case we ever
# have to regenerate it.
# have to regenerate it.
# ./certutil -L -d modules/libmar/tests/unit/data -n mycert -r > xpcshellCertificate.der
# ./certutil -L -d modules/libmar/tests/unit/data -n mycert -r > xpcshellCertificate.der
xpcshellCert.h
:
xpcshellCertificate.der
xpcshellCert.h
:
xpcshellCertificate.der
$(CERT_HEADERS)
:
gen_cert_header.py
$(PYTHON)
$<
$
(
@:.h
=
Data
)
$
(
filter-out
$<
,
$^
)
>
$@
ifdef
MOZ_WIDGET_GTK
ifdef
MOZ_WIDGET_GTK
libs
::
updater.png
libs
::
updater.png
$(NSINSTALL)
-D
$(DIST)
/bin/icons
$(NSINSTALL)
-D
$(DIST)
/bin/icons
...
@@ -57,5 +26,3 @@ libs::
...
@@ -57,5 +26,3 @@ libs::
$(NSINSTALL)
$(DIST)
/bin/updater
$(DIST)
/bin/updater.app/Contents/MacOS
$(NSINSTALL)
$(DIST)
/bin/updater
$(DIST)
/bin/updater.app/Contents/MacOS
rm
-f
$(DIST)
/bin/updater
rm
-f
$(DIST)
/bin/updater
endif
endif
CXXFLAGS
+=
$(MOZ_BZ2_CFLAGS)
onlineupdate/source/update/updater/updater-xpcshell/Makefile.in
Dosyayı görüntüle @
4e765056
...
@@ -10,14 +10,6 @@ MOCHITESTROOT = $(abspath $(DEPTH))/_tests/testing/mochitest/chrome/toolkit/moza
...
@@ -10,14 +10,6 @@ MOCHITESTROOT = $(abspath $(DEPTH))/_tests/testing/mochitest/chrome/toolkit/moza
include
$(topsrcdir)/config/rules.mk
include
$(topsrcdir)/config/rules.mk
ifndef
MOZ_WINCONSOLE
ifdef
MOZ_DEBUG
MOZ_WINCONSOLE
=
1
else
MOZ_WINCONSOLE
=
0
endif
endif
libs
::
libs
::
ifeq
(cocoa,$(MOZ_WIDGET_TOOLKIT))
ifeq
(cocoa,$(MOZ_WIDGET_TOOLKIT))
# Copy for xpcshell tests
# Copy for xpcshell tests
...
@@ -38,5 +30,3 @@ else
...
@@ -38,5 +30,3 @@ else
cp
$(PROGRAM)
$(XPCSHELLTESTROOT)/data/updater$(BIN_SUFFIX)
cp
$(PROGRAM)
$(XPCSHELLTESTROOT)/data/updater$(BIN_SUFFIX)
cp
$(PROGRAM)
$(MOCHITESTROOT)/data/updater$(BIN_SUFFIX)
cp
$(PROGRAM)
$(MOCHITESTROOT)/data/updater$(BIN_SUFFIX)
endif
endif
CXXFLAGS
+=
$(MOZ_BZ2_CFLAGS)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment