Tree - rpms/thunderbird-lightning - src.fedoraproject.org

rpms / thunderbird-lightning

Overview Files Commits Branches Forks Releases
Monitoring status:

Orphaned for: Unmaintained upstream -- merged into main thunderbird package
Take
Bugzilla Assignee:

Fedora:: orphan
EPEL:: orphan
Files

Commit: fa24978c180688e96903047936245dfb22d92649
Blob Blame History Raw
# HG changeset patch
# Parent 40f36996a1e25cb54760ab77218e18857a247aa5

diff --git a/calendar/lightning/Makefile.in b/calendar/lightning/Makefile.in
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -56,7 +56,6 @@
 XPI_EM_ID = {e2fda1a4-762b-4020-b5ad-a41df1933103}
 
 DIST_FILES = install.rdf application.ini
-PREF_JS_EXPORTS = $(srcdir)/content/lightning.js
 
 # Lighting version number
 LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version.txt)
@@ -118,7 +117,7 @@
        ../providers \
        ../import-export \
        ../itip \
-       components \
+       base \
        locales \
        $(NULL)
 
@@ -126,20 +125,6 @@
 DIRS += ../test
 endif
 
-# Select a theme from which to pull our skin goodness
-# Linux: gnomestripe
-# OS X: pinstripe
-# Windows: winstripe
-
-ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
-THEME=gnomestripe
-else
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-THEME=pinstripe
-else
-THEME=winstripe
-endif
-endif
 
 DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
            -DAB_CD=$(AB_CD) \
@@ -147,7 +132,6 @@
            -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
            -DTARGET_PLATFORM=$(OS_TARGET)_$(TARGET_XPCOM_ABI) \
            -DXPI_EM_ID=$(XPI_EM_ID) \
-           -DTHEME=$(THEME) \
            $(NULL)
 
 GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
@@ -158,7 +142,7 @@
 	$(NSINSTALL) -m 0644 $(srcdir)/../timezones/timezones.sqlite $(FINAL_TARGET)
 
 include $(topsrcdir)/config/rules.mk
-include $(srcdir)/lightning-packager.mk
+include $(srcdir)/build/lightning-packager.mk
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 # If the macbundle dist dir was already created, sync lightning here to avoid
diff --git a/calendar/lightning/base/Makefile.in b/calendar/lightning/base/Makefile.in
new file mode 100644
--- /dev/null
+++ b/calendar/lightning/base/Makefile.in
@@ -0,0 +1,36 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = lightning
+
+export XPI_NAME = lightning
+export USE_EXTENSION_MANIFEST = 1
+
+DIRS = components
+PREF_JS_EXPORTS = $(srcdir)/preferences/lightning.js
+
+# Select a theme from which to pull our skin goodness
+# Linux: gnomestripe
+# OS X: pinstripe
+# Windows: winstripe
+ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
+THEME = gnomestripe
+else
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+THEME = pinstripe
+else
+THEME = winstripe
+endif
+endif
+
+DEFINES += -DTHEME=$(THEME)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/calendar/lightning/components/Makefile.in b/calendar/lightning/base/components/Makefile.in
rename from calendar/lightning/components/Makefile.in
rename to calendar/lightning/base/components/Makefile.in
--- a/calendar/lightning/components/Makefile.in
+++ b/calendar/lightning/base/components/Makefile.in
@@ -37,7 +37,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH   = ../../..
+DEPTH   = ../../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
diff --git a/calendar/lightning/components/calItipProtocolHandler.js b/calendar/lightning/base/components/calItipProtocolHandler.js
rename from calendar/lightning/components/calItipProtocolHandler.js
rename to calendar/lightning/base/components/calItipProtocolHandler.js
diff --git a/calendar/lightning/components/calItipProtocolHandler.manifest b/calendar/lightning/base/components/calItipProtocolHandler.manifest
rename from calendar/lightning/components/calItipProtocolHandler.manifest
rename to calendar/lightning/base/components/calItipProtocolHandler.manifest
diff --git a/calendar/lightning/components/lightningTextCalendarConverter.js b/calendar/lightning/base/components/lightningTextCalendarConverter.js
rename from calendar/lightning/components/lightningTextCalendarConverter.js
rename to calendar/lightning/base/components/lightningTextCalendarConverter.js
diff --git a/calendar/lightning/components/lightningTextCalendarConverter.manifest b/calendar/lightning/base/components/lightningTextCalendarConverter.manifest
rename from calendar/lightning/components/lightningTextCalendarConverter.manifest
rename to calendar/lightning/base/components/lightningTextCalendarConverter.manifest
diff --git a/calendar/lightning/content/imip-bar-overlay.xul b/calendar/lightning/base/content/imip-bar-overlay.xul
rename from calendar/lightning/content/imip-bar-overlay.xul
rename to calendar/lightning/base/content/imip-bar-overlay.xul
diff --git a/calendar/lightning/content/imip-bar.js b/calendar/lightning/base/content/imip-bar.js
rename from calendar/lightning/content/imip-bar.js
rename to calendar/lightning/base/content/imip-bar.js
diff --git a/calendar/lightning/content/lightning-calendar-creation.js b/calendar/lightning/base/content/lightning-calendar-creation.js
rename from calendar/lightning/content/lightning-calendar-creation.js
rename to calendar/lightning/base/content/lightning-calendar-creation.js
diff --git a/calendar/lightning/content/lightning-calendar-creation.xul b/calendar/lightning/base/content/lightning-calendar-creation.xul
rename from calendar/lightning/content/lightning-calendar-creation.xul
rename to calendar/lightning/base/content/lightning-calendar-creation.xul
diff --git a/calendar/lightning/content/lightning-calendar-properties.js b/calendar/lightning/base/content/lightning-calendar-properties.js
rename from calendar/lightning/content/lightning-calendar-properties.js
rename to calendar/lightning/base/content/lightning-calendar-properties.js
diff --git a/calendar/lightning/content/lightning-calendar-properties.xul b/calendar/lightning/base/content/lightning-calendar-properties.xul
rename from calendar/lightning/content/lightning-calendar-properties.xul
rename to calendar/lightning/base/content/lightning-calendar-properties.xul
diff --git a/calendar/lightning/content/lightning-menus.xul b/calendar/lightning/base/content/lightning-menus.xul
rename from calendar/lightning/content/lightning-menus.xul
rename to calendar/lightning/base/content/lightning-menus.xul
diff --git a/calendar/lightning/content/lightning-migration.xul b/calendar/lightning/base/content/lightning-migration.xul
rename from calendar/lightning/content/lightning-migration.xul
rename to calendar/lightning/base/content/lightning-migration.xul
diff --git a/calendar/lightning/content/lightning-scripts.inc b/calendar/lightning/base/content/lightning-scripts.inc
rename from calendar/lightning/content/lightning-scripts.inc
rename to calendar/lightning/base/content/lightning-scripts.inc
diff --git a/calendar/lightning/content/lightning-standalone.xul b/calendar/lightning/base/content/lightning-standalone.xul
rename from calendar/lightning/content/lightning-standalone.xul
rename to calendar/lightning/base/content/lightning-standalone.xul
diff --git a/calendar/lightning/content/lightning-toolbar.xul b/calendar/lightning/base/content/lightning-toolbar.xul
rename from calendar/lightning/content/lightning-toolbar.xul
rename to calendar/lightning/base/content/lightning-toolbar.xul
diff --git a/calendar/lightning/content/lightning-utils.js b/calendar/lightning/base/content/lightning-utils.js
rename from calendar/lightning/content/lightning-utils.js
rename to calendar/lightning/base/content/lightning-utils.js
diff --git a/calendar/lightning/content/lightning-widgets.css b/calendar/lightning/base/content/lightning-widgets.css
rename from calendar/lightning/content/lightning-widgets.css
rename to calendar/lightning/base/content/lightning-widgets.css
diff --git a/calendar/lightning/content/lightning-widgets.xml b/calendar/lightning/base/content/lightning-widgets.xml
rename from calendar/lightning/content/lightning-widgets.xml
rename to calendar/lightning/base/content/lightning-widgets.xml
diff --git a/calendar/lightning/content/messenger-overlay-accountCentral.xul b/calendar/lightning/base/content/messenger-overlay-accountCentral.xul
rename from calendar/lightning/content/messenger-overlay-accountCentral.xul
rename to calendar/lightning/base/content/messenger-overlay-accountCentral.xul
diff --git a/calendar/lightning/content/messenger-overlay-messageWindow.xul b/calendar/lightning/base/content/messenger-overlay-messageWindow.xul
rename from calendar/lightning/content/messenger-overlay-messageWindow.xul
rename to calendar/lightning/base/content/messenger-overlay-messageWindow.xul
diff --git a/calendar/lightning/content/messenger-overlay-preferences.js b/calendar/lightning/base/content/messenger-overlay-preferences.js
rename from calendar/lightning/content/messenger-overlay-preferences.js
rename to calendar/lightning/base/content/messenger-overlay-preferences.js
diff --git a/calendar/lightning/content/messenger-overlay-preferences.xul b/calendar/lightning/base/content/messenger-overlay-preferences.xul
rename from calendar/lightning/content/messenger-overlay-preferences.xul
rename to calendar/lightning/base/content/messenger-overlay-preferences.xul
diff --git a/calendar/lightning/content/messenger-overlay-sidebar.js b/calendar/lightning/base/content/messenger-overlay-sidebar.js
rename from calendar/lightning/content/messenger-overlay-sidebar.js
rename to calendar/lightning/base/content/messenger-overlay-sidebar.js
diff --git a/calendar/lightning/content/messenger-overlay-sidebar.xul b/calendar/lightning/base/content/messenger-overlay-sidebar.xul
rename from calendar/lightning/content/messenger-overlay-sidebar.xul
rename to calendar/lightning/base/content/messenger-overlay-sidebar.xul
--- a/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/calendar/lightning/base/content/messenger-overlay-sidebar.xul
@@ -77,7 +77,7 @@
 <!-- All JS files that messenger-overlay-sidebar.xul wishes to include *must* go into the
      calendar-scripts.inc file (all scripts shared with Sunbird) or lightning-scripts.inc
      file (scripts relevant for Lightning-only). -->
-#include ../../base/content/calendar-scripts.inc
+#include ../../../base/content/calendar-scripts.inc
 #include lightning-scripts.inc
 
   <window id="messengerWindow">
diff --git a/calendar/lightning/content/suite-overlay-preferences.xul b/calendar/lightning/base/content/suite-overlay-preferences.xul
rename from calendar/lightning/content/suite-overlay-preferences.xul
rename to calendar/lightning/base/content/suite-overlay-preferences.xul
diff --git a/calendar/lightning/content/suite-overlay-sidebar.js b/calendar/lightning/base/content/suite-overlay-sidebar.js
rename from calendar/lightning/content/suite-overlay-sidebar.js
rename to calendar/lightning/base/content/suite-overlay-sidebar.js
diff --git a/calendar/lightning/content/suite-overlay-sidebar.xul b/calendar/lightning/base/content/suite-overlay-sidebar.xul
rename from calendar/lightning/content/suite-overlay-sidebar.xul
rename to calendar/lightning/base/content/suite-overlay-sidebar.xul
diff --git a/calendar/lightning/jar.mn b/calendar/lightning/base/jar.mn
rename from calendar/lightning/jar.mn
rename to calendar/lightning/base/jar.mn
diff --git a/calendar/lightning/content/lightning.js b/calendar/lightning/base/preferences/lightning.js
rename from calendar/lightning/content/lightning.js
rename to calendar/lightning/base/preferences/lightning.js
diff --git a/calendar/lightning/themes/common/images/mode-switch-icons.png b/calendar/lightning/base/themes/common/images/mode-switch-icons.png
rename from calendar/lightning/themes/common/images/mode-switch-icons.png
rename to calendar/lightning/base/themes/common/images/mode-switch-icons.png
diff --git a/calendar/lightning/themes/common/suite-accountCentral.css b/calendar/lightning/base/themes/common/suite-accountCentral.css
rename from calendar/lightning/themes/common/suite-accountCentral.css
rename to calendar/lightning/base/themes/common/suite-accountCentral.css
diff --git a/calendar/lightning/themes/gnomestripe/accountCentral.css b/calendar/lightning/base/themes/gnomestripe/accountCentral.css
rename from calendar/lightning/themes/gnomestripe/accountCentral.css
rename to calendar/lightning/base/themes/gnomestripe/accountCentral.css
diff --git a/calendar/lightning/themes/gnomestripe/imip.css b/calendar/lightning/base/themes/gnomestripe/imip.css
rename from calendar/lightning/themes/gnomestripe/imip.css
rename to calendar/lightning/base/themes/gnomestripe/imip.css
diff --git a/calendar/lightning/themes/gnomestripe/lightning-widgets.css b/calendar/lightning/base/themes/gnomestripe/lightning-widgets.css
rename from calendar/lightning/themes/gnomestripe/lightning-widgets.css
rename to calendar/lightning/base/themes/gnomestripe/lightning-widgets.css
diff --git a/calendar/lightning/themes/gnomestripe/lightning.css b/calendar/lightning/base/themes/gnomestripe/lightning.css
rename from calendar/lightning/themes/gnomestripe/lightning.css
rename to calendar/lightning/base/themes/gnomestripe/lightning.css
diff --git a/calendar/lightning/themes/pinstripe/accountCentral.css b/calendar/lightning/base/themes/pinstripe/accountCentral.css
rename from calendar/lightning/themes/pinstripe/accountCentral.css
rename to calendar/lightning/base/themes/pinstripe/accountCentral.css
diff --git a/calendar/lightning/themes/pinstripe/imip.css b/calendar/lightning/base/themes/pinstripe/imip.css
rename from calendar/lightning/themes/pinstripe/imip.css
rename to calendar/lightning/base/themes/pinstripe/imip.css
diff --git a/calendar/lightning/themes/pinstripe/lightning-widgets.css b/calendar/lightning/base/themes/pinstripe/lightning-widgets.css
rename from calendar/lightning/themes/pinstripe/lightning-widgets.css
rename to calendar/lightning/base/themes/pinstripe/lightning-widgets.css
diff --git a/calendar/lightning/themes/pinstripe/lightning.css b/calendar/lightning/base/themes/pinstripe/lightning.css
rename from calendar/lightning/themes/pinstripe/lightning.css
rename to calendar/lightning/base/themes/pinstripe/lightning.css
diff --git a/calendar/lightning/themes/winstripe/accountCentral.css b/calendar/lightning/base/themes/winstripe/accountCentral.css
rename from calendar/lightning/themes/winstripe/accountCentral.css
rename to calendar/lightning/base/themes/winstripe/accountCentral.css
diff --git a/calendar/lightning/themes/winstripe/images/mode-switch-icons-aero.png b/calendar/lightning/base/themes/winstripe/images/mode-switch-icons-aero.png
rename from calendar/lightning/themes/winstripe/images/mode-switch-icons-aero.png
rename to calendar/lightning/base/themes/winstripe/images/mode-switch-icons-aero.png
diff --git a/calendar/lightning/themes/winstripe/imip.css b/calendar/lightning/base/themes/winstripe/imip.css
rename from calendar/lightning/themes/winstripe/imip.css
rename to calendar/lightning/base/themes/winstripe/imip.css
diff --git a/calendar/lightning/themes/winstripe/lightning-widgets.css b/calendar/lightning/base/themes/winstripe/lightning-widgets.css
rename from calendar/lightning/themes/winstripe/lightning-widgets.css
rename to calendar/lightning/base/themes/winstripe/lightning-widgets.css
diff --git a/calendar/lightning/themes/winstripe/lightning.css b/calendar/lightning/base/themes/winstripe/lightning.css
rename from calendar/lightning/themes/winstripe/lightning.css
rename to calendar/lightning/base/themes/winstripe/lightning.css
diff --git a/calendar/lightning/build.mk b/calendar/lightning/build.mk
new file mode 100644
--- /dev/null
+++ b/calendar/lightning/build.mk
@@ -0,0 +1,18 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ifndef COMM_BUILD # Mozila Makefile
+
+ifndef LIBXUL_SDK
+include $(topsrcdir)/toolkit/toolkit-tiers.mk
+endif
+
+TIERS += app
+
+else # toplevel Makefile
+
+TIERS += app
+tier_app_dirs += calendar/lightning
+
+endif
diff --git a/calendar/lightning/lightning-packager.mk b/calendar/lightning/build/lightning-packager.mk
rename from calendar/lightning/lightning-packager.mk
rename to calendar/lightning/build/lightning-packager.mk
diff --git a/calendar/lightning/chrome.manifest b/calendar/lightning/chrome.manifest
deleted file mode 100644
diff --git a/calendar/lightning/config/version.txt b/calendar/lightning/config/version.txt
new file mode 100644
--- /dev/null
+++ b/calendar/lightning/config/version.txt
@@ -0,0 +1,1 @@
+1.7
diff --git a/calendar/lightning/confvars.sh b/calendar/lightning/confvars.sh
new file mode 100644
--- /dev/null
+++ b/calendar/lightning/confvars.sh
@@ -0,0 +1,28 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MOZ_APP_NAME=lightning
+MOZ_CHROME_FILE_FORMAT=omni
+MOZ_NO_ACTIVEX_SUPPORT=1
+MOZ_ACTIVEX_SCRIPTING_SUPPORT=
+MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
+MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
+LIGHTNING_VERSION=$MOZ_APP_VERSION
+
+# Disabled to improve build speed
+MOZ_FEEDS=
+MOZ_PLACES=
+MOZ_SMIL=
+MOZ_TOOLKIT_SEARCH=
+MOZ_ZIPWRITER=
+MOZ_MORK=
+MOZ_MORKREADER=
+MOZ_OGG=
+MOZ_SYDNEYAUDIO=
+MOZ_WAVE=
+MOZ_MEDIA=
+MOZ_VORBIS=
+MOZ_WEBM=
+MOZ_WEBGL=
+MOZ_XTF=
diff --git a/calendar/lightning/test/xpcshell.ini b/calendar/lightning/test/xpcshell.ini
new file mode 100644
--- /dev/null
+++ b/calendar/lightning/test/xpcshell.ini
@@ -0,0 +1,3 @@
+[include:calendar/test/unit/xpcshell.ini]
+
+[include:xpcshell-core.ini]