Skip to content

Commit

Permalink
final changes to 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@rn10950
rn10950 committed Feb 23, 2019
1 parent 1a340f4 commit 20ad675
Show file tree
Hide file tree
Showing 21 changed files with 85 additions and 84 deletions.
4 changes: 2 additions & 2 deletions profile/defaults/bookmarks.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <H1>Bookmarks</H1>
<DT><H3>mozilla.org</H3>
<DL><p>
<DT><A HREF="http://www.mozilla.org/">The Mozilla Organization</A>
<DT><A HREF="http://retrozilla.no-ip.org">RetroZilla Project</a>
<DT><A HREF="https://rn10950.github.io/RetroZillaWeb/">RetroZilla Project</a>
<DT><A HREF="http://www.mozilla.org/products/">Mozilla Products</A>
<DT><A HREF="http://www.mozilla.org/feedback.html">Feedback</A>
</DL><p>
Expand All @@ -40,5 +40,5 @@ <H1>Bookmarks</H1>
<HR>
<!-- Google search via "?" in the urlbar -->
<DT><A HREF="http://www.google.com/search?q=%s" ADD_DATE="1507679199" SHORTCUTURL="?" LAST_CHARSET="UTF-8" ID="rdf:#$DfKAE2">Internet Search</A>
<DT><A HREF="https://classic.startpage.com//do/search?&query=%s" ADD_DATE="1507685020" SHORTCUTURL="?sp" LAST_CHARSET="UTF-8" ID="rdf:#$PfKAE2">Startpage Web Search</A>
<!--<DT><A HREF="https://classic.startpage.com//do/search?&query=%s" ADD_DATE="1507685020" SHORTCUTURL="?sp" LAST_CHARSET="UTF-8" ID="rdf:#$PfKAE2">Startpage Web Search</A>-->
</DL><p>
2 changes: 1 addition & 1 deletion profile/defaults/search.rdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:google.src" />
<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:dmoz.src" />
<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:jeeves.src" />
<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:startpage.src" />
<!--<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:startpage.src" />-->
</RDF:Seq>

</RDF:RDF>
2 changes: 1 addition & 1 deletion xpfe/global/resources/content/about.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ h1 {
<hr />

<ul>
<li>Copyright &copy; 1998&ndash;2010, 2015-2018 by <a href="about:credits">Contributors</a> to
<li>Copyright &copy; 1998&ndash;2010, 2015-2019 by <a href="about:credits">Contributors</a> to
the Mozilla and RetroZilla codebases under the <a href="about:license">Mozilla Public License
and other licenses</a>. All Rights Reserved.</li>

Expand Down
1 change: 1 addition & 0 deletions xpfe/global/resources/content/aboutChangelog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ <h3>New Features</h3>
<li>Various security fixes</li>
<li>Various build system changes</li>
<li>RetroZilla Browser (Firefox) code added</li>
<li>Non-standard ports of gopher can now be accessed by toggling network.gopher.port-restricted in about:config</li>
<li>Typing search queries directly in the URLbar now supported</li>
</ul>
<h3>Bug Fixes</h3>
Expand Down
10 changes: 5 additions & 5 deletions xpinstall/packager/win_gre/config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Uninstall Filename=GREUninstall.exe

; This key is used as a fail over key. This url will be used when the
; url in the Site Selector fails.
url=ftp://not.supplied.invalid
url=http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/windows-xpi

; Default Setup Type values:
; Setup Type 0 - first radio button (default)
Expand Down Expand Up @@ -142,7 +142,7 @@ Show Dialog=TRUE
;*** LOCALIZE ME BABY ***
Title=GRE Setup - Welcome
;*** LOCALIZE ME BABY ***
Message0=Welcome to %s Setup. You are about to install %s version 2.1.0.0000000000.
Message0=Welcome to %s Setup. You are about to install %s version 2.2.0.0000000000.
;*** LOCALIZE ME BABY ***
Message1=It is strongly recommended that you exit all Windows programs before running this Setup program.
;*** LOCALIZE ME BABY ***
Expand Down Expand Up @@ -655,7 +655,7 @@ Timing=post smartupdate
Root Key=HKEY_LOCAL_MACHINE
Key=[REGPATH]\Uninstall
Name=Description
Name Value=GRE (2.1)
Name Value=GRE (2.2)
Type=REG_SZ
Decrypt Key=TRUE
Decrypt Name=FALSE
Expand Down Expand Up @@ -820,11 +820,11 @@ Identifier0=Site0
;*** LOCALIZE ME BABY ***
Description0=Default
;*** LOCALIZE ME BABY ***
Domain0=ftp://not.supplied.invalid
Domain0=http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/windows-xpi

Identifier1=Site1
;*** LOCALIZE ME BABY ***
Description1=North America
;*** LOCALIZE ME BABY ***
Domain1=ftp://not.supplied.invalid
Domain1=http://ftp.mozilla.org/pub/mozilla.org/pub/seamonkey/nightly/latest-trunk/windows-xpi

4 changes: 2 additions & 2 deletions xpinstall/packager/win_gre/gre.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ function registerMainKeys(winreg)
subkey = regRootKey + "\\Uninstall";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Uninstall Log Folder", fProgram + "Uninstall");
err = winreg.setValueString(subkey, "Description", "GRE (2.1)");
err = winreg.setValueString(subkey, "Description", "GRE (2.2)");
}

// main
Expand All @@ -210,7 +210,7 @@ var regRootKey;
regRootKey = new String(Install.arguments);

srDest = 1;
err = initInstall("GRE", "GRE", "2.1.0.0000000000");
err = initInstall("GRE", "GRE", "2.2.0.0000000000");
logComment("initInstall: " + err);

fProgram = getFolder("Program");
Expand Down
8 changes: 4 additions & 4 deletions xpinstall/packager/win_gre/xpcom.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ var fileMsvcrt;
var fileMsvcirt;

srDest = 1;
err = initInstall("Mozilla XPCOM", "XPCOM", "2.1.0.0000000000");
err = initInstall("Mozilla XPCOM", "XPCOM", "2.2.0.0000000000");
logComment("initInstall: " + err);

fProgram = getFolder("Program");
Expand All @@ -137,7 +137,7 @@ if(verifyDiskSpace(fProgram, srDest))

upgradeCleanup();
err = addDirectory("",
"2.1.0.0000000000",
"2.2.0.0000000000",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
Expand All @@ -156,7 +156,7 @@ if(verifyDiskSpace(fProgram, srDest))
{
logComment("File not found: " + fileMsvcrt);
addFile("/Microsoft/Shared/msvcrt.dll",
"2.1.0.0000000000",
"2.2.0.0000000000",
"msvcrt.dll", // dir name in jar to extract
fWindowsSystem, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to fProgram
Expand All @@ -178,7 +178,7 @@ if(verifyDiskSpace(fProgram, srDest))
{
logComment("File not found: " + fileMsvcirt);
addFile("/Microsoft/Shared/msvcirt.dll",
"2.1.0.0000000000",
"2.2.0.0000000000",
"msvcirt.dll", // dir name in jar to extract
fWindowsSystem, // Where to put this file (Returned from getFolder)
"", // subdir name to create relative to fProgram
Expand Down
34 changes: 17 additions & 17 deletions xpinstall/packager/windows/browser.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ function registerProgramFolderKey(winreg, fFolderPath)

subkey = "SOFTWARE\\RetroZilla\\RetroZilla";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "CurrentVersion", "2.1 (en)");
err = winreg.setValueString(subkey, "CurrentVersion", "2.2 (en)");

subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)";
winreg.createKey(subkey,"");

subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)\\Main";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)\\Main";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Program Folder Path", fFolderPath);
}
Expand Down Expand Up @@ -219,7 +219,7 @@ function createShortcuts()
}
logComment("folderQuickLaunchExists: " + folderQuickLaunchExists);

subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)\\Main";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)\\Main";
fFolderPathStr = winreg.getValueString(subkey, "Program Folder Path");
if((fFolderPathStr == "") || (fFolderPathStr == null))
{
Expand Down Expand Up @@ -293,7 +293,7 @@ function createShortcuts()
fileDelete(fFolderPath);
}

subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)\\Setup";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)\\Setup";
regvalue = winreg.getValueString(subkey, "browserargs");

/* log this so if the user turns on turbo mode in the browser the uninstaller will undo it */
Expand Down Expand Up @@ -366,33 +366,33 @@ function registerMainKeys(winreg)

subkey = "SOFTWARE\\RetroZilla\\RetroZilla";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "CurrentVersion", "2.1 (en)");
err = winreg.setValueString(subkey, "CurrentVersion", "2.2 (en)");

subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)";
winreg.createKey(subkey,"");

subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)\\Main";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)\\Main";
winreg.createKey(subkey,"");

err = winreg.setValueString(subkey, "Install Directory", fProgram);

// The following keys are required to be created to supply information
// about the location of the Gecko Embedded Client to 3rd party apps.
// "SOFTWARE\\Mozilla" must not be localized!
subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.1";
subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.2";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "GeckoVer", "$GreVersion$");

subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.1\\Extensions";
subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.2\\Extensions";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "Components", fProgram + "Components");
err = winreg.setValueString(subkey, "Plugins", fProgram + "Plugins");

subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.1\\bin";
subkey = "SOFTWARE\\Mozilla\\RetroZilla 2.2\\bin";
winreg.createKey(subkey,"");
err = winreg.setValueString(subkey, "PathToExe", fProgram + "RetroZilla.exe");

subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.1 (en)\\Main";
subkey = "SOFTWARE\\RetroZilla\\RetroZilla\\2.2 (en)\\Main";
err = winreg.setValueString(subkey, "PathToExe", fProgram + "RetroZilla.exe");

// Register as a windows XP internet browser
Expand All @@ -416,15 +416,15 @@ function registerMainKeys(winreg)
data = "\"" + fProgram + "RetroZilla.exe\"";
winreg.setValueString(subkey + "\\shell\\open\\command", "", data);

data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.1 (en)\" /hs browser";
data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.2 (en)\" /hs browser";
winreg.setValueString(subkey + "\\InstallInfo", "HideIconsCommand", data);

winreg.setValueNumber(subkey + "\\InstallInfo", "IconsVisible", 1);

data = "\"" + fProgram + "RetroZilla.exe\" -silent -nosplash -setDefaultBrowser ";
winreg.setValueString(subkey + "\\InstallInfo", "ReinstallCommand", data);

data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.1 (en)\" /ss browser";
data = "\"" + fProgram + "uninstall\\retrozillaUninstall.exe\" /ua \"2.2 (en)\" /ss browser";
winreg.setValueString(subkey + "\\InstallInfo", "ShowIconsCommand", data);
}
}
Expand Down Expand Up @@ -725,7 +725,7 @@ if(args == "-greLocal")
gGreLocal = true;

srDest = 1;
err = initInstall("RetroZilla", "Browser", "2.1.0.0000000000");
err = initInstall("RetroZilla", "Browser", "2.2.0.0000000000");
logComment("initInstall: " + err);

fProgram = getFolder("Program");
Expand All @@ -738,7 +738,7 @@ if(verifyDiskSpace(fProgram, srDest))

upgradeCleanup();
err = addDirectory("",
"2.1.0.0000000000",
"2.2.0.0000000000",
"bin", // dir name in jar to extract
fProgram, // Where to put this file (Returned from GetFolder)
"", // subdir name to create relative to fProgram
Expand Down Expand Up @@ -830,7 +830,7 @@ if(verifyDiskSpace(fProgram, srDest))
if (! ('buildID' in Install))
{
logComment("Running Pre-Mozilla 0.9.1");
initInstall("Post-install Cleanup Utility", "Browser/xpicleanup", "2.1.0.0000000000");
initInstall("Post-install Cleanup Utility", "Browser/xpicleanup", "2.2.0.0000000000");
cleanupUtility = getFolder(fProgram, "xpicleanup.exe");
err = File.execute(cleanupUtility);
logComment("execute() returned: " + err);
Expand Down
2 changes: 1 addition & 1 deletion xpinstall/packager/windows/chatzilla.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function getPlatform()
return platformNode;
}

var err = initInstall("Chatzilla v0.5", "Chatzilla", "2.1.0.0000000000");
var err = initInstall("Chatzilla v0.5", "Chatzilla", "2.2.0.0000000000");
logComment("initInstall: " + err);

addFile("Chatzilla service",
Expand Down
Loading

0 comments on commit 20ad675

Please sign in to comment.