dev/null |binary onlineupdate/source/update/updater/Makefile.in | 33 ---------- onlineupdate/source/update/updater/module.ver | 1 onlineupdate/source/update/updater/updater-xpcshell/Makefile.in | 10 --- 4 files changed, 44 deletions(-)
New commits: commit b690d647dabde355bd61fa7240bd8bd5ad170f79 Author: Markus Mohrhard <[email protected]> Date: Sat Jun 17 17:06:56 2017 +0200 updater: remove unnecessary file Change-Id: I50d4ec48599d64db490b1dcac839a52737d105d9 diff --git a/onlineupdate/source/update/updater/module.ver b/onlineupdate/source/update/updater/module.ver deleted file mode 100644 index 771416bb115d..000000000000 --- a/onlineupdate/source/update/updater/module.ver +++ /dev/null @@ -1 +0,0 @@ -WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ Software Updater commit 4e7650560478f4a731e58dbb150cb67be1b21aba Author: Markus Mohrhard <[email protected]> Date: Sat Jun 17 16:57:35 2017 +0200 updater: remove some of the old mozilla makefile pieces Change-Id: Ib94c2a5e8335732823cd6632937ae77774a6746d diff --git a/onlineupdate/source/update/updater/Makefile.in b/onlineupdate/source/update/updater/Makefile.in index b465031b2832..57813b36a20c 100644 --- a/onlineupdate/source/update/updater/Makefile.in +++ b/onlineupdate/source/update/updater/Makefile.in @@ -5,42 +5,11 @@ # 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 # have to regenerate it. # ./certutil -L -d modules/libmar/tests/unit/data -n mycert -r > xpcshellCertificate.der xpcshellCert.h: xpcshellCertificate.der -$(CERT_HEADERS): gen_cert_header.py - $(PYTHON) $< $(@:.h=Data) $(filter-out $<,$^) > $@ - ifdef MOZ_WIDGET_GTK libs:: updater.png $(NSINSTALL) -D $(DIST)/bin/icons @@ -57,5 +26,3 @@ libs:: $(NSINSTALL) $(DIST)/bin/updater $(DIST)/bin/updater.app/Contents/MacOS rm -f $(DIST)/bin/updater endif - -CXXFLAGS += $(MOZ_BZ2_CFLAGS) diff --git a/onlineupdate/source/update/updater/updater-xpcshell/Makefile.in b/onlineupdate/source/update/updater/updater-xpcshell/Makefile.in index 13b4e7f35d5a..21364883435f 100644 --- a/onlineupdate/source/update/updater/updater-xpcshell/Makefile.in +++ b/onlineupdate/source/update/updater/updater-xpcshell/Makefile.in @@ -10,14 +10,6 @@ MOCHITESTROOT = $(abspath $(DEPTH))/_tests/testing/mochitest/chrome/toolkit/moza include $(topsrcdir)/config/rules.mk -ifndef MOZ_WINCONSOLE -ifdef MOZ_DEBUG -MOZ_WINCONSOLE = 1 -else -MOZ_WINCONSOLE = 0 -endif -endif - libs:: ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) # Copy for xpcshell tests @@ -38,5 +30,3 @@ else cp $(PROGRAM) $(XPCSHELLTESTROOT)/data/updater$(BIN_SUFFIX) cp $(PROGRAM) $(MOCHITESTROOT)/data/updater$(BIN_SUFFIX) endif - -CXXFLAGS += $(MOZ_BZ2_CFLAGS) commit d221a78d86485f840ab0fc72a85a798a0dd13e4f Author: Markus Mohrhard <[email protected]> Date: Sat Jun 17 16:50:27 2017 +0200 updater: remove old updater certificate data Change-Id: I5e47337682b5a887e544cbc7e7963570253a70fc diff --git a/onlineupdate/source/update/updater/master-daily.der b/onlineupdate/source/update/updater/master-daily.der deleted file mode 100644 index 33dd3e7e665b..000000000000 Binary files a/onlineupdate/source/update/updater/master-daily.der and /dev/null differ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
