[Pkg-mozext-commits] [compactheader] 98/441: New version 0.99.8: Update via official way (update.rdf)

David Prévot taffit at moszumanska.debian.org
Wed Mar 18 12:28:48 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository compactheader.

commit 8d91a931af9c5752435a660386e6aa2a7653c772
Author: joachim.herb <none at none>
Date:   Fri Nov 20 01:33:53 2009 +0000

    New version 0.99.8:
    Update via official way (update.rdf)
---
 build.xml                                    | 40 ++++++++++++++++++++++++----
 chrome/CompactHeader/content/preferences.js  |  8 +++---
 chrome/CompactHeader/content/preferences.xul |  2 ++
 install.rdf                                  |  4 ++-
 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index f4e9fc7..b830f6d 100644
--- a/build.xml
+++ b/build.xml
@@ -7,6 +7,7 @@
   <property name="AMOdist.dir" value="../AMO/"/>
   <property name="www.dir" value="../www/"/>
   <property name="pref.file" value="${src.dir}/chrome/CompactHeader/content/preferences.js"/>
+  <property name="mccoy.cmd" value="c:/Program Files/mccoy/mccoy/mccoy.exe"/>
 
   <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask"/>
     
@@ -32,27 +33,36 @@
     
     
   <target name="buildAMO">
+    <!--
     <replaceregexp file="${pref.file}" 
                    byline="true"
                    match="(.*)return.*( /\* Patch this line for AMO version \*/)"
-                   replace="\1return true; /* AMO version */\2"/>
+                   replace="\1return true; /* AMO version */\2"/> -->
+    <copy file="${src.dir}/install.rdf" tofile="${AMOdist.dir}/install.rdf"/>
+    <replaceregexp file="${AMOdist.dir}/install.rdf" 
+                   byline="true"
+                   match=".*update.*"
+                   replace=""/>                   
     <zip destfile="${AMOdist.dir}/${app.name}-${app.version}.xpi">
       <fileset dir="${src.dir}">
         <include name="chrome.manifest" />
-        <include name="install.rdf" />
         <include name="defaults/**" />
         <include name="chrome/**" />        
         <exclude name="**/.*" />
         <exclude name="**/CVS/**" />
       </fileset>
+      <fileset dir="${AMOdist.dir}">
+        <include name="install.rdf" />
+      </fileset>
     </zip>
   </target>
 
   <target name="buildMozdev">
+    <!--
     <replaceregexp file="${pref.file}" 
                    byline="true"
                    match="(.*)return .*( /\* Patch this line for AMO version \*/)"
-                   replace="\1return false; /* Mozdev version */\2"/>
+                   replace="\1return false; /* Mozdev version */\2"/>-->
     <zip destfile="${dist.dir}/${app.name}-${app.version}.xpi">
       <fileset dir="${src.dir}">
         <include name="chrome.manifest" />
@@ -63,6 +73,26 @@
         <exclude name="**/CVS/**" />
       </fileset>
     </zip>
+    <xmltask source="${www.dir}/update.rdf" dest="${www.dir}/update.rdf.new">
+      <replace path="/RDF:RDF/RDF:Description/@em:version" withText="${app.version}"/> 
+    </xmltask>
+    <move file="${www.dir}/update.rdf.new" tofile="${www.dir}/update.rdf"/>
+    <property name="absUpdate" location="${www.dir}/update.rdf"/>
+    <property name="absXPI" location="${dist.dir}/${app.name}-${app.version}.xpi"/>
+    
+    <echo message="absUpdate ${absUpdate}"/>
+    <echo message="absUpdate ${absXPI}"/>
+    
+    <exec executable="${mccoy.cmd}">
+      <arg value="-command"/>
+      <arg value="update"/>
+      <arg value="-updateRDF"/>
+      <arg value="${absUpdate}"/>
+      <arg value="-key"/>
+      <arg value="compactheaderkey"/>
+      <arg value="-xpi"/>
+      <arg value="${absXPI}"/>
+    </exec>
   </target>
 
   <target name="spreadVersion">
@@ -72,12 +102,12 @@
     </xmltask>
     <move file="${www.dir}/availableVersion.xml.new" tofile="${www.dir}/availableVersion.xml"/>
     -->
-      
+    <!--  
     <xmltask source="${www.dir}/availVersion.xml" dest="${www.dir}/availVersion.xml.new">
       <replace path="/updates/update[@server='mozdev']/@version" withText="${app.version}"/> 
     </xmltask>
     <move file="${www.dir}/availVersion.xml.new" tofile="${www.dir}/availVersion.xml"/>
-
+-->
     <replaceregexp file="${www.dir}/installation.html" 
                    byline="true"
                    match="(.*update the version.*CompactHeader-).*(.xpi">Version ).*( of Co.*)"
diff --git a/chrome/CompactHeader/content/preferences.js b/chrome/CompactHeader/content/preferences.js
index 6d34127..17907f0 100644
--- a/chrome/CompactHeader/content/preferences.js
+++ b/chrome/CompactHeader/content/preferences.js
@@ -31,9 +31,9 @@ org.mozdev.compactHeader.preferences = function() {
   //  controls according to current configuration settings.
   //
   
-  function disableUpdate(){
-    return false; /* Mozdev version */ /* Patch this line for AMO version */
-  }
+  //function disableUpdate(){
+  //  return false; /* Mozdev version */ /* Patch this line for AMO version */
+  //}
   
   pub.CoheCheckForUpdates = function() {
   	gXMLHttpRequest = new XMLHttpRequest();
@@ -77,7 +77,7 @@ org.mozdev.compactHeader.preferences = function() {
   
   pub.onLoad = function()
   {
-  	document.getElementById("coheSearchUpdates").setAttribute("hidden", disableUpdate());
+  	//document.getElementById("coheSearchUpdates").setAttribute("hidden", disableUpdate());
   	
     prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
       .getService(Components.interfaces.nsIPrefService)
diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index 0972ba3..6366c74 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -48,6 +48,7 @@
 	</hbox>
 -->
 
+  <!--
   <groupbox id="coheSearchUpdates">
     <caption label="&groupbox.Update.caption;"/>
   					
@@ -69,4 +70,5 @@
               label="&button.checkUpdate.label;"/>
     </hbox>
   </groupbox>
+  -->
 </dialog>
diff --git a/install.rdf b/install.rdf
index 4774b04..b08e1bb 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,13 +6,15 @@
 
 	<RDF:Description about="urn:mozilla:install-manifest">
 		<em:name>CompactHeader</em:name>
-		<em:version>0.99.7</em:version>
+		<em:version>0.99.8</em:version>
 		<em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
 		<em:creator>Joachim Herb</em:creator>
 		<em:contributor>Zamula</em:contributor>
 		<em:contributor>Alex Dedul (original author of RSS Linkify Subject</em:contributor>
     <em:optionsURL>chrome://CompactHeader/content/preferences.xul</em:optionsURL>
 		<em:homepageURL>http://compactheader.mozdev.org/</em:homepageURL>
+		<em:updateURL>http://compactheader.mozdev.org/update.rdf</em:updateURL>
+    <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+O1ZsY+7zY6A2GUdEx+6yoWhlfMz7qtDWDLEzMDCZ046vWauIwTGsIT4/48InmKSjF8q529U8FHamJI03FQuuE94KdLkQCJfGTUOwf/U1pKcHpF/WweGmRj7SrOt/exNCdUj7EaJ/vICy4TaUZ42Oul2CwP00x4BixiNs+26UbwIDAQAB</em:updateKey>
 		<em:id>{58D4392A-842E-11DE-B51A-C7B855D89593}</em:id>
 		<em:type>2</em:type>
   	<em:iconURL>chrome://CompactHeader/skin/cohe-icon.png</em:iconURL>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git



More information about the Pkg-mozext-commits mailing list