diff --git a/embedding/config/basebrowser-installer-win.pkg b/embedding/config/basebrowser-installer-win.pkg index fd2e4560f50..2653b737e90 100644 --- a/embedding/config/basebrowser-installer-win.pkg +++ b/embedding/config/basebrowser-installer-win.pkg @@ -222,3 +222,7 @@ components\xmlextras_interfaceinfo.xpt ; components\ucvmath.dll +; p3p +components\p3p.dll +components\p3p.xpt + diff --git a/embedding/config/basebrowser-mac-macho b/embedding/config/basebrowser-mac-macho index f0310c77f83..78b59ebac46 100644 --- a/embedding/config/basebrowser-mac-macho +++ b/embedding/config/basebrowser-mac-macho @@ -265,3 +265,8 @@ res/fonts/fontEncoding.properties ;res/fonts/mathfontPUA.properties ;res/fonts/mathfontSymbol.properties ;Components/ucvmath.dylib + +; p3p +components/libp3p.dylib +components/p3p.xpt + diff --git a/embedding/config/basebrowser-unix b/embedding/config/basebrowser-unix index 6bc66ba31d2..1bf86f62c21 100644 --- a/embedding/config/basebrowser-unix +++ b/embedding/config/basebrowser-unix @@ -271,3 +271,8 @@ res/entityTables/transliterate.properties ;res/fonts/mathfontPUA.properties ;res/fonts/mathfontSymbol.properties ;components/libucvmath.so + +; p3p +components/libp3p.so +components/p3p.xpt + diff --git a/embedding/config/basebrowser-win b/embedding/config/basebrowser-win index 5ee5419a2d5..b6318662c26 100644 --- a/embedding/config/basebrowser-win +++ b/embedding/config/basebrowser-win @@ -232,3 +232,6 @@ components\xmlextras_interfaceinfo.xpt ; ; components\ucvmath.dll +; p3p +components\p3p.dll +components\p3p.xpt diff --git a/xpinstall/packager/build/win/mozilla/XPI_JSTs/browser.jst b/xpinstall/packager/build/win/mozilla/XPI_JSTs/browser.jst index 8d81d94832a..b2522c76137 100644 --- a/xpinstall/packager/build/win/mozilla/XPI_JSTs/browser.jst +++ b/xpinstall/packager/build/win/mozilla/XPI_JSTs/browser.jst @@ -506,6 +506,7 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/navigator/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","help.jar"),"content/help/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/xbl-marquee/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/p3p/"); /* Log files that are created after the installer is done, so they can be uninstalled */ logComment("Installing: " + fProgram + ".autoreg"); diff --git a/xpinstall/packager/mac/browser.jst b/xpinstall/packager/mac/browser.jst index 73d6e08e582..238f6540794 100644 --- a/xpinstall/packager/mac/browser.jst +++ b/xpinstall/packager/mac/browser.jst @@ -100,6 +100,7 @@ if (verifyDiskSpace(fProgram, srDest)) registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"pippki.jar"), "content/pippki/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"pipnss.jar"), "content/pipnss/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/xbl-marquee/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/p3p/"); // make an alias to the browser on the desktop var desktopFolder = getFolder("Mac Desktop"); diff --git a/xpinstall/packager/mac/langenus.jst b/xpinstall/packager/mac/langenus.jst index 44a8600f901..e2707d325eb 100644 --- a/xpinstall/packager/mac/langenus.jst +++ b/xpinstall/packager/mac/langenus.jst @@ -72,6 +72,7 @@ if (verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, localeName + "help/"); registerChrome(chromeType, cf, localeName + "pippki/"); registerChrome(chromeType, cf, localeName + "pipnss/"); + registerChrome(chromeType, cf, localeName + "p3p/"); registerChrome(chromeType, pf, localeName + "global-platform/"); registerChrome(chromeType, pf, localeName + "communicator-platform/"); diff --git a/xpinstall/packager/packages-mac b/xpinstall/packager/packages-mac index 42b405368a5..9c1d6dee16f 100644 --- a/xpinstall/packager/packages-mac +++ b/xpinstall/packager/packages-mac @@ -227,6 +227,10 @@ viewer:Components:mozldap.xpt viewer:Components:ldapAutoComplete.xpt viewer:Essential Files:LDAPClient.shlb +; p3p +viewer:Components:p3p.xpt +viewer:Components:p3p.shlb + viewer:chrome:help.jar viewer:chrome:comm.jar viewer:chrome:content-packs.jar diff --git a/xpinstall/packager/packages-os2 b/xpinstall/packager/packages-os2 index 94fee8fce45..d58549b0c55 100644 --- a/xpinstall/packager/packages-os2 +++ b/xpinstall/packager/packages-os2 @@ -457,3 +457,7 @@ bin/res/inspector/search-registry.rdf ;xpcomsample.xpt - Sample ;xpctest.dll -Test ;xpconnect_tests.xpt - Test + +; p3p +bin/components/p3p.xpt +bin/components/p3p.dll diff --git a/xpinstall/packager/packages-static-unix b/xpinstall/packager/packages-static-unix index 48ea72f2773..8698185d7d6 100644 --- a/xpinstall/packager/packages-static-unix +++ b/xpinstall/packager/packages-static-unix @@ -241,6 +241,9 @@ bin/res/samples/* bin/res/builtin/htmlBindings.xml bin/res/builtin/platformHTMLBindings.xml +; p3p +bin/components/p3p.xpt +bin/components/libp3p.so [mail] bin/components/libmeta_mail.so diff --git a/xpinstall/packager/packages-static-win b/xpinstall/packager/packages-static-win index 2048e1b99d7..84ee27ea7dc 100644 --- a/xpinstall/packager/packages-static-win +++ b/xpinstall/packager/packages-static-win @@ -205,6 +205,9 @@ bin\components\nsDownloadProgressListener.js bin\components\typeaheadfind.xpt bin\components\nsCloseAllWindows.js +; p3p +bin\components\p3p.dll +bin\components\p3p.xpt ; chrome stuff bin\chrome\help.jar diff --git a/xpinstall/packager/packages-unix b/xpinstall/packager/packages-unix index c73147249b3..9ae1fc913cf 100644 --- a/xpinstall/packager/packages-unix +++ b/xpinstall/packager/packages-unix @@ -249,6 +249,10 @@ bin/liblber50.so bin/components/libmozldap.so bin/components/mozldap.xpt +; p3p +bin/components/p3p.xpt +bin/components/libp3p.so + bin/chrome/help.jar bin/chrome/toolkit.jar bin/chrome/comm.jar diff --git a/xpinstall/packager/unix/browser.jst b/xpinstall/packager/unix/browser.jst index 004c86fda62..4efe0b5ce4c 100644 --- a/xpinstall/packager/unix/browser.jst +++ b/xpinstall/packager/unix/browser.jst @@ -103,6 +103,7 @@ if (verifyDiskSpace(communicatorFolder, srDest)) registerChrome(SKIN | DELAYED_CHROME, getFolder(cf,"modern.jar"),"skin/modern/navigator/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"help.jar"),"content/help/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/xbl-marquee/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder(cf,"comm.jar"),"content/p3p/"); if (err==SUCCESS) { diff --git a/xpinstall/packager/unix/langenus.jst b/xpinstall/packager/unix/langenus.jst index 69df2554a3e..c60620dcb20 100644 --- a/xpinstall/packager/unix/langenus.jst +++ b/xpinstall/packager/unix/langenus.jst @@ -73,6 +73,7 @@ if (verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, localeName + "net2phone/"); registerChrome(chromeType, cf, localeName + "pipnss/"); registerChrome(chromeType, cf, localeName + "pippki/"); + registerChrome(chromeType, cf, localeName + "p3p/"); registerChrome(chromeType, pf, localeName + "global-platform/"); registerChrome(chromeType, pf, localeName + "communicator-platform/"); diff --git a/xpinstall/packager/windows/browser.jst b/xpinstall/packager/windows/browser.jst index 4a514a0daa7..dec5e6b2cc4 100644 --- a/xpinstall/packager/windows/browser.jst +++ b/xpinstall/packager/windows/browser.jst @@ -611,6 +611,7 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","modern.jar"),"skin/modern/navigator/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","help.jar"),"content/help/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/xbl-marquee/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/p3p/"); // We need to register the psm chrome files. // We're checking to see if they exist first in case diff --git a/xpinstall/packager/windows/langenus.jst b/xpinstall/packager/windows/langenus.jst index c36b0a74bf3..1ba27195256 100644 --- a/xpinstall/packager/windows/langenus.jst +++ b/xpinstall/packager/windows/langenus.jst @@ -73,6 +73,7 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, localeName + "help/"); registerChrome(chromeType, cf, localeName + "pippki/"); registerChrome(chromeType, cf, localeName + "pipnss/"); + registerChrome(chromeType, cf, localeName + "p3p/"); registerChrome(chromeType, pf, localeName + "global-platform/"); registerChrome(chromeType, pf, localeName + "communicator-platform/");