wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout changeset 3b7b6b0bd9ef (bug 647453) because it breaks packaging

Browse Source
This commit is contained in:
Ehsan Akhgari 2011-04-12 16:26:32 -04:00
parent 1408fdfa33
commit d3f761cbe6
2 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
browser/installer/Makefile.in
View File

@ -122,23 +122,13 @@ ifdef RUN_TEST_PROGRAM
_ABS_RUN_TEST_PROGRAM = $(call core_abspath,$(RUN_TEST_PROGRAM))
endif
ifndef MOZ_DEBUG
# The precompile_cache.js script outputs a list of files that were
# serialized and do not need to be included in the omnijar anymore
STRIP_ORIGINAL_FILES = zip -d omni.jar `cat sc_log.txt`
else
STRIP_ORIGINAL_FILES = true
endif
GENERATE_CACHE = \
$(_ABS_RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$$PWD" -f $(topsrcdir)/browser/installer/precompile_cache.js -e 'populate_startupcache("omni.jar", "startupCache.zip", "sc_log.txt");' && \
$(_ABS_RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$$PWD" -f $(topsrcdir)/browser/installer/precompile_cache.js -e 'populate_startupcache("omni.jar", "startupCache.zip");' && \
rm -rf jsloader && \
$(UNZIP) startupCache.zip && \
rm startupCache.zip && \
find jsloader | xargs touch -t 201001010000 && \
$(ZIP) -r9mX omni.jar jsloader && \
$(STRIP_ORIGINAL_FILES) && \
rm sc_log.txt
$(ZIP) -r9mX omni.jar jsloader
endif
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk

25
browser/installer/precompile_cache.js
View File

@ -43,14 +43,6 @@ const Cc = Components.classes;
const Ci = Components.interfaces;
const Cu = Components.utils;
const MODE_RDONLY = 0x01;
const MODE_WRONLY = 0x02;
const MODE_CREATE = 0x08;
const MODE_APPEND = 0x10;
const MODE_TRUNCATE = 0x20;
var out;
function setenv(name, val) {
try {
var environment = Components.classes["@mozilla.org/process/environment;1"].
@ -79,7 +71,6 @@ function load_entries(entries, prefix) {
continue;
if (c.indexOf("services-crypto") >= 0)
continue;
out.writeString(c + "\n");
load(prefix + c);
}
}
@ -87,7 +78,6 @@ function load_entries(entries, prefix) {
function load_custom_entries(entries, subst) {
while (entries.hasMore()) {
var c = entries.getNext();
out.writeString(c + "\n");
load("resource://" + subst + "/" + c.replace("modules/" + subst + "/", ""));
}
}
@ -104,7 +94,7 @@ function openJar(file) {
return zipreader;
}
function populate_startupcache(omnijarName, startupcacheName, logName) {
function populate_startupcache(omnijarName, startupcacheName) {
var file = getGreDir();
file.append(omnijarName);
zipreader = openJar(file);
@ -113,18 +103,6 @@ function populate_startupcache(omnijarName, startupcacheName, logName) {
scFile.append(startupcacheName);
setenv("MOZ_STARTUP_CACHE", scFile.path);
var logFile = getGreDir();
logFile.append(logName);
var stream = Cc["@mozilla.org/network/file-output-stream;1"]
.createInstance(Ci.nsIFileOutputStream);
stream.init(logFile, MODE_WRONLY | MODE_CREATE | MODE_TRUNCATE, 0666, 0);
out = Cc["@mozilla.org/intl/converter-output-stream;1"]
.createInstance(Ci.nsIConverterOutputStream);
out.init(stream, "UTF-8", 0, 0);
// the sync part below doesn't work as smoothly
let ioService = Cc["@mozilla.org/network/io-service;1"].
getService(Ci.nsIIOService);
@ -148,5 +126,4 @@ function populate_startupcache(omnijarName, startupcacheName, logName) {
load_entries(zipreader.findEntries("modules/*js"), "resource://gre/");
load_entries(zipreader.findEntries("modules/*jsm"), "resource://gre/");
zipreader.close();
out.close();
}