From 41c5cac8f4727a9a0876381afdae38fd47f1f35f Mon Sep 17 00:00:00 2001 From: Thomas Berezansky Date: Tue, 13 Sep 2011 16:16:28 -0400 Subject: [PATCH] Remove Firefox Extension support We currently support an older Firefox. Signed-off-by: Thomas Berezansky --- Open-ILS/updates/Makefile.am | 1 - Open-ILS/updates/manualupdate.html | 7 ------ Open-ILS/updates/update.rdf | 8 ------ Open-ILS/xul/staff_client/Makefile.am | 25 +------------------ Open-ILS/xul/staff_client/external/make_updates.sh | 22 ---------------- Open-ILS/xul/staff_client/install.rdf | 29 ---------------------- Open-ILS/xul/staff_client/update.rdf | 27 -------------------- 7 files changed, 1 insertion(+), 118 deletions(-) delete mode 100755 Open-ILS/updates/update.rdf delete mode 100755 Open-ILS/xul/staff_client/install.rdf delete mode 100644 Open-ILS/xul/staff_client/update.rdf diff --git a/Open-ILS/updates/Makefile.am b/Open-ILS/updates/Makefile.am index 1b9fe85b23..8ffd1f7fab 100644 --- a/Open-ILS/updates/Makefile.am +++ b/Open-ILS/updates/Makefile.am @@ -21,5 +21,4 @@ updates-install: cp @top_srcdir@/Open-ILS/updates/check $(DESTDIR)$(UPDATESDIR)/pub cp @top_srcdir@/Open-ILS/updates/download $(DESTDIR)$(UPDATESDIR)/pub cp @top_srcdir@/Open-ILS/updates/manualupdate.html $(DESTDIR)$(UPDATESDIR)/pub - cp @top_srcdir@/Open-ILS/updates/update.rdf $(DESTDIR)$(UPDATESDIR)/pub cp @top_srcdir@/Open-ILS/updates/updatedetails.html $(DESTDIR)$(UPDATESDIR)/pub diff --git a/Open-ILS/updates/manualupdate.html b/Open-ILS/updates/manualupdate.html index 09de1b6beb..f4092b8536 100755 --- a/Open-ILS/updates/manualupdate.html +++ b/Open-ILS/updates/manualupdate.html @@ -43,13 +43,6 @@ if [ -f ../patch/VERSION ]; then else echo "

No XULRunner app bundle is currently available.

" fi - echo "

Firefox Extension

" - if [ -f ${VERSION}_extension.xpi ]; then - echo "

A Firefox Extension is available.

" - echo "

Click here to install the extension (version $VERSION)" - else - echo "

No Firefox Extension is currently available.

" - fi fi cat < diff --git a/Open-ILS/updates/update.rdf b/Open-ILS/updates/update.rdf deleted file mode 100755 index 1479e78471..0000000000 --- a/Open-ILS/updates/update.rdf +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -if [ ! -f ../patch/update.rdf ]; then - echo "Status: 404 Not Found" -else - echo "Content-Type: text/xml" - echo "" - sed "s|::HOSTNAME::|$HTTP_HOST|" ../patch/update.rdf -fi diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am index dab3b2fc6d..19cbdf0d66 100644 --- a/Open-ILS/xul/staff_client/Makefile.am +++ b/Open-ILS/xul/staff_client/Makefile.am @@ -219,29 +219,6 @@ client_dir: # as we haven't "sanitized" the client for extension use client_app: client_dir - @echo 'Cleaning Extension Information' - @rm -f client/install.rdf - -# If automatic updates are enabled, or the standalone_xul_app.js is present, -# the extension can break Firefox. -# Remove those, and we need a chrome.manifest - -client_ext: client_dir - @echo 'Cleaning App Information' - @rm -f client/application.ini - @rm -f client/defaults/preferences/autoupdate.js - @rm -f client/defaults/preferences/autochannel.js - @rm -f client/defaults/preferences/standalone_xul_app.js - @echo 'Prepping chrome.manifest' - @perl -ne 'if(/open_ils_staff_client/) { s/ (?!chrome:\/\/open_ils_staff_client)([^ ]*)$$/ chrome\/\1/; print; }' client/chrome/chrome.manifest > client/chrome.manifest - -# Would merge client_ext into this one, but this way an installer that doesn't -# use an xpi can be made for extension later, if desired - -extension: client_ext - @echo ' * Packaging as an XPI' - @(cd client/ && zip -q -r ../evergreen.xpi * -x defaults/preferences/standalone_xul_app.js) - @md5sum evergreen.xpi > evergreen.xpi.md5 # Generic client, as an xpi, theoretically suitable for --install-app usage @@ -305,7 +282,7 @@ linux-client: linux-xulrunner # For running the updates script with the correct updates directory, optionally building clients as well -updates updates-client win-updates win-updates-client linux-updates linux-updates-client generic-updates generic-updates-client extension-updates: +updates updates-client win-updates win-updates-client linux-updates linux-updates-client generic-updates generic-updates-client: @if [ ! -f build/BUILD_ID ]; then echo 'ERROR! Current build not stamped!'; exit 1; fi @if [ ! -x external/make_updates.sh ]; then chmod u+x external/make_updates.sh; fi @if [ ! -x external/make_updates.sh ]; then echo 'ERROR! external/make_updates.sh is not executable!'; exit 1; fi diff --git a/Open-ILS/xul/staff_client/external/make_updates.sh b/Open-ILS/xul/staff_client/external/make_updates.sh index 7ba79d244b..cfdda171b0 100755 --- a/Open-ILS/xul/staff_client/external/make_updates.sh +++ b/Open-ILS/xul/staff_client/external/make_updates.sh @@ -46,7 +46,6 @@ BZIP2=${BZIP2:-bzip2} GEN_UPDATES=0 WIN_UPDATES=0 LINUX_UPDATES=0 -EXT_UPDATES=0 CLIENTS=0 case "$2" in generic-updates*) @@ -61,22 +60,14 @@ case "$2" in echo "Building Linux Updates only" LINUX_UPDATES=1 ;; - extension-updates*) - echo "Building Extension Updates only" - EXT_UPDATES=1 - ;; *) echo "Building All Updates" GEN_UPDATES=1 WIN_UPDATES=1 LINUX_UPDATES=1 - EXT_UPDATES=1 ;; esac case "$2" in - extension-updates*) - echo "Extension only - No client" - ;; *-client) echo "Building Client(s)" CLIENTS=1 @@ -313,16 +304,3 @@ if [ $LINUX_UPDATES -eq 1 ]; then make_partial_updates cleanup_files fi - -# Extension Updates -# Not really "Updates" so much as "Update", plural for consistency in command. -# Extensions don't do partial updates. Or at least not that I found docs for. -if [ $EXT_UPDATES -eq 1 ]; then - make extension - mkdir -p "$prefix/pub/" - find "$prefix/pub/" -maxdepth 1 -name '*_extension.xpi' -delete - mv evergreen.xpi "$prefix/pub/${VERSION}_extension.xpi" - SHA512=$(sha512sum "$prefix/pub/${VERSION}_extension.xpi") - SHA512=${SHA512%% *} - sed -e "s|.*|$VERSION|" -e "s|.*|https://::HOSTNAME::/updates/${VERSION}_extension.xpi|" -e "s|.*|sha512:$SHA512|" update.rdf > "$prefix/patch/update.rdf" -fi diff --git a/Open-ILS/xul/staff_client/install.rdf b/Open-ILS/xul/staff_client/install.rdf deleted file mode 100755 index 6d9150e19f..0000000000 --- a/Open-ILS/xul/staff_client/install.rdf +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - staff-client@open-ils.org - 1.6 - 2 - - - - - {ec8030f7-c20a-464f-9b0e-13a3a9e97384} - 3.5 - 3.6.* - - - - - Evergreen - Evergreen Staff Client - - http://evergreen-ils.org/ - https://::HOSTNAME::/updates/update.rdf - - - diff --git a/Open-ILS/xul/staff_client/update.rdf b/Open-ILS/xul/staff_client/update.rdf deleted file mode 100644 index d67acfcd7f..0000000000 --- a/Open-ILS/xul/staff_client/update.rdf +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - 1.6 - - - {ec8030f7-c20a-464f-9b0e-13a3a9e97384} - 3.5 - 3.6.* - https://::HOSTNAME::/updates/extension.xpi - http://::HOSTNAME::/updates/updatedetails.html - - - - - - - - - -- 2.11.0