зеркало из https://github.com/mozilla/gecko-dev.git
Fixed bug 212520: Calendar xpi should follow the standar xpi structure
This commit is contained in:
mostafah%oeone.com
Родитель
bbc5609769
Коммит
3bbbae9018
|
|
@ -46,40 +46,6 @@ DIRS = libxpical resources
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
winxpi::
|
||||
rm -f calendar_windows.xpi
|
||||
rm -rf windows/components
|
||||
rm -rf windows/resources
|
||||
|
||||
echo "Building Windows xpi..."
|
||||
cp -r resources ./windows
|
||||
./createBuildId.pl ./windows/resources/content/about.html
|
||||
cd windows
|
||||
mkdir -p ./windows/components
|
||||
cp libxpical/xpical.dll ./windows/components
|
||||
cp libxpical/_xpidlgen/calendar.xpt ./windows/components
|
||||
cp resources/content/calendarService.js ./windows/components
|
||||
cd windows; find components/ resources/ icons/ install.js \( -name CVS -o -name Makefile -o -name makefile.win -o -name Makefile.in -o -name test -o -name .cvsignore \) -prune -o -print | xargs zip calendar_windows.xpi
|
||||
mv ./windows/calendar_windows.xpi .
|
||||
echo "Done."
|
||||
|
||||
linuxxpi::
|
||||
rm -f calendar_linux.xpi
|
||||
rm -rf linux/components
|
||||
rm -rf linux/resources
|
||||
|
||||
echo "Building Linux xpi..."
|
||||
cp -r resources ./linux
|
||||
./createBuildId.pl ./linux/resources/content/about.html
|
||||
cd linux
|
||||
mkdir -p ./linux/components
|
||||
cp libxpical/libxpical.so ./linux/components
|
||||
cp libxpical/_xpidlgen/calendar.xpt ./linux/components
|
||||
cp resources/content/calendarService.js ./linux/components
|
||||
cd linux; find components/ resources/ icons/ install.js \( -name CVS -o -name Makefile -o -name makefile.win -o -name Makefile.in -o -name test -o -name .cvsignore \) -prune -o -print | xargs zip calendar_linux.xpi
|
||||
mv ./linux/calendar_linux.xpi .
|
||||
echo "Done."
|
||||
|
||||
macxpi::
|
||||
rm -f calendar_mac.xpi
|
||||
rm -rf linux/components
|
||||
|
|
@ -118,3 +84,29 @@ openvmsxpi::
|
|||
mv ./linux/calendar_openvms.xpi .
|
||||
echo "Done."
|
||||
|
||||
xpi::
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
platform=windows
|
||||
else
|
||||
platform=linux
|
||||
endif
|
||||
rm -f calendar.xpi
|
||||
rm -rf xpi
|
||||
|
||||
echo "Building xpi..."
|
||||
|
||||
./createBuildId.pl ./resources/content/about.html
|
||||
make
|
||||
mkdir -p ./xpi/bin/components
|
||||
mkdir -p ./xpi/bin/chrome
|
||||
mkdir -p ./xpi/resources
|
||||
cp $(DEPTH)/dist/bin/chrome/calendar.jar ./xpi/bin/chrome
|
||||
cp libxpical/$(LIB_PREFIX)xpical$(DLL_SUFFIX) ./xpi/bin/components
|
||||
cp libxpical/_xpidlgen/calendar.xpt ./xpi/bin/components
|
||||
cp resources/content/calendarService.js ./xpi/bin/components
|
||||
cp -r resources/locale ./xpi/resources
|
||||
cp -r $(platform)linux/icons ./xpi
|
||||
cp install.js ./xpi
|
||||
cd xpi; find bin/ resources/ icons/ install.js \( -name CVS -o -name en-US \) -prune -o -print | xargs zip calendar.xpi
|
||||
|
||||
echo "Done."
|
||||
|
|
|
|||
|
|
@ -1,4 +1,11 @@
|
|||
initInstall("Mozilla Calendar", "Mozilla/Calendar", "0.8");
|
||||
/* ***************
|
||||
Desc: Installation script
|
||||
****************** */
|
||||
const displayName = "Mozilla Calendar";
|
||||
const name = "MozillaCalendar";
|
||||
const version = "0.8";
|
||||
|
||||
initInstall(displayName, name, version);
|
||||
|
||||
calendarDir = getFolder("Chrome","calendar");
|
||||
|
||||
|
|
@ -6,48 +13,60 @@ setPackageFolder(calendarDir);
|
|||
|
||||
addDirectory( "resources" );
|
||||
|
||||
addDirectory("", "components", getFolder( "Components" ), "" );
|
||||
addDirectory("", "bin/components", getFolder( "Components" ), "" );
|
||||
|
||||
addDirectory( "", "", "icons", getFolder( "Chrome", "icons" ), "", true );
|
||||
|
||||
addFile( "Calendar Chrome",
|
||||
"bin/chrome/calendar.jar", // jar source folder
|
||||
getFolder("Chrome"), // target folder
|
||||
"");
|
||||
|
||||
var err = getLastError();
|
||||
|
||||
|
||||
if ( err == SUCCESS ) {
|
||||
|
||||
var calendarContent = getFolder(calendarDir, "content");
|
||||
var calendarSkin = getFolder(calendarDir, "skin");
|
||||
var calendarLocale = getFolder(calendarDir, "locale");
|
||||
|
||||
var returnval = registerChrome(CONTENT | DELAYED_CHROME, calendarContent );
|
||||
var returnval = registerChrome(SKIN | DELAYED_CHROME, calendarSkin, "modern/");
|
||||
var returnval = registerChrome(SKIN | DELAYED_CHROME, calendarSkin, "classic/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "en-US/");
|
||||
|
||||
registerChrome(PACKAGE | DELAYED_CHROME, getFolder("Chrome","calendar.jar"), "content/calendar/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","calendar.jar"), "skin/classic/calendar/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","calendar.jar"), "skin/modern/calendar/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, getFolder("Chrome","calendar.jar"), "locale/en-US/calendar/");
|
||||
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "cs-CZ/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "cy-GB/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "de-AT/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "es-ES/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "fr-FR/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "hu-HU/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "ja-JP/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "lt-LT/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "nl-NL/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "pl-PL/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "pt-BR/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "sk-SK/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "sl-SI/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "sv-SE/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "wen-DE/");
|
||||
|
||||
err = performInstall();
|
||||
|
||||
if ( err == SUCCESS ) {
|
||||
alert("The Mozilla Calendar has been successfully installed. \n"
|
||||
+"Please restart your browser to continue.");
|
||||
}
|
||||
else if( err == "999" )
|
||||
{
|
||||
alert("The Mozilla Calendar has been installed. \n Please restart your browser to continue.");
|
||||
}
|
||||
|
||||
else {
|
||||
alert("performInstall() failed. \n"
|
||||
+"_____________________________\nError code:" + err);
|
||||
cancelInstall(err);
|
||||
if ( err == SUCCESS || err == 999 ) {
|
||||
alert("The Mozilla Calendar has been successfully installed. \n"
|
||||
+"Please restart your application to continue.");
|
||||
} else {
|
||||
alert("performInstall() failed. \n"
|
||||
+"_____________________________\nError code:" + err);
|
||||
cancelInstall(err);
|
||||
}
|
||||
}
|
||||
else {
|
||||
alert("Failed to create directory. \n"
|
||||
+"You probably don't have appropriate permissions \n"
|
||||
+"(write access to mozilla/chrome directory). \n"
|
||||
+"(write access to <mozilla>/chrome directory). \n"
|
||||
+"If you installed Mozilla as root then you need to install calendar as root as well.\n"
|
||||
+"Or, you can change ownership of your Mozilla directory to yourself and install calendar."
|
||||
+"_____________________________\nError code:" + err);
|
||||
cancelInstall(err);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
/* ***************
|
||||
Desc: Installation script
|
||||
Last modified: October 2th, 2003
|
||||
****************** */
|
||||
const displayName = "Mozilla Calendar";
|
||||
const name = "Mozilla/Calendar";
|
||||
const version = "0.8";
|
||||
|
||||
initInstall(displayName, name, version);
|
||||
|
||||
calendarDir = getFolder("Chrome","calendar");
|
||||
|
||||
setPackageFolder(calendarDir);
|
||||
|
||||
addDirectory( "resources" );
|
||||
|
||||
addDirectory("", "components", getFolder( "Components" ), "" );
|
||||
|
||||
addDirectory( "", "", "icons", getFolder( "Chrome", "icons" ), "", true );
|
||||
|
||||
var err = getLastError();
|
||||
|
||||
if ( err == SUCCESS ) {
|
||||
|
||||
var calendarContent = getFolder(calendarDir, "content");
|
||||
var calendarSkin = getFolder(calendarDir, "skin");
|
||||
var calendarLocale = getFolder(calendarDir, "locale");
|
||||
|
||||
var returnval = registerChrome(CONTENT | DELAYED_CHROME, calendarContent );
|
||||
var returnval = registerChrome(SKIN | DELAYED_CHROME, calendarSkin, "modern/");
|
||||
var returnval = registerChrome(SKIN | DELAYED_CHROME, calendarSkin, "classic/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "cs-CZ/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "cy-GB/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "de-AT/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "en-US/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "es-ES/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "fr-FR/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "hu-HU/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "ja-JP/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "lt-LT/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "nl-NL/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "pl-PL/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "pt-BR/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "sk-SK/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "sl-SI/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "sv-SE/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "wen-DE/");
|
||||
|
||||
err = performInstall();
|
||||
|
||||
if ( err == SUCCESS || err == 999 ) {
|
||||
alert("The Mozilla Calendar has been successfully installed. \n"
|
||||
+"Please restart your application to continue.");
|
||||
} else {
|
||||
alert("performInstall() failed. \n"
|
||||
+"_____________________________\nError code:" + err);
|
||||
cancelInstall(err);
|
||||
}
|
||||
}
|
||||
else {
|
||||
alert("Failed to create directory. \n"
|
||||
+"You probably don't have appropriate permissions \n"
|
||||
+"(write access to <mozilla>/chrome directory). \n"
|
||||
+"If you installed Mozilla as root then you need to install calendar as root as well.\n"
|
||||
+"Or, you can change ownership of your Mozilla directory to yourself and install calendar."
|
||||
+"_____________________________\nError code:" + err);
|
||||
cancelInstall(err);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
/* ***************
|
||||
Desc: Installation script
|
||||
Last modified: October 2th, 2003
|
||||
****************** */
|
||||
const displayName = "Mozilla Calendar";
|
||||
const name = "Mozilla/Calendar";
|
||||
const version = "0.8";
|
||||
|
||||
initInstall(displayName, name, version);
|
||||
|
||||
calendarDir = getFolder("Chrome","calendar");
|
||||
|
||||
setPackageFolder(calendarDir);
|
||||
|
||||
addDirectory( "resources" );
|
||||
|
||||
addDirectory("", "components", getFolder( "Components" ), "" );
|
||||
|
||||
addDirectory( "", "", "icons", getFolder( "Chrome", "icons" ), "", true );
|
||||
|
||||
var err = getLastError();
|
||||
|
||||
if ( err == SUCCESS ) {
|
||||
|
||||
var calendarContent = getFolder(calendarDir, "content");
|
||||
var calendarSkin = getFolder(calendarDir, "skin");
|
||||
var calendarLocale = getFolder(calendarDir, "locale");
|
||||
|
||||
var returnval = registerChrome(CONTENT | DELAYED_CHROME, calendarContent );
|
||||
var returnval = registerChrome(SKIN | DELAYED_CHROME, calendarSkin, "modern/");
|
||||
var returnval = registerChrome(SKIN | DELAYED_CHROME, calendarSkin, "classic/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "cs-CZ/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "cy-GB/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "de-AT/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "en-US/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "es-ES/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "fr-FR/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "hu-HU/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "ja-JP/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "lt-LT/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "nl-NL/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "pl-PL/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "pt-BR/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "sk-SK/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "sl-SI/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "sv-SE/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "wen-DE/");
|
||||
|
||||
err = performInstall();
|
||||
|
||||
if ( err == SUCCESS || err == 999 ) {
|
||||
alert("The Mozilla Calendar has been successfully installed. \n"
|
||||
+"Please restart your application to continue.");
|
||||
} else {
|
||||
alert("performInstall() failed. \n"
|
||||
+"_____________________________\nError code:" + err);
|
||||
cancelInstall(err);
|
||||
}
|
||||
}
|
||||
else {
|
||||
alert("Failed to create directory. \n"
|
||||
+"You probably don't have appropriate permissions \n"
|
||||
+"(write access to <mozilla>/chrome directory). \n"
|
||||
+"If you installed Mozilla as root then you need to install calendar as root as well.\n"
|
||||
+"Or, you can change ownership of your Mozilla directory to yourself and install calendar."
|
||||
+"_____________________________\nError code:" + err);
|
||||
cancelInstall(err);
|
||||
}
|
||||
|
||||
|
||||
Загрузка…
Ссылка в новой задаче