[ilovegom commit] r82 - in trunk/gom: . xulapp xulapp/app xulapp/installer
codesite...@google.com
Date: Tue Aug 26 23:26:37 2008
New Revision: 82
Added:
trunk/gom/xulapp/installer/
trunk/gom/xulapp/installer/Makefile.in
trunk/gom/xulapp/makefiles.sh
Modified:
trunk/gom/ChangeLog
trunk/gom/Makefile.am
trunk/gom/xulapp/Makefile.inc
trunk/gom/xulapp/app/Makefile.in
trunk/gom/xulapp/build.mk
Log:
2008-08-24 jacob <ja...@ilovegom.org>
* xulapp/various: continue to fixup 'make dist', and enable 'make
package', which is a binary tarball distribution
Modified: trunk/gom/ChangeLog
==============================================================================
--- trunk/gom/ChangeLog (original)
+++ trunk/gom/ChangeLog Tue Aug 26 23:26:37 2008
@@ -1,5 +1,8 @@
2008-08-24 jacob <ja...@ilovegom.org>
+ * xulapp/various: continue to fixup 'make dist', and enable 'make
+ package', which is a binary tarball distribution
+
* configure.ac: use a source file we actually dist to configure
the sourcedir
Modified: trunk/gom/Makefile.am
==============================================================================
--- trunk/gom/Makefile.am (original)
+++ trunk/gom/Makefile.am Tue Aug 26 23:26:37 2008
@@ -49,6 +49,9 @@
#include src/xulapp/Makefile.inc
#include tests/Makefile.inc
+package:
+ $(MAKE) -C mozilla.obj/gom/installer
+
update-makefiles:
@for dir in $(include_subdirs) ; do \
echo " cp $(top_srcdir)/Makefile.am.subdir
$(top_srcdir)/$$dir/Makefile.am" ; \
Modified: trunk/gom/xulapp/Makefile.inc
==============================================================================
--- trunk/gom/xulapp/Makefile.inc (original)
+++ trunk/gom/xulapp/Makefile.inc Tue Aug 26 23:26:37 2008
@@ -3,6 +3,8 @@
all: xulapp
xulapp: include/gomwidgets.h xulapp/app/application.ini xulapp/confvars.sh
xulapp/mozconfig
+ rm -f $(MOZILLA)/gom
+ $(LN_S) $(shell pwd)/$(top_srcdir)/xulapp $(MOZILLA)/gom
$(MAKE) -C mozilla.obj
clean:
@@ -17,6 +19,7 @@
dist_noinst_DATA += xulapp/build.mk
dist_noinst_DATA += xulapp/configure-mozilla
dist_noinst_DATA += xulapp/confvars.sh
+dist_noinst_DATA += xulapp/makefiles.sh
dist_noinst_DATA += xulapp/app/Makefile.in
dist_noinst_DATA += xulapp/app/application.ini
@@ -57,3 +60,5 @@
dist_noinst_DATA += xulapp/components/gom/src/xgScriptElement.cpp
dist_noinst_DATA += xulapp/components/gom/src/xgScriptElement.h
dist_noinst_DATA += xulapp/components/gom/src/xgString.h
+
+dist_noinst_DATA += xulapp/installer/Makefile.in
Modified: trunk/gom/xulapp/app/Makefile.in
==============================================================================
--- trunk/gom/xulapp/app/Makefile.in (original)
+++ trunk/gom/xulapp/app/Makefile.in Tue Aug 26 23:26:37 2008
@@ -55,77 +55,3 @@
APP_BUILDID = $(shell date -u +%Y%m%d%H)
DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
-DAPP_BUILDID=$(APP_BUILDID) -DAPP_NAME=$(MOZ_APP_DISPLAYNAME)
-DAPP_VERSION=$(MOZ_APP_VERSION)
-
-ifeq ($(USE_SHORT_LIBNAME), 1)
-APP_BINARY = $(MOZ_APP_NAME)$(BIN_SUFFIX)
-else
-APP_BINARY = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
-endif
-
-# These are binaries in the sdk xulrunner instance that we don't want/need
-SDK_STRIP = \
- mangle* \
- nsinstall* \
- regxpcom* \
- shlibsign* \
- ssltunnel* \
- xpcshell* \
- xpidl* \
- xpt_dump* \
- xpt_link* \
- $(NULL)
-
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-
-APP_NAME = $(MOZ_APP_DISPLAYNAME)
-APP_VERSION = $(MOZ_APP_VERSION)
-
-ifdef MOZ_DEBUG
-APP_NAME := $(APP_NAME)Debug
-endif
-
-AB_CD = $(MOZ_UI_LOCALE)
-
-AB := $(firstword $(subst -, ,$(AB_CD)))
-
-clean clobber repackage::
- rm -rf $(DIST)/$(APP_NAME).app
-
-APPFILES = Resources
-XUL_FRAMEWORK = $(DIST)/$(APP_NAME).app/Contents/Frameworks/XUL.framework
-
-libs repackage:: application.ini
- mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS
- rsync -a --exclude "*.in" --exclude ".DS_Store"
$(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj
- mkdir -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
- rsync -a --exclude "*.in" --exclude ".DS_Store"
$(srcdir)/macbuild/Contents/Resources/English.lproj/
$(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
- sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/"
-e "s/%APP_BINARY%/$(APP_BINARY)/"
$(srcdir)/macbuild/Contents/Info.plist.in >
$(DIST)/$(APP_NAME).app/Contents/Info.plist
- sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/"
$(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in |
iconv -f UTF-8 -t UTF-16 >
$(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings
- rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
- cp $(LIBXUL_DIST)/bin/xulrunner$(BIN_SUFFIX)
$(DIST)/$(APP_NAME).app/Contents/MacOS/$(APP_BINARY)
- mkdir -p $(XUL_FRAMEWORK)
- rsync -a --copy-unsafe-links $(LIBXUL_DIST)/bin/ $(XUL_FRAMEWORK)
- cd $(XUL_FRAMEWORK) && $(RM) -f $(SDK_STRIP)
- cp $(srcdir)/../chrome/locales/$MOZ_UI_LOCALE)/updater.ini
$(XUL_FRAMEWORK)/updater.app/Contents/MacOS
-# remove version control dirs from packaged app
- find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;
- find $(DIST)/$(APP_NAME).app -type d -name ".svn" -prune -exec rm -rf {}
\;
-
-else
-
-#libs::
-# cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX)
$(DIST)/bin/$(APP_BINARY)
-# $(NSINSTALL) -D $(DIST)/bin/xulrunner
-# (cd $(LIBXUL_DIST)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd
$(DIST)/bin/xulrunner && tar -xf -)
-# cd $(DIST)/bin/xulrunner && $(RM) -f $(SDK_STRIP)
-# cp $(srcdir)/../chrome/locales/$(MOZ_UI_LOCALE)/updater.ini
$(DIST)/bin/xulrunner
-## $(NSINSTALL) -D $(DIST)/bin/chrome/icons/default
-##ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-## cp $(srcdir)/default.png $(DIST)/bin/chrome/icons/default/default.png
-##endif
-#ifeq ($(OS_ARCH),WINNT)
-# cp $(srcdir)/default.ico $(DIST)/bin/chrome/icons/default/default.ico
-# $(DIST)/bin/redit $(DIST)/bin/$(APP_BINARY) $(srcdir)/default.ico
-#endif
-
-endif #cocoa
Modified: trunk/gom/xulapp/build.mk
==============================================================================
--- trunk/gom/xulapp/build.mk (original)
+++ trunk/gom/xulapp/build.mk Tue Aug 26 23:26:37 2008
@@ -56,8 +56,8 @@
@echo "Gom doesn't have an installer yet."
@exit 1
-#package:
-# @$(MAKE) -C gom/installer
+package:
+ @$(MAKE) -C gom/installer
install::
@echo "Gom can't be installed directly."
Added: trunk/gom/xulapp/installer/Makefile.in
==============================================================================
--- (empty file)
+++ trunk/gom/xulapp/installer/Makefile.in Tue Aug 26 23:26:37 2008
@@ -0,0 +1,143 @@
+# ***** 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 McCoy.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Dave Townsend <dtow...@oxymoronical.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either 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
+
+NO_PKG_FILES = \
+ $(MOZ_APP_NAME)-config \
+ $(MOZ_APP_NAME)-bin.elf \
+ regchrome* \
+ regxpcom* \
+ xpcshell* \
+ xpidl* \
+ xpt_dump* \
+ xpt_link* \
+ res \
+ bloaturls.txt \
+ run-mozilla.sh \
+ nsinstall \
+ redit.exe \
+ $(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+_BINPATH = /$(_APPNAME)/Contents/Resources
+endif
+
+include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
+
+ifeq ($(USE_SHORT_LIBNAME), 1)
+APP_BINARY = $(MOZ_APP_NAME)$(BIN_SUFFIX)
+else
+APP_BINARY = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
+endif
+
+# These are binaries in the sdk xulrunner instance that we don't want/need
+SDK_STRIP = \
+ mangle* \
+ nsinstall* \
+ regxpcom* \
+ shlibsign* \
+ ssltunnel* \
+ xpcshell* \
+ xpidl* \
+ xpt_dump* \
+ xpt_link* \
+ $(NULL)
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+
+APP_NAME = $(MOZ_APP_DISPLAYNAME)
+APP_VERSION = $(MOZ_APP_VERSION)
+
+ifdef MOZ_DEBUG
+APP_NAME := $(APP_NAME)Debug
+endif
+
+AB_CD = $(MOZ_UI_LOCALE)
+
+AB := $(firstword $(subst -, ,$(AB_CD)))
+
+clean clobber repackage::
+ rm -rf $(DIST)/$(APP_NAME).app
+
+APPFILES = Resources
+XUL_FRAMEWORK = $(DIST)/$(APP_NAME).app/Contents/Frameworks/XUL.framework
+
+libs repackage:: application.ini
+ mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS
+ rsync -a --exclude "*.in" --exclude ".DS_Store"
$(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj
+ mkdir -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
+ rsync -a --exclude "*.in" --exclude ".DS_Store"
$(srcdir)/macbuild/Contents/Resources/English.lproj/
$(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
+ sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/"
-e "s/%APP_BINARY%/$(APP_BINARY)/"
$(srcdir)/macbuild/Contents/Info.plist.in >
$(DIST)/$(APP_NAME).app/Contents/Info.plist
+ sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/"
$(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in |
iconv -f UTF-8 -t UTF-16 >
$(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings
+ rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
+ cp $(LIBXUL_DIST)/bin/xulrunner$(BIN_SUFFIX)
$(DIST)/$(APP_NAME).app/Contents/MacOS/$(APP_BINARY)
+ mkdir -p $(XUL_FRAMEWORK)
+ rsync -a --copy-unsafe-links $(LIBXUL_DIST)/bin/ $(XUL_FRAMEWORK)
+ cd $(XUL_FRAMEWORK) && $(RM) -f $(SDK_STRIP)
+ cp $(srcdir)/../chrome/locales/$MOZ_UI_LOCALE)/updater.ini
$(XUL_FRAMEWORK)/updater.app/Contents/MacOS
+# remove version control dirs from packaged app
+ find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;
+ find $(DIST)/$(APP_NAME).app -type d -name ".svn" -prune -exec rm -rf {}
\;
+
+else
+
+stage-package: stage-xulrunner
+
+stage-xulrunner:
+ cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX)
$(DIST)/bin/$(APP_BINARY)
+ $(NSINSTALL) -D $(DIST)/bin/xulrunner
+ (cd $(LIBXUL_DIST)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd
$(DIST)/bin/xulrunner && tar -xf -)
+ cd $(DIST)/bin/xulrunner && $(RM) -f $(SDK_STRIP)
+ cp $(srcdir)/../chrome/locales/$(MOZ_UI_LOCALE)/updater.ini
$(DIST)/bin/xulrunner
+# $(NSINSTALL) -D $(DIST)/bin/chrome/icons/default
+#ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+# cp $(srcdir)/default.png $(DIST)/bin/chrome/icons/default/default.png
+#endif
+ifeq ($(OS_ARCH),WINNT)
+ cp $(srcdir)/default.ico $(DIST)/bin/chrome/icons/default/default.ico
+ $(DIST)/bin/redit $(DIST)/bin/$(APP_BINARY) $(srcdir)/default.ico
+endif
+
+endif #cocoa
Added: trunk/gom/xulapp/makefiles.sh
==============================================================================
--- (empty file)
+++ trunk/gom/xulapp/makefiles.sh Tue Aug 26 23:26:37 2008
@@ -0,0 +1,49 @@
+# ***** 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 McCoy.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Dave Townsend <dtow...@oxymoronical.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either 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 *****
+
+add_makefiles "
+gom/Makefile
+gom/chrome/Makefile
+gom/chrome/branding/Makefile
+gom/chrome/content/Makefile
+gom/chrome/locales/Makefile
+gom/components/Makefile
+gom/components/gom/public/Makefile
+gom/components/gom/src/Makefile
+gom/app/Makefile
+gom/installer/Makefile
+"