summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Tassin <fta@sofaraway.org>2008-06-22 01:13:05 +0200
committerFabien Tassin <fta@sofaraway.org>2008-06-22 01:13:05 +0200
commit2a7092275f0740ca9bff0d7797921d0c8e0cb70a (patch)
tree748f943ccb43ab815dd638aab9d871e6f7479951
parent60a7566bb1b059bf612173430c8218d0b5baa999 (diff)
* [mozclient] Make prism use the new xulapp build-system
- update src/prism.mk.in - update src/mozclient/prism.conf
-rw-r--r--src/mozclient/prism.conf7
-rw-r--r--src/prism.mk.in1
2 files changed, 6 insertions, 2 deletions
diff --git a/src/mozclient/prism.conf b/src/mozclient/prism.conf
index 6ba431e..706d83b 100644
--- a/src/mozclient/prism.conf
+++ b/src/mozclient/prism.conf
@@ -19,7 +19,10 @@ MOZCLIENT_APPNAME = prism
MOZCLIENT_PROJECT = webrunner/trunk
MOZCLIENT_VCS = svn
MOZCLIENT_VCS_LOC = http://svn.mozilla.org/projects
-MOZCLIENT_FILE = mozilla/confvars.sh
-MOZCLIENT_GETVERSION = grep ^MOZ_APP_VERSION= mozilla/confvars.sh | cut -d= -f2 | tr -d '\r'
+MOZCLIENT_FILE = prism/confvars.sh
+MOZCLIENT_GETVERSION = grep ^MOZ_APP_VERSION= prism/confvars.sh | cut -d= -f2 | tr -d '\r'
MOZCLIENT_GETDATE = svn log --limit 1 http://svn.mozilla.org/projects/webrunner/ | grep ^r | head -1 | sed -e 's/^r\([0-9]*\) | [^|]* | \([^ ]*\).*/\2r\1/' | tr -d -
MOZCLIENT_SEPARATOR = + # upstream only bumps the version at the end of the dev cycle
+MOZCLIENT_EMBEDDED = 0
+MOZCLIENT_WANTMOZDIR = 1
+MOZCLIENT_MOZDIRNAME = prism
diff --git a/src/prism.mk.in b/src/prism.mk.in
index d1abe41..935fd42 100644
--- a/src/prism.mk.in
+++ b/src/prism.mk.in
@@ -20,3 +20,4 @@
MOZCLIENT_PROJECTNAME := prism
include mozclient.mk.in
+include xulapp.mk.in