зеркало из https://github.com/mozilla/gecko-dev.git
bug #13848, build the MRJ plugin as part of the standard build. Checking this, although it isn't turned on yet, so shouldn't affect the current build.
This commit is contained in:
Родитель
c61f315ca3
Коммит
74f213b360
|
@ -1870,6 +1870,51 @@ sub BuildExtensionsProjects()
|
||||||
print("--- Extensions projects complete ----\n");
|
print("--- Extensions projects complete ----\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#//--------------------------------------------------------------------------------------------------
|
||||||
|
#// Build Plugins Projects
|
||||||
|
#//--------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
sub BuildPluginsProjects()
|
||||||
|
{
|
||||||
|
my($plugin_path) = ":mozilla:plugin:oji:MRJ:plugin:";
|
||||||
|
my($project_path) = $plugin_path . "MRJPlugin.mcp";
|
||||||
|
my($xml_path) = $plugin_path . "MRJPlugin.xml";
|
||||||
|
|
||||||
|
my($project_modtime) = (-e $project_path ? getModificationDate($project_path) : 0);
|
||||||
|
my($xml_modtime) = (-e $xml_path ? getModificationDate($xml_path) : 0);
|
||||||
|
|
||||||
|
if ($xml_modtime > $project_modtime) {
|
||||||
|
print("MRJPlugin.mcp is out of date, reimporting from MRJPlugin.xml.\n");
|
||||||
|
|
||||||
|
# delete the old project file.
|
||||||
|
unlink($project_path);
|
||||||
|
|
||||||
|
# import the xml project.
|
||||||
|
system($plugin_path . "MRJPlugin.import");
|
||||||
|
|
||||||
|
# wait for the file to be created.
|
||||||
|
while (!(-e $project_path)) { WaitNextEvent(); }
|
||||||
|
|
||||||
|
# wait for script to finish, so that we see correct results.
|
||||||
|
while (_processRunning("MRJPlugin.import")) { WaitNextEvent(); }
|
||||||
|
}
|
||||||
|
|
||||||
|
# Build MRJPlugin
|
||||||
|
BuildProject($project_path, "MRJPlugin");
|
||||||
|
|
||||||
|
# Build MRJPlugin.jar (if Java tools exist)
|
||||||
|
my($linker_path) = getCodeWarriorPath("CodeWarrior Plugins:Linkers:Java Linker");
|
||||||
|
if (-e $linker_path) {
|
||||||
|
print("CodeWarrior Java tools detected, building MRJPlugin.jar.\n");
|
||||||
|
BuildProject($project_path, "MRJPlugin.jar");
|
||||||
|
}
|
||||||
|
|
||||||
|
# Copy MRJPlugin, MRJPlugin.jar to appropriate plugins folder.
|
||||||
|
my($plugin_dist) = _getDistDirectory() . "Plugins:";
|
||||||
|
MakeAlias($plugin_path . "MRJPlugin", $plugin_dist);
|
||||||
|
MakeAlias($plugin_path . "MRJPlugin.jar", $plugin_dist);
|
||||||
|
}
|
||||||
|
|
||||||
#//--------------------------------------------------------------------------------------------------
|
#//--------------------------------------------------------------------------------------------------
|
||||||
#// Build MailNews Projects
|
#// Build MailNews Projects
|
||||||
#//--------------------------------------------------------------------------------------------------
|
#//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -2005,6 +2050,9 @@ sub BuildProjects()
|
||||||
BuildMailNewsProjects();
|
BuildMailNewsProjects();
|
||||||
BuildMozilla();
|
BuildMozilla();
|
||||||
|
|
||||||
|
# Build plugins.
|
||||||
|
# BuildPluginsProjects();
|
||||||
|
|
||||||
# do this last so as not to pollute dist with non-include files
|
# do this last so as not to pollute dist with non-include files
|
||||||
# before building projects.
|
# before building projects.
|
||||||
MakeResourceAliases();
|
MakeResourceAliases();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче