[Phoenix-commits] rev 13484 - in public/phoenix: download
trunk/phoenix/prototypes/prototype1/pkg
trunk/phoenix/prototypes/prototype1/src
andi at wyona.com
andi at wyona.com
Mon May 22 18:36:58 CEST 2006
Author: andi
Date: 2006-05-22 18:36:55 +0200 (Mon, 22 May 2006)
New Revision: 13484
Added:
public/phoenix/download/phoenix-prototype-1-0.1.0.xpi
public/phoenix/download/update.rdf
public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/phoenix-prototype-1-0.1.0.xpi
public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/update.rdf.template
Removed:
public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/update.rdf
Modified:
public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/NOTES.txt
public/phoenix/trunk/phoenix/prototypes/prototype1/src/Makefile
public/phoenix/trunk/phoenix/prototypes/prototype1/src/install.rdf
Log:
Infrastructure for auto-update completed.
Added: public/phoenix/download/phoenix-prototype-1-0.1.0.xpi
===================================================================
(Binary files differ)
Property changes on: public/phoenix/download/phoenix-prototype-1-0.1.0.xpi
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: public/phoenix/download/update.rdf
===================================================================
--- public/phoenix/download/update.rdf 2006-05-22 16:19:21 UTC (rev 13483)
+++ public/phoenix/download/update.rdf 2006-05-22 16:36:55 UTC (rev 13484)
@@ -0,0 +1,43 @@
+<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:extension:phoenix-prototype-1 at wyona.com">
+ <em:updates>
+ <Seq>
+ <li resource="urn:mozilla:extension:phoenix-prototype-1 at wyona.com:0.1.0"/>
+ </Seq>
+ </em:updates>
+ </Description>
+
+ <Description about="urn:mozilla:extension:phoenix-prototype-1 at wyona.com:0.1.0">
+ <em:version>0.1.0</em:version>
+ <!-- Target application is Mozilla Firefox 1.5.0.* -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+ <em:minVersion>1.5.0</em:minVersion>
+ <em:maxVersion>1.5.0.*</em:maxVersion>
+ <em:updateLink>http://www.wyona.org/osr-101/clients/phoenix/download/phoenix-prototype-1-0.1.0.xpi</em:updateLink>
+ </Description>
+ </em:targetApplication>
+ <!-- Target application is Mozilla Suite 1.7.* -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{86c18b42-e466-45a9-ae7a-9b95ba6f5640}</em:id>
+ <em:minVersion>1.7</em:minVersion>
+ <em:maxVersion>1.7.*</em:maxVersion>
+ <em:updateLink>http://www.wyona.org/osr-101/clients/phoenix/download/phoenix-prototype-1-0.1.0.xpi</em:updateLink>
+ </Description>
+ </em:targetApplication>
+ <!-- Target application is Mozilla SeaMonkey 1.0.* -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+ <em:minVersion>1.0</em:minVersion>
+ <em:maxVersion>1.0.*</em:maxVersion>
+ <em:updateLink>http://www.wyona.org/osr-101/clients/phoenix/download/phoenix-prototype-1-0.1.0.xpi</em:updateLink>
+ </Description>
+ </em:targetApplication>
+ </Description>
+
+</RDF>
Modified: public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/NOTES.txt
===================================================================
--- public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/NOTES.txt 2006-05-22 16:19:21 UTC (rev 13483)
+++ public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/NOTES.txt 2006-05-22 16:36:55 UTC (rev 13484)
@@ -8,5 +8,5 @@
* The XPI file must be placed in directory
http://www.wyona.org/osr-101/clients/phoenix/download.
- * All XPI file must be delivered using MIME-type
+ * All XPI files must be delivered using MIME-type
"application/x-xpinstall".
Added: public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/phoenix-prototype-1-0.1.0.xpi
===================================================================
(Binary files differ)
Property changes on: public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/phoenix-prototype-1-0.1.0.xpi
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/update.rdf
===================================================================
--- public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/update.rdf 2006-05-22 16:19:21 UTC (rev 13483)
+++ public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/update.rdf 2006-05-22 16:36:55 UTC (rev 13484)
@@ -1,43 +0,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:extension:phoenix-prototype-1 at wyona.com">
- <em:updates>
- <Seq>
- <li resource="urn:mozilla:extension:phoenix-prototype-1 at wyona.com:0.1.0"/>
- </Seq>
- </em:updates>
- </Description>
-
- <Description about="urn:mozilla:extension:phoenix-prototype-1 at wyona.com:0.1.0">
- <em:version>0.1.0</em:version>
- <!-- Target application is Mozilla Firefox 1.5.0.* -->
- <em:targetApplication>
- <Description>
- <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
- <em:minVersion>1.5.0</em:minVersion>
- <em:maxVersion>1.5.0.*</em:maxVersion>
- <em:updateLink>http://www.wyona.org/osr-101/clients/phoenix/download/phoenix-prototype-1-0.1.0.xpi</em:updateLink>
- </Description>
- </em:targetApplication>
- <!-- Target application is Mozilla Suite 1.7.* -->
- <em:targetApplication>
- <Description>
- <em:id>{86c18b42-e466-45a9-ae7a-9b95ba6f5640}</em:id>
- <em:minVersion>1.7</em:minVersion>
- <em:maxVersion>1.7.*</em:maxVersion>
- <em:updateLink>http://www.wyona.org/osr-101/clients/phoenix/download/phoenix-prototype-1-0.1.0.xpi</em:updateLink>
- </Description>
- </em:targetApplication>
- <!-- Target application is Mozilla SeaMonkey 1.0.* -->
- <em:targetApplication>
- <Description>
- <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
- <em:minVersion>1.0</em:minVersion>
- <em:maxVersion>1.0.*</em:maxVersion>
- <em:updateLink>http://www.wyona.org/osr-101/clients/phoenix/download/phoenix-prototype-1-0.1.0.xpi</em:updateLink>
- </Description>
- </em:targetApplication>
- </Description>
-
-</RDF>
Copied: public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/update.rdf.template (from rev 13479, public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/update.rdf)
===================================================================
--- public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/update.rdf 2006-05-22 15:08:18 UTC (rev 13479)
+++ public/phoenix/trunk/phoenix/prototypes/prototype1/pkg/update.rdf.template 2006-05-22 16:36:55 UTC (rev 13484)
@@ -0,0 +1,43 @@
+<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:extension:phoenix-prototype-1 at wyona.com">
+ <em:updates>
+ <Seq>
+ <li resource="urn:mozilla:extension:phoenix-prototype-1 at wyona.com:@VERSION@"/>
+ </Seq>
+ </em:updates>
+ </Description>
+
+ <Description about="urn:mozilla:extension:phoenix-prototype-1 at wyona.com:@VERSION@">
+ <em:version>@VERSION@</em:version>
+ <!-- Target application is Mozilla Firefox 1.5.0.* -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+ <em:minVersion>1.5.0</em:minVersion>
+ <em:maxVersion>1.5.0.*</em:maxVersion>
+ <em:updateLink>http://www.wyona.org/osr-101/clients/phoenix/download/phoenix-prototype-1-@VERSION@.xpi</em:updateLink>
+ </Description>
+ </em:targetApplication>
+ <!-- Target application is Mozilla Suite 1.7.* -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{86c18b42-e466-45a9-ae7a-9b95ba6f5640}</em:id>
+ <em:minVersion>1.7</em:minVersion>
+ <em:maxVersion>1.7.*</em:maxVersion>
+ <em:updateLink>http://www.wyona.org/osr-101/clients/phoenix/download/phoenix-prototype-1-@VERSION@.xpi</em:updateLink>
+ </Description>
+ </em:targetApplication>
+ <!-- Target application is Mozilla SeaMonkey 1.0.* -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+ <em:minVersion>1.0</em:minVersion>
+ <em:maxVersion>1.0.*</em:maxVersion>
+ <em:updateLink>http://www.wyona.org/osr-101/clients/phoenix/download/phoenix-prototype-1-@VERSION@.xpi</em:updateLink>
+ </Description>
+ </em:targetApplication>
+ </Description>
+
+</RDF>
Modified: public/phoenix/trunk/phoenix/prototypes/prototype1/src/Makefile
===================================================================
--- public/phoenix/trunk/phoenix/prototypes/prototype1/src/Makefile 2006-05-22 16:19:21 UTC (rev 13483)
+++ public/phoenix/trunk/phoenix/prototypes/prototype1/src/Makefile 2006-05-22 16:36:55 UTC (rev 13484)
@@ -1,17 +1,28 @@
-VERSION:=`grep -e '<em:version>.*</em:version>' install.rdf | sed -e 's/^[ \t]*<em:version>\(.*\)<\/em:version>[ \t]*$$/\1/'`
-FILENAME:=phoenix-prototype-1-$(VERSION).xpi
+VERSION := $(shell grep -e '<em:version>.*</em:version>' install.rdf | sed -e 's/^[ \t]*<em:version>\(.*\)<\/em:version>[ \t]*$$/\1/')
+FILENAME := phoenix-prototype-1-$(VERSION).xpi
+DOWNLOAD_DIR := ../../../../../download/
-pkg:
+pkg: pkg-clean
@printf "Package version is $(VERSION). Constructed package filename is $(FILENAME).\n"
- # create new package directory in pkg
- rm -rf ../pgk/*
- # copy hierarchy to pkg
- cp -r ./* ../pkg/
+ # copy hierarchy to pkg/tmp
+ mkdir ../pkg/tmp
+ cp -r ./chrome ../pkg/tmp/
+ cp ./install.rdf ../pkg/tmp/
+ cp ./chrome.manifest ../pkg/tmp/
# remove svn directories
- cd ../pkg/
- rm Makfile
- #find
+ cd ../pkg/tmp/ && find -d . -name '.svn' -exec rm -rf {} \;
# zip up the package
- zip -r $(FILENAME) .
+ cd ../pkg/tmp/ && zip -r $(FILENAME) .
+ cd ../pkg/tmp/ && cp $(FILENAME) ../
# copy package to download directory
- cp $(FILENAME) ../../../../../download/
+ cd ../pkg/tmp/ && cp $(FILENAME) ../$(DOWNLOAD_DIR)
+ # remove tmp files
+ cd ../pkg/ && rm -rf tmp
+ # update update.rdf
+ cd ../pkg/ && sed -e 's/@VERSION@/$(VERSION)/g' update.rdf.template | cat > update.rdf
+ cd ../pkg/ && mv update.rdf $(DOWNLOAD_DIR)
+
+pkg-clean:
+ # clean pkg directory
+ -cd ../pkg/ && rm -rf tmp
+ -cd ../pkg/ && rm update.rdf
Modified: public/phoenix/trunk/phoenix/prototypes/prototype1/src/install.rdf
===================================================================
--- public/phoenix/trunk/phoenix/prototypes/prototype1/src/install.rdf 2006-05-22 16:19:21 UTC (rev 13483)
+++ public/phoenix/trunk/phoenix/prototypes/prototype1/src/install.rdf 2006-05-22 16:36:55 UTC (rev 13484)
@@ -57,8 +57,8 @@
</em:targetApplication>
<!-- Extension information -->
- <em:name>Wyona Phoenix Editor</em:name>
- <em:description>Seamless Web content editing.</em:description>
+ <em:name>Wyona Phoenix Editor (Prototype 1)</em:name>
+ <em:description>Seamless Web content editing. (Note that this is not the final product, but only a preliminary prototype.)</em:description>
<em:creator>Andreas Wuest</em:creator>
<em:homepageURL>http://www.wyona.org/osr-101/clients/phoenix/index.html</em:homepageURL>
<em:updateURL>http://www.wyona.org/osr-101/clients/phoenix/download/update.rdf</em:updateURL>
More information about the Phoenix-commits
mailing list