Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 26e3714

Browse files
glandiumglandium
committed
Bug 755724 - Move browser application in a subdirectory. r=jimm
1 parent 645fcfb commit 26e3714

25 files changed

Lines changed: 106 additions & 77 deletions

File tree

‎CLOBBER‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
#
1616
# Note: The description below will be part of the error message shown to users.
1717
#
18-
Bug 793928 - Move the promise library to a new location
18+
Bug 755724 - Move browser application in a subdirectory

‎browser/app-rules.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
PURGECACHES_DIRS = $(DIST)/bin/browser

‎browser/app/Makefile.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ RCFLAGS += -DMOZ_PHOENIX
102102
RCFLAGS += -DFIREFOX_ICO=\"$(DIST)/branding/firefox-os2.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document-os2.ico\"
103103
endif
104104

105+
PROGRAMS_DEST = $(DIST)/bin
106+
105107
include $(topsrcdir)/config/rules.mk
106108

107109
ifeq ($(OS_ARCH),WINNT) #{

‎browser/app/nsBrowserApp.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ static int do_main(int argc, char* argv[], nsIFile *xreDirectory)
178178
}
179179
nsCOMPtr<nsIFile> appDir;
180180
exeFile->GetParent(getter_AddRefs(appDir));
181+
appDir->Append(NS_LITERAL_STRING("browser"));
181182

182183
SetStrongPtr(appData.directory, static_cast<nsIFile*>(appDir.get()));
183184
// xreDirectory already has a refcount from NS_NewLocalFile

‎browser/components/dirprovider/tests/unit/xpcshell.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[DEFAULT]
22
head = head_dirprovider.js
33
tail =
4+
firefox-appdir = browser
45

56
[test_bookmark_pref.js]
67
[test_keys.js]

‎browser/components/downloads/test/unit/xpcshell.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[DEFAULT]
22
head = head.js
33
tail =
4+
firefox-appdir = browser
45

56
[test_DownloadsCommon.js]

‎browser/components/feeds/test/unit/xpcshell.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[DEFAULT]
22
head = head_feeds.js
33
tail =
4+
firefox-appdir = browser
45

56
[test_355473.js]
67
[test_758990.js]

‎browser/components/migration/tests/unit/xpcshell.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[DEFAULT]
22
head = head_migration.js
33
tail =
4+
firefox-appdir = browser
45

56
[test_IE_bookmarks.js]
67
skip-if = os != "win"

‎browser/components/places/tests/unit/xpcshell.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[DEFAULT]
22
head = head_bookmarks.js
33
tail =
4+
firefox-appdir = browser
45

56
[test_421483.js]
67
[test_browserGlue_corrupt.js]

‎browser/components/sessionstore/test/unit/xpcshell.ini‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[DEFAULT]
22
head = head.js
33
tail =
4+
firefox-appdir = browser
45

56
[test_startup_nosession_sync.js]
67
[test_startup_nosession_async.js]
78
[test_startup_session_sync.js]
8-
[test_startup_session_async.js]
9+
[test_startup_session_async.js]

0 commit comments

Comments
 (0)