Remove Firefox Extension support user/tsbere/no_ff_extension
authorThomas Berezansky <tsbere@mvlc.org>
Tue, 13 Sep 2011 20:16:28 +0000 (16:16 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Tue, 13 Sep 2011 20:16:28 +0000 (16:16 -0400)
We currently support an older Firefox.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Open-ILS/updates/Makefile.am
Open-ILS/updates/manualupdate.html
Open-ILS/updates/update.rdf [deleted file]
Open-ILS/xul/staff_client/Makefile.am
Open-ILS/xul/staff_client/external/make_updates.sh
Open-ILS/xul/staff_client/install.rdf [deleted file]
Open-ILS/xul/staff_client/update.rdf [deleted file]

index 1b9fe85..8ffd1f7 100644 (file)
@@ -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
index 09de1b6..f4092b8 100755 (executable)
@@ -43,13 +43,6 @@ if [ -f ../patch/VERSION ]; then
        else
                echo "<p>No XULRunner app bundle is currently available.</p>"
        fi
-       echo "<h2>Firefox Extension</h2>"
-       if [ -f ${VERSION}_extension.xpi ]; then
-               echo "<p>A Firefox Extension is available.</p>"
-               echo "<p><a href=\"${VERSION}_extension.xpi\">Click here to install the extension (version $VERSION)</a>"
-       else
-               echo "<p>No Firefox Extension is currently available.</p>"
-       fi
 fi
 cat <<ENDFOOTER
 </body>
diff --git a/Open-ILS/updates/update.rdf b/Open-ILS/updates/update.rdf
deleted file mode 100755 (executable)
index 1479e78..0000000
+++ /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
index dab3b2f..19cbdf0 100644 (file)
@@ -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
index 7ba79d2..cfdda17 100755 (executable)
@@ -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|<em:version>.*</em:version>|<em:version>$VERSION</em:version>|" -e "s|<em:updateLink>.*</em:updateLink>|<em:updateLink>https://::HOSTNAME::/updates/${VERSION}_extension.xpi</em:updateLink>|" -e "s|<em:updateHash>.*</em:updateHash>|<em:updateHash>sha512:$SHA512</em:updateHash>|" 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 (executable)
index 6d9150e..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-       xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-       <Description about="urn:mozilla:install-manifest">
-               <em:id>staff-client@open-ils.org</em:id>
-               <em:version>1.6</em:version>
-               <em:type>2</em:type>
-
-               <!-- Target Application this extension can install into, 
-                       with minimum and maximum supported versions. --> 
-               <em:targetApplication>
-                       <Description>
-                               <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-                               <em:minVersion>3.5</em:minVersion>
-                               <em:maxVersion>3.6.*</em:maxVersion>
-                       </Description>
-               </em:targetApplication>
-    
-               <!-- Front End MetaData -->
-               <em:name>Evergreen</em:name>
-               <em:description>Evergreen Staff Client</em:description>
-        
-               <em:homepageURL>http://evergreen-ils.org/</em:homepageURL>
-               <em:updateURL>https://::HOSTNAME::/updates/update.rdf</updateURL>
-    
-       </Description>      
-</RDF>
diff --git a/Open-ILS/xul/staff_client/update.rdf b/Open-ILS/xul/staff_client/update.rdf
deleted file mode 100644 (file)
index d67acfc..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <RDF:Description about="urn:mozilla:extension:staff-client@open-ils.org">
-    <em:updates>
-      <RDF:Seq>
-        <RDF:li>
-          <RDF:Description>
-            <em:version>1.6</em:version>
-            <em:targetApplication>
-              <RDF:Description>
-                <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-                <em:minVersion>3.5</em:minVersion>
-                <em:maxVersion>3.6.*</em:maxVersion>
-                <em:updateLink>https://::HOSTNAME::/updates/extension.xpi</em:updateLink>
-                <em:updateInfoURL>http://::HOSTNAME::/updates/updatedetails.html</em:updateInfoURL>
-                <em:updateHash></em:updateHash>
-              </RDF:Description>
-            </em:targetApplication>
-          </RDF:Description>
-        </RDF:li>
-      </RDF:Seq>
-    </em:updates>
-  </RDF:Description>
-</RDF:RDF>