mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-18 06:45:33 +00:00
[XForms] Fix xforms build system. Bug 298431, r=benjamin
This commit is contained in:
allan%beaufour.dk
parent
a206cb8482
commit
6d2fd75857
@ -1 +1,3 @@
|
||||
Makefile
|
||||
install.js
|
||||
install.template
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
#
|
||||
# Contributor(s):
|
||||
# Brian Ryner <bryner@brianryner.com>
|
||||
# Allan Beaufour <allan@beaufour.dk>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
@ -44,6 +45,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# Module setup
|
||||
MODULE = xforms
|
||||
LIBRARY_NAME = xforms
|
||||
IS_COMPONENT = 1
|
||||
@ -52,6 +54,29 @@ IS_COMPONENT = 1
|
||||
FORCE_SHARED_LIB = 1
|
||||
MOZILLA_INTERNAL_API = 1
|
||||
|
||||
# Also build schema-validation
|
||||
DIRS = ../schema-validation \
|
||||
$(NULL)
|
||||
# XPI settings
|
||||
# XPI_NAME is exported to include schema-validation in xforms package
|
||||
export XPI_NAME = xforms
|
||||
XPI_PKGNAME = xforms
|
||||
USE_EXTENSION_MANIFEST = 1
|
||||
NO_JAR_AUTO_REG = 1
|
||||
INSTALL_EXTENSION_ID = {cf2812dc-6a7c-4402-b639-4d277dac4c36}
|
||||
PACKAGE_VERSION = 0.2
|
||||
|
||||
XULAPP_DEFINES = \
|
||||
-DFIREFOX_VERSION=$(FIREFOX_VERSION) \
|
||||
-DMOZILLA_VERSION_U=$(MOZILLA_VERSION) \
|
||||
-DPACKAGE_VERSION=$(PACKAGE_VERSION) \
|
||||
-DID=${INSTALL_EXTENSION_ID} \
|
||||
$(NULL)
|
||||
|
||||
# Include these in the XPI
|
||||
DIST_FILES = install.rdf install.js
|
||||
|
||||
# XForms depends
|
||||
REQUIRES = \
|
||||
xpcom \
|
||||
string \
|
||||
@ -74,6 +99,7 @@ REQUIRES = \
|
||||
htmlparser \
|
||||
$(NULL)
|
||||
|
||||
# XForms IDLs
|
||||
XPIDLSRCS = \
|
||||
nsIXFormsModelElement.idl \
|
||||
nsIInstanceElementPrivate.idl \
|
||||
@ -99,6 +125,7 @@ XPIDLSRCS = \
|
||||
nsIXFormsItemSetUIElement.idl \
|
||||
$(NULL)
|
||||
|
||||
# XForms source files
|
||||
CPPSRCS = \
|
||||
nsXFormsElementFactory.cpp \
|
||||
nsXFormsUtils.cpp \
|
||||
@ -153,6 +180,16 @@ CPPSRCS = \
|
||||
nsXFormsDelegateStub.cpp \
|
||||
$(NULL)
|
||||
|
||||
# Standard Mozilla make rules
|
||||
EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# Temporary files that will be deleted on f.x. make clean
|
||||
GARBAGE += install.js install.template
|
||||
|
||||
# Create install.js script for suite
|
||||
install.js: install.jst
|
||||
@echo Creating install.js...
|
||||
rm -f install.js
|
||||
$(PERL) $(topsrcdir)/toolkit/mozapps/installer/makejs.pl $(srcdir)/install.jst $(PACKAGE_VERSION) $(FINAL_TARGET)
|
||||
|
||||
2
extensions/xforms/package/xforms.jst → extensions/xforms/install.jst
Executable file → Normal file
2
extensions/xforms/package/xforms.jst → extensions/xforms/install.jst
Executable file → Normal file
@ -14,6 +14,8 @@ if (verifyDiskSpace(fProgram, srChrome + srComponents))
|
||||
|
||||
registerChrome(PACKAGE | DELAYED_CHROME, getFolder("Chrome", "xforms.jar"),
|
||||
"content/xforms/");
|
||||
registerChrome(LOCALE | DELAYED_CHROME, getFolder("Chrome", "xforms.jar"),
|
||||
"locale/en-US/xforms/");
|
||||
|
||||
if (err == SUCCESS)
|
||||
{
|
||||
27
extensions/xforms/package/install.rdf → extensions/xforms/install.rdf
Executable file → Normal file
27
extensions/xforms/package/install.rdf → extensions/xforms/install.rdf
Executable file → Normal file
@ -1,28 +1,35 @@
|
||||
<?xml version="1.0"?>
|
||||
|
||||
#filter substitution
|
||||
|
||||
<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>{cf2812dc-6a7c-4402-b639-4d277dac4c36}</em:id>
|
||||
<em:version>0.2</em:version>
|
||||
<em:id>@ID@</em:id>
|
||||
<em:version>@PACKAGE_VERSION@</em:version>
|
||||
|
||||
<em:targetApplication>
|
||||
<!-- Firefox -->
|
||||
<Description>
|
||||
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
|
||||
<em:minVersion>1.6a1</em:minVersion>
|
||||
<em:maxVersion>1.6a1</em:maxVersion>
|
||||
<em:minVersion>@FIREFOX_VERSION@</em:minVersion>
|
||||
<em:maxVersion>@FIREFOX_VERSION@</em:maxVersion>
|
||||
</Description>
|
||||
</em:targetApplication>
|
||||
|
||||
<em:targetApplication>
|
||||
<!-- Mozilla -->
|
||||
<Description>
|
||||
<em:id>{86c18b42-e466-45a9-ae7a-9b95ba6f5640}</em:id>
|
||||
<em:minVersion>@MOZILLA_VERSION@</em:minVersion>
|
||||
<em:maxVersion>@MOZILLA_VERSION@</em:maxVersion>
|
||||
</Description>
|
||||
</em:targetApplication>
|
||||
|
||||
<em:name>Mozilla XForms</em:name>
|
||||
<em:description>XForms support for Mozilla</em:description>
|
||||
<em:homepageURL>http://www.mozilla.org/projects/xforms/</em:homepageURL>
|
||||
<em:file>
|
||||
<Description about="urn:mozilla:extension:file:xforms.jar">
|
||||
<em:package>content/xforms/</em:package>
|
||||
<em:locale>locale/en-US/xforms/</em:locale>
|
||||
</Description>
|
||||
</em:file>
|
||||
</Description>
|
||||
</RDF>
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
Makefile
|
||||
xforms.js
|
||||
xforms.template
|
||||
stage
|
||||
@ -1,78 +0,0 @@
|
||||
# vim:set ts=8 sw=8 sts=8 noet:
|
||||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# IBM Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2004
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Brian Ryner <bryner@brianryner.com>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
PKGCP_PLATFORM = dos
|
||||
PACKAGE_FILE = packages-win
|
||||
else
|
||||
PKGCP_PLATFORM=unix
|
||||
ifeq ($(OS_ARCH),Darwin)
|
||||
PACKAGE_FILE = packages-mac
|
||||
else
|
||||
PACKAGE_FILE = packages-unix
|
||||
endif
|
||||
endif
|
||||
|
||||
GARBAGE += xforms.js xforms.template
|
||||
GARBAGE_DIRS += stage
|
||||
|
||||
PACKAGE_VERSION = 0.2
|
||||
|
||||
xpi:
|
||||
@echo Copying files to staging area...
|
||||
rm -rf stage
|
||||
$(NSINSTALL) -D stage
|
||||
$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -o $(PKGCP_PLATFORM) -s $(DIST)/bin -d stage -f $(srcdir)/$(PACKAGE_FILE) -v
|
||||
$(NSINSTALL) $(srcdir)/install.rdf stage/xforms
|
||||
$(NSINSTALL) $(srcdir)/chrome.manifest stage/xforms
|
||||
@echo Creating install.js...
|
||||
rm -f xforms.js
|
||||
$(PERL) $(topsrcdir)/toolkit/mozapps/installer/makejs.pl $(srcdir)/xforms.jst $(PACKAGE_VERSION) stage/xforms
|
||||
if ! test -e "xforms.js"; then $(NSINSTALL) $(srcdir)/xforms.js .; fi
|
||||
@echo Creating XPI...
|
||||
$(PERL) $(topsrcdir)/toolkit/mozapps/installer/makexpi.pl xforms stage .
|
||||
@ -1,4 +0,0 @@
|
||||
overlay chrome://browser/content/preferences/preferences.xul chrome://xforms/content/xforms-prefs.xul
|
||||
|
||||
content xforms jar:chrome/xforms.jar!/content/xforms/
|
||||
locale xforms en-US jar:chrome/xforms.jar!/locale/en-US/xforms/
|
||||
@ -1,7 +0,0 @@
|
||||
[xforms]
|
||||
chrome/xforms.jar
|
||||
components/libschemavalidation.dylib
|
||||
components/schemavalidation.xpt
|
||||
components/nsSchemaValidatorRegexp.js
|
||||
components/libxforms.dylib
|
||||
components/xforms.xpt
|
||||
@ -1,7 +0,0 @@
|
||||
[xforms]
|
||||
chrome/xforms.jar
|
||||
components/libschemavalidation.so
|
||||
components/schemavalidation.xpt
|
||||
components/nsSchemaValidatorRegexp.js
|
||||
components/libxforms.so
|
||||
components/xforms.xpt
|
||||
@ -1,7 +0,0 @@
|
||||
[xforms]
|
||||
chrome/xforms.jar
|
||||
components/schemval.dll
|
||||
components/schemavalidation.xpt
|
||||
components/nsSchemaValidatorRegexp.js
|
||||
components/xforms.dll
|
||||
components/xforms.xpt
|
||||
Loading…
x
Reference in New Issue
Block a user